From 30b5e5dade73ddc6fc7dab1245c8ae993c9718b3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 1 Mar 2016 00:15:04 +0100 Subject: [PATCH] refs #485, changed to static preformatted as discussed (MS/KB) on slack --- src/blackcore/application.cpp | 4 ++-- src/blackcore/icaodatareader.cpp | 6 +++--- src/blackcore/modeldatareader.cpp | 6 +++--- src/blackcore/setupreader.cpp | 4 ++-- src/blackgui/components/dblogincomponent.cpp | 2 +- src/blackgui/components/dbmappingcomponent.cpp | 2 +- src/blackmisc/settingscache.cpp | 2 +- src/plugins/simulator/fscommon/simulatorfscommon.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 371a1ee0a..db8dd2529 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -76,7 +76,7 @@ namespace BlackCore if (!m.isEmpty()) { m.setCategories(getLogCategories()); - CLogMessage(this).preformatted(m); + CLogMessage::preformatted(m); } // global setup @@ -541,7 +541,7 @@ namespace BlackCore void CApplication::severeStartupProblem(const CStatusMessage &message) { - CLogMessage(this).preformatted(message); + CLogMessage::preformatted(message); this->cmdLineErrorMessage(message.getMessage()); this->exit(EXIT_FAILURE); diff --git a/src/blackcore/icaodatareader.cpp b/src/blackcore/icaodatareader.cpp index fba7cb8e3..74ba95874 100644 --- a/src/blackcore/icaodatareader.cpp +++ b/src/blackcore/icaodatareader.cpp @@ -190,7 +190,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFailed, 0); return; } @@ -213,7 +213,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFailed, 0); return; } @@ -236,7 +236,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFailed, 0); return; } diff --git a/src/blackcore/modeldatareader.cpp b/src/blackcore/modeldatareader.cpp index e212dd45e..1d9f95db5 100644 --- a/src/blackcore/modeldatareader.cpp +++ b/src/blackcore/modeldatareader.cpp @@ -213,7 +213,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFailed, 0); return; } @@ -251,7 +251,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFailed, 0); return; } @@ -287,7 +287,7 @@ namespace BlackCore CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data()); if (res.hasErrorMessage()) { - CLogMessage(this).preformatted(res.lastWarningOrAbove()); + CLogMessage::preformatted(res.lastWarningOrAbove()); emit dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFailed, 0); return; } diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index a49ff62df..d08cacf50 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -279,7 +279,7 @@ namespace BlackCore if (m.isWarningOrAbove()) { m.setCategories(getLogCategories()); - CLogMessage(this).preformatted(m); + CLogMessage::preformatted(m); emit setupSynchronized(false); return; // issue with cache } @@ -361,7 +361,7 @@ namespace BlackCore if (!m.isEmpty()) { m.setCategories(getLogCategories()); - CLogMessage(this).preformatted(m); + CLogMessage::preformatted(m); emit updateInfoSynchronized(false); return; // issue with cache } diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index 11bfe9ca8..e35d414ee 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -85,7 +85,7 @@ namespace BlackGui { this->setModeLogin(true); this->displayOverlayMessages(status); - CLogMessage(this).preformatted(status); + CLogMessage::preformatted(status); } } diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index 78d8dcb03..2c6e1c338 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -476,7 +476,7 @@ namespace BlackGui CStatusMessage msg = m_cachedVPilotModels.set(models); if (msg.isWarningOrAbove()) { - CLogMessage(this).preformatted(msg); + CLogMessage::preformatted(msg); } else { diff --git a/src/blackmisc/settingscache.cpp b/src/blackmisc/settingscache.cpp index c32bd7b35..d647c8b44 100644 --- a/src/blackmisc/settingscache.cpp +++ b/src/blackmisc/settingscache.cpp @@ -37,7 +37,7 @@ namespace BlackMisc void CSettingsCache::saveToStoreByPacket(const CValueCachePacket &values) { CStatusMessage status = saveToFiles(persistentStore(), values.toVariantMap()); - CLogMessage(this).preformatted(status); + CLogMessage::preformatted(status); } BlackMisc::CStatusMessage CSettingsCache::loadFromStore() diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index 7e2be6be2..9da39908d 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -137,7 +137,7 @@ namespace BlackSimPlugin { CStatusMessage msg; CPixmap pm(m_aircraftCfgParser->iconForModel(modelString, msg)); - if (!msg.isEmpty()) { CLogMessage(this).preformatted(msg);} + if (!msg.isEmpty()) { CLogMessage::preformatted(msg);} return pm; }