flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T180, renamed function removeFromPendingAndAddAgainAircraft

Browse Source
This commit is contained in:
Klaus Basan
2017-11-05 03:34:04 +01:00
parent 57a7407ef9
commit 4b082ac99a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -539,7 +539,7 @@ namespace BlackSimPlugin
} }
else else
{ {
this->removeAsPendingAndAddAgain(callsign); this->removeFromPendingAndAddAgainAircraft(callsign);
msg = CLogMessage(this).info("Callsign '%1' removed in meantime and no longer in range") << callsign.toQString(); msg = CLogMessage(this).info("Callsign '%1' removed in meantime and no longer in range") << callsign.toQString();
} }
break; break;
@@ -578,7 +578,7 @@ namespace BlackSimPlugin
this->requestDataForSimObject(simObject); this->requestDataForSimObject(simObject);
this->requestLightsForSimObject(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); const bool updated = this->updateAircraftRendered(callsign, true);
if (updated) if (updated)
{ {
@@ -646,7 +646,7 @@ namespace BlackSimPlugin
} }
} }
void CSimulatorFsxCommon::removeAsPendingAndAddAgain(const CCallsign &callsign) void CSimulatorFsxCommon::removeFromPendingAndAddAgainAircraft(const CCallsign &callsign)
{ {
if (callsign.isEmpty()) { return; } if (callsign.isEmpty()) { return; }
m_addPendingAircraft.removeByCallsign(callsign); m_addPendingAircraft.removeByCallsign(callsign);
@@ -855,7 +855,7 @@ namespace BlackSimPlugin
return false; return false;
} }
this->removeAsPendingAndAddAgain(callsign); this->removeFromPendingAndAddAgainAircraft(callsign);
// create AI // create AI
bool adding = false; bool adding = false;
@@ -891,7 +891,7 @@ namespace BlackSimPlugin
Q_ASSERT_X(CThreadUtils::isCurrentThreadObjectThread(this), Q_FUNC_INFO, "wrong thread"); 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 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 if (!m_simConnectObjects.contains(callsign)) { return false; } // already fully removed or not yet added
CSimConnectObject &simObject = m_simConnectObjects[callsign]; CSimConnectObject &simObject = m_simConnectObjects[callsign];

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -208,7 +208,7 @@ namespace BlackSimPlugin
void addPendingAircraft(AircraftAddMode mode); void addPendingAircraft(AircraftAddMode mode);
//! Remove as m_addPendingAircraft and m_aircraftToAddAgainWhenRemoved //! 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 //! Call this method to declare the simulator connected
void setSimConnected(); void setSimConnected();