From d05b4da2a925e194bf25ea282809a68706a8bcc7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 1 Aug 2018 23:08:14 +0200 Subject: [PATCH] Ref T299, renaming --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackmisc/simulation/remoteaircraftprovider.cpp | 4 ++-- src/blackmisc/simulation/remoteaircraftprovider.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index bcce6852e..6b03e3b6a 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -971,7 +971,7 @@ namespace BlackCore BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign"); if (callsign.isEmpty()) { return situation; } - CAircraftSituation correctedSituation(allowTestOffset ? this->testAddAltitudeOffsetToSituation(situation) : situation); + CAircraftSituation correctedSituation(allowTestOffset ? this->addTestAltitudeOffsetToSituation(situation) : situation); bool haveRequestedElevation = false; const bool canLikelySkipNearGround = correctedSituation.canLikelySkipNearGroundInterpolation(); if (!correctedSituation.hasGroundElevation() && !canLikelySkipNearGround) diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 30ea1c313..0a9d5e6a6 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -234,7 +234,7 @@ namespace BlackMisc } // add offset (for testing only) - CAircraftSituation situationCorrected(allowTestOffset ? this->testAddAltitudeOffsetToSituation(situation) : situation); + CAircraftSituation situationCorrected(allowTestOffset ? this->addTestAltitudeOffsetToSituation(situation) : situation); // CG, model const CAircraftModel aircraftModel = this->getAircraftInRangeModelForCallsign(cs); @@ -608,7 +608,7 @@ namespace BlackMisc return m_testOffset.contains(callsign); } - CAircraftSituation CRemoteAircraftProvider::testAddAltitudeOffsetToSituation(const CAircraftSituation &situation) const + CAircraftSituation CRemoteAircraftProvider::addTestAltitudeOffsetToSituation(const CAircraftSituation &situation) const { // for global offset testing set "true" constexpr bool globalOffsetTest = false; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 64d60b87c..c16e717c4 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -408,7 +408,7 @@ namespace BlackMisc bool guessOnGroundAndUpdateModelCG(Aviation::CAircraftSituation &situation, const Aviation::CAircraftSituationChange &change, const CAircraftModel &aircraftModel); //! Add an offset for testing - Aviation::CAircraftSituation testAddAltitudeOffsetToSituation(const Aviation::CAircraftSituation &situation) const; + Aviation::CAircraftSituation addTestAltitudeOffsetToSituation(const Aviation::CAircraftSituation &situation) const; private: //! Store the latest changes