From 2d30c1cce88287093a1cd2ec54e1dd4cb1bfef8a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 4 Feb 2019 00:40:52 +0100 Subject: [PATCH] Style --- src/blackmisc/input/keyboardkeylist.h | 2 +- src/blackmisc/simulation/aircraftmodelloader.cpp | 2 +- src/blackmisc/simulation/aircraftmodelloader.h | 8 ++++---- src/swiftguistandard/swiftguistd.cpp | 4 ---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/blackmisc/input/keyboardkeylist.h b/src/blackmisc/input/keyboardkeylist.h index 942f5c42a..99dd38f2e 100644 --- a/src/blackmisc/input/keyboardkeylist.h +++ b/src/blackmisc/input/keyboardkeylist.h @@ -29,7 +29,7 @@ namespace BlackMisc //! Value object encapsulating a list of keyboard keys. class BLACKMISC_EXPORT CKeyboardKeyList : public CSequence, - public BlackMisc::Mixin::MetaType + public Mixin::MetaType { public: BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CKeyboardKeyList) diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp index dde1da879..fc679b726 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelloader.cpp @@ -208,7 +208,7 @@ namespace BlackMisc m_loadingInProgress = false; const QMap counts = statusMsgs.countSeverities(); - const int errors = counts.value(SeverityError); + const int errors = counts.value(SeverityError); const int warnings = counts.value(SeverityWarning); if (statusMsgs.hasWarningOrErrorMessages()) diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index f221fcecc..33e0515f7 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -132,21 +132,21 @@ namespace BlackMisc signals: //! Disk loading started //! \remark will only indicate loading from disk, not cache loading - void diskLoadingStarted(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode loadMode); + void diskLoadingStarted(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode loadMode); //! Parsing is finished or cache has been loaded //! \remark does to fire if the cache has been changed elsewhere and it has just been reloaded here! - void loadingFinished(const BlackMisc::CStatusMessageList &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); + void loadingFinished(const CStatusMessageList &status, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info); //! Loading progress, normally from disk //! \param simulator corresponding simulator //! \param message a progress message which can be sent by each individual loader implementation as needed //! \param progressPercentage 0-100 or -1 if not available - void loadingProgress(const BlackMisc::Simulation::CSimulatorInfo &simulator, const QString &message, int progressPercentage); + void loadingProgress(const CSimulatorInfo &simulator, const QString &message, int progressPercentage); //! Relayed from centralized caches //! \remark this can result from loading, the cache changed elsewhere or clearing data - void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); + void cacheChanged(const CSimulatorInfo &simulator); protected: //! Constructor diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 63f363fb0..97c0bc5db 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -440,10 +440,6 @@ void SwiftGuiStd::onValidatedModelSet(const CSimulatorInfo &simulator, const CAi { this->displayValidationDialog(); m_validationDialog->validatedModelSet(simulator, valid, invalid, stopped, msgs); - - // modal version - // const int r = m_validationDialog->exec(); - // Q_UNUSED(r); } void SwiftGuiStd::displayValidationDialog()