From 4b082ac99a85f83c67f16e23b2dfc1088fb42074 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 5 Nov 2017 03:34:04 +0100
Subject: [PATCH] Ref T180, renamed function
 removeFromPendingAndAddAgainAircraft

---
 src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp | 10 +++++-----
 src/plugins/simulator/fsxcommon/simulatorfsxcommon.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 6d1e0aa0c..6b3611fc4 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -539,7 +539,7 @@ namespace BlackSimPlugin
                     }
                     else
                     {
-                        this->removeAsPendingAndAddAgain(callsign);
+                        this->removeFromPendingAndAddAgainAircraft(callsign);
                         msg = CLogMessage(this).info("Callsign '%1' removed in meantime and no longer in range") << callsign.toQString();
                     }
                     break;
@@ -578,7 +578,7 @@ namespace BlackSimPlugin
                 this->requestDataForSimObject(simObject);
                 this->requestLightsForSimObject(simObject);
 
-                this->removeAsPendingAndAddAgain(callsign); // no longer try to add
+                this->removeFromPendingAndAddAgainAircraft(callsign); // no longer try to add
                 const bool updated = this->updateAircraftRendered(callsign, true);
                 if (updated)
                 {
@@ -646,7 +646,7 @@ namespace BlackSimPlugin
             }
         }
 
-        void CSimulatorFsxCommon::removeAsPendingAndAddAgain(const CCallsign &callsign)
+        void CSimulatorFsxCommon::removeFromPendingAndAddAgainAircraft(const CCallsign &callsign)
         {
             if (callsign.isEmpty()) { return; }
             m_addPendingAircraft.removeByCallsign(callsign);
@@ -855,7 +855,7 @@ namespace BlackSimPlugin
                 return false;
             }
 
-            this->removeAsPendingAndAddAgain(callsign);
+            this->removeFromPendingAndAddAgainAircraft(callsign);
 
             // create AI
             bool adding = false;
@@ -891,7 +891,7 @@ namespace BlackSimPlugin
             Q_ASSERT_X(CThreadUtils::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "wrong thread");
             if (callsign.isEmpty()) { return false; } // can happen if an object is not an aircraft
 
-            this->removeAsPendingAndAddAgain(callsign);
+            this->removeFromPendingAndAddAgainAircraft(callsign);
             if (!m_simConnectObjects.contains(callsign)) { return false; } // already fully removed or not yet added
 
             CSimConnectObject &simObject = m_simConnectObjects[callsign];
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
index c2c3b2bc7..49ec3319f 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
@@ -208,7 +208,7 @@ namespace BlackSimPlugin
             void addPendingAircraft(AircraftAddMode mode);
 
             //! Remove as m_addPendingAircraft and m_aircraftToAddAgainWhenRemoved
-            void removeAsPendingAndAddAgain(const BlackMisc::Aviation::CCallsign &callsign);
+            void removeFromPendingAndAddAgainAircraft(const BlackMisc::Aviation::CCallsign &callsign);
 
             //! Call this method to declare the simulator connected
             void setSimConnected();