From b57003c4e8e86feda716b752dd948e8adb8a5c25 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 1 Mar 2019 19:15:40 +0100 Subject: [PATCH] Style, typo --- src/blackcore/aircraftmatcher.h | 14 +++++++------- src/blackcore/simulator.cpp | 2 +- src/blackcore/webdataservices.cpp | 2 +- src/blackcore/webdataservices.h | 2 +- src/blackgui/components/modelmatchercomponent.h | 4 ++-- src/blackmisc/simulation/aircraftmodel.h | 2 +- src/swiftguistandard/swiftguistd.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/blackcore/aircraftmatcher.h b/src/blackcore/aircraftmatcher.h index 5c9deecf7..583db99b8 100644 --- a/src/blackcore/aircraftmatcher.h +++ b/src/blackcore/aircraftmatcher.h @@ -303,13 +303,13 @@ namespace BlackCore //! Use pseudo family static bool constexpr UsePseudoFamily = true; - BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup - BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model - BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching - BlackMisc::Simulation::CAircraftModelList m_disabledModels; //!< disabled models for matching - BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional) - BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics - QString m_modelSetInfo; //!< info string + BlackMisc::Simulation::CAircraftMatcherSetup m_setup; //!< setup + BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< model to be used as default model + BlackMisc::Simulation::CAircraftModelList m_modelSet; //!< models used for model matching + BlackMisc::Simulation::CAircraftModelList m_disabledModels; //!< disabled models for matching + BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< simulator (optional) + BlackMisc::Simulation::CMatchingStatistics m_statistics; //!< matching statistics + QString m_modelSetInfo; //!< info string }; } // namespace diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 45d326fe2..2cba79561 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -1025,7 +1025,7 @@ namespace BlackCore if (details.isEmpty()) { return m; } static const QString addDetails(" details: '%1'"); - return m + addDetails.arg(details); + return m % addDetails.arg(details); } void ISimulator::finishUpdateRemoteAircraftAndSetStatistics(qint64 startTime, bool limited) diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 93ebcb07b..b3efe2657 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -467,7 +467,7 @@ namespace BlackCore return emptyEntities; } - CEntityFlags::Entity CWebDataServices::getSychronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData, CEntityFlags::Entity entities) + CEntityFlags::Entity CWebDataServices::getSynchronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData, CEntityFlags::Entity entities) { CEntityFlags::Entity loadEntities = this->getEntitiesWithNewerSharedFile(entities); const CEntityFlags::Entity checkForEmptyEntities = CEntityFlags::entityFlagToEntity(CEntityFlags::AllDbEntitiesNoInfoObjects) & ~loadEntities; diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index a282155ae..5c899e34b 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -440,7 +440,7 @@ namespace BlackCore //! Synchronized entities either empty or with newer shared file //! \remark will synchronize entities //! \threadsafe - BlackMisc::Network::CEntityFlags::Entity getSychronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData = true, BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllDbEntities); + BlackMisc::Network::CEntityFlags::Entity getSynchronizedEntitiesWithNewerSharedFileOrEmpty(bool syncData = true, BlackMisc::Network::CEntityFlags::Entity entities = BlackMisc::Network::CEntityFlags::AllDbEntities); //! Cache count for entity //! \threadsafe diff --git a/src/blackgui/components/modelmatchercomponent.h b/src/blackgui/components/modelmatchercomponent.h index ded07dd40..9f7ea0b4a 100644 --- a/src/blackgui/components/modelmatchercomponent.h +++ b/src/blackgui/components/modelmatchercomponent.h @@ -81,8 +81,8 @@ namespace BlackGui BlackMisc::Simulation::CAircraftModel defaultModel() const; QScopedPointer ui; - CSettingsMatchingDialog *m_settingsDialog = nullptr; - BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher + CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog + BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher }; } // ns } // ns diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 155c30c9f..f439e973b 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H #define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H -#include "blackmisc/simulation/distributor.h" #include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/distributor.h" #include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/airlineicaocode.h" diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 6bccb980d..2e533ac0f 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -458,7 +458,7 @@ void SwiftGuiStd::checkDbDataLoaded() if (!sGui || sGui->isShuttingDown()) { return; } Q_ASSERT_X(sGui->hasWebDataServices(), Q_FUNC_INFO, "Missing web services"); Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Wrong thread, needs to run in main thread"); - CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSychronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading); + const CEntityFlags::Entity loadEntities = sGui->getWebDataServices()->getSynchronizedEntitiesWithNewerSharedFileOrEmpty(!m_dbDataLoading); if (loadEntities == CEntityFlags::NoEntity) { m_dbDataLoading = false;