flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 11:45:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes as discussed in the meeting

Browse Source 
* hasXXMessage performance
* remove id ASSERT_X
This commit is contained in:
Klaus Basan
2015-10-01 17:53:11 +02:00
committed by Mathew Sutcliffe
parent b7002e275a
commit 2507ce6715
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackcore/blackcorefreefunctions.cpp
View File

@@ -15,15 +15,10 @@ namespace BlackCore
{ {
void registerMetadata() void registerMetadata()
{ {
int id; qRegisterMetaType<IVoiceChannel::ConnectionStatus>();
id = qRegisterMetaType<BlackCore::IVoiceChannel::ConnectionStatus>(); qRegisterMetaType<BlackCore::INetwork::ConnectionStatus>();
Q_ASSERT_X(id >= 1024, Q_FUNC_INFO, "wrong id for metatype"); qRegisterMetaType<BlackCore::CWebReaderFlags::WebReaderFlag>();
id = qRegisterMetaType<BlackCore::INetwork::ConnectionStatus>(); qRegisterMetaType<BlackCore::CWebReaderFlags::WebReader>();
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);
} }
bool isCurrentThreadObjectThread(QObject *toBeTested) bool isCurrentThreadObjectThread(QObject *toBeTested)

7
src/blackmisc/statusmessagelist.cpp
View File

@@ -28,17 +28,18 @@ namespace BlackMisc
bool CStatusMessageList::hasErrorMessages() const bool CStatusMessageList::hasErrorMessages() const
{ {
return findBySeverity(CStatusMessage::SeverityError).size() > 0; return this->contains(&CStatusMessage::getSeverity, CStatusMessage::SeverityError);
} }
bool CStatusMessageList::hasWarningMessages() const bool CStatusMessageList::hasWarningMessages() const
{ {
return findBySeverity(CStatusMessage::SeverityWarning).size() > 0; return this->contains(&CStatusMessage::getSeverity, CStatusMessage::SeverityWarning);
} }
bool CStatusMessageList::hasWarningOrErrorMessages() const 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) void CStatusMessageList::addCategory(const CLogCategory &category)