From 083293c016252414ff81df2f65fc7da18a708cd4 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 28 Aug 2019 01:07:08 +0200 Subject: [PATCH] Style --- src/blackcore/context/contextsimulatorimpl.cpp | 13 +++++++------ .../simulation/settings/simulatorsettings.cpp | 6 +++--- .../simulation/settings/simulatorsettings.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 47b2e7932..cf5f5157e 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -156,7 +156,7 @@ namespace BlackCore bool CContextSimulator::setSimulatorSettings(const CSimulatorSettings &settings, const CSimulatorInfo &simulator) { if (!simulator.isSingleSimulator()) { return false; } - CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator); + const CSimulatorSettings simSettings = m_multiSimulatorSettings.getSettings(simulator); if (simSettings == settings) { return false; } const CStatusMessage msg = m_multiSimulatorSettings.setSettings(settings, simulator); CLogMessage::preformatted(msg); @@ -637,15 +637,15 @@ namespace BlackCore // in the first step we already tried to find accurate ICAO codes etc. // coming from CAirspaceMonitor::sendReadyForModelMatching MatchingLog whatToLog = m_logMatchingMessages; - const CSimulatorSettings simSettings = this->getSimulatorSettings(); CStatusMessageList matchingMessages; CStatusMessageList *pMatchingMessages = m_logMatchingMessages > 0 ? &matchingMessages : nullptr; CAircraftModel aircraftModel = m_aircraftMatcher.getClosestMatch(remoteAircraft, whatToLog, pMatchingMessages, true); Q_ASSERT_X(remoteAircraft.getCallsign() == aircraftModel.getCallsign(), Q_FUNC_INFO, "Mismatching callsigns"); // decide CG - CLength cgModel = aircraftModel.getCG(); - CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString()); + const CLength cgModel = aircraftModel.getCG(); + const CLength cgSim = m_simulatorPlugin.second->getSimulatorCGPerModelString(aircraftModel.getModelString()); + const CSimulatorSettings simSettings = this->getSimulatorSettings(); switch (simSettings.getCGSource()) { case CSimulatorSettings::CGFromSimulatorOnly: @@ -657,8 +657,9 @@ namespace BlackCore case CSimulatorSettings::CGFromDBFirst: if (cgModel.isNull()) { aircraftModel.setCG(cgSim); } break; - case CSimulatorSettings::CGFromDBOnly: - default: break; + // case CSimulatorSettings::CGFromDBOnly: + default: + break; // leave CG from model alone } // model in provider diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index 45261c905..b79be560c 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -38,9 +38,9 @@ namespace BlackMisc switch (source) { case CGFromSimulatorFirst: return sf; - case CGFromDBFirst: return dbf; - case CGFromSimulatorOnly: return so; - case CGFromDBOnly: return dbo; + case CGFromDBFirst: return dbf; + case CGFromSimulatorOnly: return so; + case CGFromDBOnly: return dbo; default: break; } static const QString u("unknown"); diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index a6bfc59e6..6291a3cb2 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -19,8 +19,8 @@ #include "blackmisc/settingscache.h" #include "blackmisc/statusmessage.h" #include "blackmisc/propertyindex.h" -#include "blackmisc/blackmiscexport.h" #include "blackmisc/directoryutils.h" +#include "blackmisc/blackmiscexport.h" #include #include