From 65c94cf2c336326f554cee5dddd4f76d730bff12 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 18 Jun 2018 19:04:46 +0200 Subject: [PATCH] Style --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackcore/simulator.cpp | 3 ++- src/blackmisc/aviation/aircraftsituationlist.cpp | 6 +++--- src/blackmisc/simulation/interpolationsetuplist.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index a41079f42..c7d834988 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -961,7 +961,7 @@ namespace BlackCore } else { - // values before updating + // values before updating (i.e. "storing") so the new situation is noty yet considered const CAircraftSituationList oldSituations = this->remoteAircraftSituations(callsign); const CAircraftSituationChangeList oldChanges = this->remoteAircraftSituationChanges(callsign); if (oldSituations.size() > 1) diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 93a44f263..b53196a95 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -18,6 +18,7 @@ using namespace BlackConfig; using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Geo; using namespace BlackMisc::Simulation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; @@ -55,7 +56,7 @@ namespace BlackCore return false; } - void ISimulator::callbackReceivedRequestedElevation(const Geo::CElevationPlane &plane, const CCallsign &callsign) + void ISimulator::callbackReceivedRequestedElevation(const CElevationPlane &plane, const CCallsign &callsign) { if (this->isShuttingDown()) { return; } diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index f34e3b7e3..490a8de18 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -58,7 +58,7 @@ namespace BlackMisc Q_ASSERT_X(m_tsAdjustedSortHint == CAircraftSituationList::AdjustedTimestampLatestFirst || this->isSortedAdjustedLatestFirstWithoutNullPositions(), Q_FUNC_INFO, "Need sorted situations without NULL positions"); const CAircraftSituationChange simpleChange(*this, model.getCG(), model.isVtol(), true, false); - int c = 0; + int c = 0; // changed elevations bool latest = true; for (CAircraftSituation &s : *this) @@ -66,8 +66,8 @@ namespace BlackMisc const bool set = s.setGroundElevationChecked(elevationPlane, info); if (set) { - // change is only valid for the latest situation - // this will do nothing if not appropriate + // simpleChange is only valid for the latest situation + // this will do nothing if not appropriate! s.guessOnGround(latest ? simpleChange : CAircraftSituationChange::null(), model); c++; } diff --git a/src/blackmisc/simulation/interpolationsetuplist.h b/src/blackmisc/simulation/interpolationsetuplist.h index b895b147a..a0f52fdac 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.h +++ b/src/blackmisc/simulation/interpolationsetuplist.h @@ -23,7 +23,7 @@ namespace BlackMisc { namespace Simulation { - //! Value object encapsulating a list of distributors. + //! Value object encapsulating a list of setups. class BLACKMISC_EXPORT CInterpolationSetupList : public CSequence, public Aviation::ICallsignObjectList,