From 291af9877095c0660b72c306537f1bf744070dd8 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 9 Jul 2017 01:04:14 +0200 Subject: [PATCH] Formatting --- src/blackcore/db/icaodatareader.h | 4 ++-- src/blackcore/db/modeldatareader.cpp | 18 +++++++++--------- src/blackmisc/db/datastoreobjectlist.h | 2 ++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/blackcore/db/icaodatareader.h b/src/blackcore/db/icaodatareader.h index 8f20a6a98..b8ca2b84d 100644 --- a/src/blackcore/db/icaodatareader.h +++ b/src/blackcore/db/icaodatareader.h @@ -138,10 +138,10 @@ namespace BlackCore //! Airlines have been read void ps_parseAirlineIcaoData(QNetworkReply *nwReply); - //! Airlines have been read + //! Countries have been read void ps_parseCountryData(QNetworkReply *nwReply); - //! Read / re-read data file + //! Read / re-read data void ps_read(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan); diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp index 78d279880..3d4dedd66 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/blackcore/db/modeldatareader.cpp @@ -262,10 +262,10 @@ namespace BlackCore if (res.isRestricted()) { // create full list if it was just incremental - const CLiveryList incLiveries(CLiveryList::fromDatabaseJson(res)); - if (incLiveries.isEmpty()) { return; } // currenty ignored + const CLiveryList incrementalLiveries(CLiveryList::fromDatabaseJson(res)); + if (incrementalLiveries.isEmpty()) { return; } // currenty ignored liveries = this->getLiveries(); - liveries.replaceOrAddObjectsByKey(incLiveries); + liveries.replaceOrAddObjectsByKey(incrementalLiveries); } else { @@ -304,10 +304,10 @@ namespace BlackCore if (res.isRestricted()) { // create full list if it was just incremental - const CDistributorList incDistributors(CDistributorList::fromDatabaseJson(res)); - if (incDistributors.isEmpty()) { return; } // currently ignored + const CDistributorList incrementalDistributors(CDistributorList::fromDatabaseJson(res)); + if (incrementalDistributors.isEmpty()) { return; } // currently ignored distributors = this->getDistributors(); - distributors.replaceOrAddObjectsByKey(incDistributors); + distributors.replaceOrAddObjectsByKey(incrementalDistributors); } else { @@ -346,10 +346,10 @@ namespace BlackCore if (res.isRestricted()) { // create full list if it was just incremental - const CAircraftModelList incModels(CAircraftModelList::fromDatabaseJson(res)); - if (incModels.isEmpty()) { return; } // currently ignored + const CAircraftModelList incrementalModels(CAircraftModelList::fromDatabaseJson(res)); + if (incrementalModels.isEmpty()) { return; } // currently ignored models = this->getModels(); - models.replaceOrAddObjectsByKey(incModels); + models.replaceOrAddObjectsByKey(incrementalModels); } else { diff --git a/src/blackmisc/db/datastoreobjectlist.h b/src/blackmisc/db/datastoreobjectlist.h index ea71e5811..bf5327970 100644 --- a/src/blackmisc/db/datastoreobjectlist.h +++ b/src/blackmisc/db/datastoreobjectlist.h @@ -60,9 +60,11 @@ namespace BlackMisc QDateTime oldestDbTimestamp() const; //! From DB JSON with default prefixes + //! \remark Specialized classes might have their own fromDatabaseJson implementation static CONTAINER fromDatabaseJson(const QJsonArray &array); //! From DB JSON + //! \remark Specialized classes might have their own fromDatabaseJson implementation static CONTAINER fromDatabaseJson(const QJsonArray &array, const QString &prefix); protected: