From 19c9a51c3889b700f49995071dcfdf3610ed8814 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 10 Sep 2019 22:35:57 +0200 Subject: [PATCH] Style --- src/blackcore/context/contextsimulator.cpp | 2 +- src/blackgui/components/simulatorselector.cpp | 8 +++++--- src/blackgui/editors/aircrafticaoform.cpp | 4 ++-- src/blackgui/editors/aircrafticaoform.h | 4 +--- src/blackgui/editors/coordinateform.cpp | 1 - src/blackgui/editors/form.h | 2 +- .../simulator/emulated/simulatoremulated.cpp | 4 ++-- .../simulator/emulated/simulatoremulated.h | 18 +++++++++--------- .../emulated/simulatoremulatedmonitordialog.h | 2 +- .../emulated/simulatoremulatedmonitordialog.ui | 2 +- .../fsxcommon/simulatorfsxsimconnectproc.cpp | 2 +- 11 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/blackcore/context/contextsimulator.cpp b/src/blackcore/context/contextsimulator.cpp index 201bd7fca..7006a9009 100644 --- a/src/blackcore/context/contextsimulator.cpp +++ b/src/blackcore/context/contextsimulator.cpp @@ -63,7 +63,7 @@ namespace BlackCore bool IContextSimulator::isSimulatorAvailable() const { - return CBuildConfig::isCompiledWithFlightSimulatorSupport() && !getSimulatorPluginInfo().isUnspecified(); + return CBuildConfig::isCompiledWithFlightSimulatorSupport() && !this->getSimulatorPluginInfo().isUnspecified(); } bool IContextSimulator::isSimulatorSimulating() const diff --git a/src/blackgui/components/simulatorselector.cpp b/src/blackgui/components/simulatorselector.cpp index 8ad0ff92a..6e3c1bc87 100644 --- a/src/blackgui/components/simulatorselector.cpp +++ b/src/blackgui/components/simulatorselector.cpp @@ -126,7 +126,7 @@ namespace BlackGui if (sGui && sGui->supportsContexts() && sGui->getIContextSimulator()) { const CSimulatorPluginInfo pluginInfo = sGui->getIContextSimulator()->getSimulatorPluginInfo(); - if (!this->isSingleSelection()) { this->setMode(RadioButtons); } + if (!this->isSingleSelection()) { this->setMode(RadioButtons); } // only one sim can be connected if (pluginInfo.isValid()) { @@ -319,12 +319,14 @@ namespace BlackGui if (this->isSingleSelection()) { // single - m_currentSimulator.set(this->getValue()); + const CSimulatorInfo sim = this->getValue(); + m_currentSimulator.set(sim); } else { // multiple - m_currentSimulators.set(this->getValue()); + const CSimulatorInfo sim = this->getValue(); + m_currentSimulators.set(sim); } } diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp index 8e359121e..a0c76cb89 100644 --- a/src/blackgui/editors/aircrafticaoform.cpp +++ b/src/blackgui/editors/aircrafticaoform.cpp @@ -154,8 +154,8 @@ namespace BlackGui CStatusMessageList CAircraftIcaoForm::validate(bool nested) const { Q_UNUSED(nested); - CAircraftIcaoCode code(getValue()); - CStatusMessageList msgs(code.validate()); + const CAircraftIcaoCode code(this->getValue()); + const CStatusMessageList msgs(code.validate()); ui->val_Indicator->setState(msgs); return msgs; } diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/blackgui/editors/aircrafticaoform.h index 32dc10b88..77f3e96c9 100644 --- a/src/blackgui/editors/aircrafticaoform.h +++ b/src/blackgui/editors/aircrafticaoform.h @@ -11,8 +11,8 @@ #ifndef BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H #define BLACKGUI_EDITORS_AIRCRAFTICAOFORM_H -#include "blackgui/blackguiexport.h" #include "blackgui/editors/form.h" +#include "blackgui/blackguiexport.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/variant.h" @@ -20,8 +20,6 @@ #include #include -class QWidget; - namespace Ui { class CAircraftIcaoForm; } namespace BlackGui { diff --git a/src/blackgui/editors/coordinateform.cpp b/src/blackgui/editors/coordinateform.cpp index 309a8cb27..1e2e63585 100644 --- a/src/blackgui/editors/coordinateform.cpp +++ b/src/blackgui/editors/coordinateform.cpp @@ -77,7 +77,6 @@ namespace BlackGui if (coordinate == m_coordinate) { return false; } m_coordinate = coordinate; - const CLatitude lat = coordinate.latitude(); const QString latWgs = lat.toWgs84(); ui->le_Latitude->setText(latWgs); diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h index c493908e2..449ff7461 100644 --- a/src/blackgui/editors/form.h +++ b/src/blackgui/editors/form.h @@ -35,7 +35,7 @@ namespace BlackGui explicit CForm(QWidget *parent = nullptr); //! Destructor - virtual ~CForm(); + virtual ~CForm() override; //! Set editable virtual void setReadOnly(bool readOnly) = 0; diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index 8bf22da8c..4c550b7a7 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -205,9 +205,9 @@ namespace BlackSimPlugin void CSimulatorEmulated::setCombinedStatus(bool connected, bool simulating, bool paused) { - m_connected = connected; + m_connected = connected; m_simulating = simulating; - m_paused = paused; + m_paused = paused; this->emitSimulatorCombinedStatus(); } diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index 2793413f7..2ec8abfbf 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -161,19 +161,19 @@ namespace BlackSimPlugin //! \remarks basically does the same as a real driver, obtains data from the interpolator void updateRemoteAircraft(); - bool m_log = false; //!< from settings - bool m_paused = false; - bool m_connected = true; + bool m_log = false; //!< from settings + bool m_paused = false; + bool m_connected = true; bool m_simulating = true; bool m_timeSyncronized = false; int m_countInterpolatedSituations = 0; - int m_countInterpolatedParts = 0; + int m_countInterpolatedParts = 0; QTimer m_interpolatorFetchTimer; //!< fetch data from interpolator - BlackMisc::PhysicalQuantities::CTime m_offsetTime; - BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator - BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator - QScopedPointer m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed - BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider + BlackMisc::PhysicalQuantities::CTime m_offsetTime; + BlackMisc::Simulation::CSimulatedAircraft m_myAircraft; //!< represents own aircraft of simulator + BlackMisc::Simulation::CSimulatedAircraftList m_renderedAircraft; //!< represents remote aircraft in simulator + QScopedPointer m_monitorWidget; //!< parent will be main window, so we need to destroy widget when destroyed + BlackMisc::CConnectionGuard m_connectionGuard; //!< connected with provider BlackMisc::CSettingReadOnly m_pluginSettings { this, &CSimulatorEmulated::onSettingsChanged }; QMap m_interpolators; //!< interpolators per callsign }; diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index dfe7ced6b..ffc0e369d 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -42,7 +42,7 @@ namespace BlackSimPlugin explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr); //! Dtor - virtual ~CSimulatorEmulatedMonitorDialog(); + virtual ~CSimulatorEmulatedMonitorDialog() override; //! \copydoc BlackGui::Components::CLogComponent::appendStatusMessageToList void appendStatusMessageToList(const BlackMisc::CStatusMessage &statusMessage); diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui index 440cf1e3e..ced7b9216 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.ui @@ -68,7 +68,7 @@ - 1 + 0 diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 16f35296b..aae171a39 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -80,7 +80,7 @@ namespace BlackSimPlugin { if (trace.isValid()) { - // it can happen the object is not yet + // it can happen the object is not yet existing CSimConnectObject simObject = simulatorFsxP3D->getSimObjectForTrace(trace); if (simObject.isInvalid()) { simObject = trace.simObject; } // take the one in the trace if (simObject.isValid())