From 418d0aa6285a1818916facd5c29255982d9d6e0a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 12 Oct 2017 00:42:50 +0200 Subject: [PATCH] Ref T171, Ref T136, removed the remote provider's "remove aircraft part", as it is not used: * remove is handled by context call logicallyRemoveRemoteAircraft * so far no need to use the remote provider function * can be used again whenever needed --- src/blackcore/simulatorcommon.cpp | 9 ++------- src/blackcore/simulatorcommon.h | 4 +--- src/plugins/simulator/xplane/simulatorxplane.cpp | 6 ------ src/plugins/simulator/xplane/simulatorxplane.h | 1 - 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp index 70578d622..e3ea97304 100644 --- a/src/blackcore/simulatorcommon.cpp +++ b/src/blackcore/simulatorcommon.cpp @@ -539,11 +539,6 @@ namespace BlackCore Q_UNUSED(parts); } - void CSimulatorCommon::onRemoteProviderRemovedAircraft(const CCallsign &callsign) - { - Q_UNUSED(callsign); - } - void CSimulatorCommon::reset() { m_statsUpdateAircraftCountMs = 0; @@ -596,8 +591,8 @@ namespace BlackCore void CSimulatorCommon::rapOnRemoteProviderRemovedAircraft(const CCallsign &callsign) { - if (!this->isConnected()) return; - this->onRemoteProviderRemovedAircraft(callsign); + Q_UNUSED(callsign); + // currently not used, the calls are handled by context call logicallyRemoveRemoteAircraft } void CSimulatorCommon::callPhysicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft) diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index 9da8a35f9..d72b16550 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -152,9 +152,6 @@ namespace BlackCore //! Provider added parts virtual void onRemoteProviderAddedAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts); - - //! Provider removed aircraft - virtual void onRemoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign); //! @} //! New plugin info @@ -240,6 +237,7 @@ namespace BlackCore void rapOnRemoteProviderAddedAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts); void rapOnRemoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign); + // call with counters updated void callPhysicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft); void callPhysicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &remoteCallsign); diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 226fe1c6d..11d07019c 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -582,12 +582,6 @@ namespace BlackSimPlugin m_traffic->setPlaneTransponder(callsign.asString(), 2000, true, false); } - void CSimulatorXPlane::onRemoteProviderRemovedAircraft(const CCallsign &callsign) - { - Q_UNUSED(callsign); - //! \todo call removeRemoteAircraft or just let removeRemoteAircraft handle it? - } - bool CSimulatorXPlane::physicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) { if (!isConnected()) { return false; } //! \fixme why is this method called when not connected? diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index c27e5d37e..426f5114d 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -111,7 +111,6 @@ namespace BlackSimPlugin //! @{ virtual void onRemoteProviderAddedAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override; virtual void onRemoteProviderAddedAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts) override; - virtual void onRemoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign) override; //! @} //! \copydoc BlackCore::ISimulator::isConnected