From 909342e17241363366487f9429a65885f98a3720 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 23 Nov 2017 03:26:06 +0100 Subject: [PATCH] Ref T201, formatting --- src/blackcore/db/infodatareader.cpp | 16 +++++++--------- src/blackmisc/aviation/aircrafticaocode.cpp | 2 +- src/blackmisc/db/dbflags.cpp | 2 +- src/blackmisc/simulation/aircraftmodellist.cpp | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/blackcore/db/infodatareader.cpp b/src/blackcore/db/infodatareader.cpp index 32dfab1fa..057206442 100644 --- a/src/blackcore/db/infodatareader.cpp +++ b/src/blackcore/db/infodatareader.cpp @@ -83,15 +83,13 @@ namespace BlackCore CEntityFlags::Entity CInfoDataReader::getEntitiesWithCacheCount() const { - CEntityFlags::Entity entities = CEntityFlags::NoEntity; - return entities; + return CEntityFlags::NoEntity; } CEntityFlags::Entity CInfoDataReader::getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const { Q_UNUSED(threshold); - CEntityFlags::Entity entities = CEntityFlags::NoEntity; - return entities; + return CEntityFlags::NoEntity; } bool CInfoDataReader::hasChangedUrl(CEntityFlags::Entity entity, CUrl &oldUrlInfo, CUrl &newUrlInfo) const @@ -144,7 +142,7 @@ namespace BlackCore if (res.hasErrorMessage()) { CLogMessage::preformatted(res.lastWarningOrAbove()); - emit dataRead(this->getEntityForMode(), CEntityFlags::ReadFailed, 0); + emit this->dataRead(this->getEntityForMode(), CEntityFlags::ReadFailed, 0); return; } @@ -154,8 +152,8 @@ namespace BlackCore // this part needs to be synchronized { - QWriteLocker wl(&this->m_lockInfoObjects); - this->m_infoObjects = infoObjects; + QWriteLocker wl(&m_lockInfoObjects); + m_infoObjects = infoObjects; } this->emitAndLogDataRead(this->getEntityForMode(), n, res); @@ -173,8 +171,8 @@ namespace BlackCore CEntityFlags::EntityFlag CInfoDataReader::getEntityForMode() const { - if (this->m_mode == CDbFlags::DbReading) return CEntityFlags::DbInfoObjectEntity; - if (this->m_mode == CDbFlags::Shared) return CEntityFlags::SharedInfoObjectEntity; + if (m_mode == CDbFlags::DbReading) return CEntityFlags::DbInfoObjectEntity; + if (m_mode == CDbFlags::Shared) return CEntityFlags::SharedInfoObjectEntity; qFatal("Wrong mode"); return CEntityFlags::NoEntity; } diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index e9e4d5ba0..010541b24 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -379,7 +379,7 @@ namespace BlackMisc void CAircraftIcaoCode::setMilitary(bool military) { - m_military = military; + m_military = military; } void CAircraftIcaoCode::setRealWorld(bool realWorld) diff --git a/src/blackmisc/db/dbflags.cpp b/src/blackmisc/db/dbflags.cpp index 6b8f7e27a..71c57495c 100644 --- a/src/blackmisc/db/dbflags.cpp +++ b/src/blackmisc/db/dbflags.cpp @@ -48,7 +48,7 @@ namespace BlackMisc if (mode.testFlag(DbReading)) list << "Direct DB access"; if (mode.testFlag(Shared)) list << "Shared data"; if (mode.testFlag(Cached)) list << "Cached data"; - return list.join(','); + return list.join(", "); } CDbFlags::DataRetrievalModeFlag CDbFlags::modeToModeFlag(DataRetrievalMode mode) diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 401bb4886..6be797c7e 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -909,9 +909,9 @@ namespace BlackMisc QJsonArray array = value.toArray(); CAircraftModel::MemoHelper::CUnmemoizer helper; - QJsonValue aircraftIcaos = json.value("aircraftIcaos"); - QJsonValue liveries = json.value("liveries"); - QJsonValue distributors = json.value("distributors"); + const QJsonValue aircraftIcaos = json.value("aircraftIcaos"); + const QJsonValue liveries = json.value("liveries"); + const QJsonValue distributors = json.value("distributors"); if (aircraftIcaos.isUndefined()) { throw CJsonException("Missing 'aircraftIcaos'"); } if (liveries.isUndefined()) { throw CJsonException("Missing 'liveries'"); } if (distributors.isUndefined()) { throw CJsonException("Missing 'distributors'"); }