From 0b4637054aac2866898582927614edd14176195c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 2 Apr 2018 02:19:07 +0200 Subject: [PATCH] Formatting --- src/blackcore/db/modeldatareader.cpp | 2 +- src/blackcore/webdataservices.h | 3 +- src/blackgui/components/dbownmodelsdialog.h | 4 +-- .../components/dbownmodelsetcomponent.h | 4 +-- .../components/dbownmodelsetformdialog.h | 2 +- src/blackmisc/geo/coordinategeodetic.cpp | 32 +++++-------------- .../simulation/remoteaircraftprovider.h | 9 ++++-- 7 files changed, 21 insertions(+), 35 deletions(-) diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp index 946004778..dbc4b5098 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/blackcore/db/modeldatareader.cpp @@ -394,8 +394,8 @@ namespace BlackCore latestTimestamp = lastModifiedMsSinceEpoch(nwReply.data()); } m_modelCache.set(models, latestTimestamp); - this->updateReaderUrl(getBaseUrl(CDbFlags::DbReading)); + this->updateReaderUrl(this->getBaseUrl(CDbFlags::DbReading)); this->emitAndLogDataRead(CEntityFlags::ModelEntity, n, res); } diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index a57df52d6..58f2dc5e3 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -478,8 +478,7 @@ namespace BlackCore // 1) simple signature // 2) fired directly after read, no need to wait for other entities - //! \name Simplified read signals - //! @{ + //! \name Simplified read signals @{ //! All swift DB data have been read void swiftDbAllDataRead(); diff --git a/src/blackgui/components/dbownmodelsdialog.h b/src/blackgui/components/dbownmodelsdialog.h index ad325722c..df80ed415 100644 --- a/src/blackgui/components/dbownmodelsdialog.h +++ b/src/blackgui/components/dbownmodelsdialog.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_DBAIRLINEICAOSELECTORBASE_DBOWNMODELSDIALOG_H -#define BLACKGUI_DBAIRLINEICAOSELECTORBASE_DBOWNMODELSDIALOG_H +#ifndef BLACKGUI_COMPONENTS_CDBOWNMODELSDIALOG_H +#define BLACKGUI_COMPONENTS_CDBOWNMODELSDIALOG_H #include "blackgui/blackguiexport.h" #include "blackmisc/simulation/simulatorinfo.h" diff --git a/src/blackgui/components/dbownmodelsetcomponent.h b/src/blackgui/components/dbownmodelsetcomponent.h index a023aea71..06dff8acc 100644 --- a/src/blackgui/components/dbownmodelsetcomponent.h +++ b/src/blackgui/components/dbownmodelsetcomponent.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H -#define BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H +#ifndef BLACKGUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H +#define BLACKGUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H #include "blackgui/components/dbmappingcomponentaware.h" #include "blackgui/menus/menudelegate.h" diff --git a/src/blackgui/components/dbownmodelsetformdialog.h b/src/blackgui/components/dbownmodelsetformdialog.h index a7bb24677..657f63b88 100644 --- a/src/blackgui/components/dbownmodelsetformdialog.h +++ b/src/blackgui/components/dbownmodelsetformdialog.h @@ -63,7 +63,7 @@ namespace BlackGui virtual int exec() override; private: - QScopedPointer ui; + QScopedPointer ui; BlackMisc::Simulation::CAircraftModelList m_modelSet; BlackMisc::Simulation::CSimulatorInfo m_simulatorInfo; diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index cc4f5fdd6..b7389b62e 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -169,30 +169,14 @@ namespace BlackMisc const ICoordinateGeodetic::ColumnIndex i = index.frontCasted(); switch (i) { - case IndexGeodeticHeight: - m_geodeticHeight.setPropertyByIndex(index.copyFrontRemoved(), variant); - break; - case IndexLatitude: - this->setLatitude(variant.value()); - break; - case IndexLongitude: - this->setLongitude(variant.value()); - break; - case IndexLatitudeAsString: - this->setLatitude(CLatitude::fromWgs84(variant.toQString())); - break; - case IndexLongitudeAsString: - this->setLongitude(CLongitude::fromWgs84(variant.toQString())); - break; - case IndexGeodeticHeightAsString: - m_geodeticHeight.parseFromString(variant.toQString()); - break; - case IndexNormalVector: - this->setNormalVector(variant.value()); - break; - default: - CValueObject::setPropertyByIndex(index, variant); - break; + case IndexGeodeticHeight: m_geodeticHeight.setPropertyByIndex(index.copyFrontRemoved(), variant); break; + case IndexLatitude: this->setLatitude(variant.value()); break; + case IndexLongitude: this->setLongitude(variant.value()); break; + case IndexLatitudeAsString: this->setLatitude(CLatitude::fromWgs84(variant.toQString())); break; + case IndexLongitudeAsString: this->setLongitude(CLongitude::fromWgs84(variant.toQString())); break; + case IndexGeodeticHeightAsString: m_geodeticHeight.parseFromString(variant.toQString()); break; + case IndexNormalVector: this->setNormalVector(variant.value()); break; + default: CValueObject::setPropertyByIndex(index, variant); break; } } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index d8c1b5b68..0dcbfbc41 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -92,10 +92,12 @@ namespace BlackMisc virtual Aviation::CAircraftSituationList remoteAircraftSituations(const Aviation::CCallsign &callsign) const = 0; //! Number of remote aircraft situations for callsign + //! \remark latest situations first //! \threadsafe virtual int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const = 0; //! All parts (per callsign, time history) + //! \remark latest parts first //! \threadsafe virtual Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const = 0; @@ -342,16 +344,17 @@ namespace BlackMisc int updateAircraftInRange(const Aviation::CCallsign &callsign, const CPropertyIndexVariantMap &vm, bool skipEqualValues = true); //! Store an aircraft situation + //! \remark latest situations are kept first //! \threadsafe void storeAircraftSituation(const Aviation::CAircraftSituation &situation); //! Store an aircraft part + //! \remark latest parts are kept first //! \threadsafe + //! @{ void storeAircraftParts(const Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool removeOutdated); - - //! Store an aircraft part - //! \threadsafe void storeAircraftParts(const Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset); + //! @} private: // hashs, because not sorted by key but keeping order