From 2507ce6715aff7e8c97fc2f5799380ba7cdc82bb Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 1 Oct 2015 17:53:11 +0200
Subject: [PATCH] Fixes as discussed in the meeting * hasXXMessage performance
 * remove id ASSERT_X

---
 src/blackcore/blackcorefreefunctions.cpp | 13 ++++---------
 src/blackmisc/statusmessagelist.cpp      |  7 ++++---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/blackcore/blackcorefreefunctions.cpp b/src/blackcore/blackcorefreefunctions.cpp
index cb5d0075e..6462a5efb 100644
--- a/src/blackcore/blackcorefreefunctions.cpp
+++ b/src/blackcore/blackcorefreefunctions.cpp
@@ -15,15 +15,10 @@ namespace BlackCore
 {
     void registerMetadata()
     {
-        int id;
-        id = qRegisterMetaType<BlackCore::IVoiceChannel::ConnectionStatus>();
-        Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
-        id = qRegisterMetaType<BlackCore::INetwork::ConnectionStatus>();
-        Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
-        id = qRegisterMetaType<BlackCore::CWebReaderFlags::WebReaderFlag>();
-        Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype");
-        id = qRegisterMetaType<BlackCore::CWebReaderFlags::WebReader>();
-        Q_UNUSED(id);
+        qRegisterMetaType<IVoiceChannel::ConnectionStatus>();
+        qRegisterMetaType<BlackCore::INetwork::ConnectionStatus>();
+        qRegisterMetaType<BlackCore::CWebReaderFlags::WebReaderFlag>();
+        qRegisterMetaType<BlackCore::CWebReaderFlags::WebReader>();
     }
 
     bool isCurrentThreadObjectThread(QObject *toBeTested)
diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp
index 70ae09163..995a0b052 100644
--- a/src/blackmisc/statusmessagelist.cpp
+++ b/src/blackmisc/statusmessagelist.cpp
@@ -28,17 +28,18 @@ namespace BlackMisc
 
     bool CStatusMessageList::hasErrorMessages() const
     {
-        return findBySeverity(CStatusMessage::SeverityError).size() > 0;
+        return this->contains(&CStatusMessage::getSeverity, CStatusMessage::SeverityError);
     }
 
     bool CStatusMessageList::hasWarningMessages() const
     {
-        return findBySeverity(CStatusMessage::SeverityWarning).size() > 0;
+        return this->contains(&CStatusMessage::getSeverity, CStatusMessage::SeverityWarning);
     }
 
     bool CStatusMessageList::hasWarningOrErrorMessages() const
     {
-        return hasErrorMessages() || hasWarningMessages();
+        return this->containsBy
+        ([ = ](const CStatusMessage & m) { return m.getSeverity() == CStatusMessage::SeverityWarning || m.getSeverity() == CStatusMessage::SeverityError; });
     }
 
     void CStatusMessageList::addCategory(const CLogCategory &category)