diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index c3de41190..f51d10b0a 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -99,7 +99,6 @@ namespace swift::simplugin::flightgear connect(&m_pendingAddedTimer, &QTimer::timeout, this, &CSimulatorFlightgear::addNextPendingAircraft); m_fastTimer.start(100); m_slowTimer.start(1000); - m_airportUpdater.start(60 * 1000); m_pendingAddedTimer.start(5000); this->setDefaultModel( diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.h b/src/plugins/simulator/flightgear/simulatorflightgear.h index 1580d73e2..6f8201e48 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.h +++ b/src/plugins/simulator/flightgear/simulatorflightgear.h @@ -228,7 +228,6 @@ namespace swift::simplugin::flightgear CFGSwiftBusTrafficProxy *m_trafficProxy { nullptr }; QTimer m_fastTimer; QTimer m_slowTimer; - QTimer m_airportUpdater; QTimer m_pendingAddedTimer; swift::misc::CData m_modelSet { this diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index ca1dedcc1..e0a501632 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -101,11 +101,9 @@ namespace swift::simplugin::xplane m_pendingAddedTimer.setObjectName(this->objectName().append(":m_pendingAddedTimer")); connect(&m_fastTimer, &QTimer::timeout, this, &CSimulatorXPlane::fastTimerTimeout); connect(&m_slowTimer, &QTimer::timeout, this, &CSimulatorXPlane::slowTimerTimeout); - connect(&m_airportUpdater, &QTimer::timeout, this, &CSimulatorXPlane::updateAirportsInRange); connect(&m_pendingAddedTimer, &QTimer::timeout, this, &CSimulatorXPlane::addNextPendingAircraft); m_fastTimer.start(100); m_slowTimer.start(1000); - m_airportUpdater.start(60 * 1000); m_pendingAddedTimer.start(5000); this->setDefaultModel({ "Jets A320_a A320_a_Austrian_Airlines A320_a_Austrian_Airlines", @@ -498,7 +496,6 @@ namespace swift::simplugin::xplane setSimulatorDetails("X-Plane", {}, xplaneVersion); connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); - m_serviceProxy->updateAirportsInRange(); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded); @@ -1155,12 +1152,6 @@ namespace swift::simplugin::xplane } } - void CSimulatorXPlane::updateAirportsInRange() - { - if (this->isShuttingDownOrDisconnected()) { return; } - m_serviceProxy->updateAirportsInRange(); - } - void CSimulatorXPlane::onRemoteAircraftAdded(const QString &callsign) { SWIFT_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign"); diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index bfcc81928..4725dc5f9 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -200,9 +200,6 @@ namespace swift::simplugin::xplane //! \remark this is where the interpolated data are set void updateRemoteAircraft(); - //! Update airports - void updateAirportsInRange(); - //! @{ //! Request elevation and CG from XPlane void requestRemoteAircraftDataFromXPlane(); @@ -275,7 +272,6 @@ namespace swift::simplugin::xplane CXSwiftBusTrafficProxy *m_trafficProxy { nullptr }; QTimer m_fastTimer; QTimer m_slowTimer; - QTimer m_airportUpdater; QTimer m_pendingAddedTimer; unsigned int m_fastTimerCalls = 0; //!< how often called unsigned int m_slowTimerCalls = 0; //!< how often called diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp index a4748c9ff..d47d4253d 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp @@ -210,11 +210,6 @@ namespace swift::simplugin::xplane m_dbusInterface->callDBus(QLatin1String("addTextMessage"), text, red, green, blue); } - void CXSwiftBusServiceProxy::updateAirportsInRange() - { - m_dbusInterface->callDBus(QLatin1String("updateAirportsInRange")); - } - QString CXSwiftBusServiceProxy::getAircraftModelPath() const { return m_dbusInterface->callDBusRet(QLatin1String("getAircraftModelPath")); diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index 4a9b4b74a..bd4b8ab61 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -123,9 +123,6 @@ namespace swift::simplugin::xplane //! \copydoc XSwiftBus::CService::addTextMessage void addTextMessage(const QString &text, double red, double green, double blue); - //! \copydoc XSwiftBus::CService::updateAirportsInRange - void updateAirportsInRange(); - //! @{ //! \copydoc XSwiftBus::CService::getAircraftModelPath QString getAircraftModelPath() const; diff --git a/src/xswiftbus/org.swift_project.xswiftbus.service.xml b/src/xswiftbus/org.swift_project.xswiftbus.service.xml index ef6bb9a6b..e1df2070f 100644 --- a/src/xswiftbus/org.swift_project.xswiftbus.service.xml +++ b/src/xswiftbus/org.swift_project.xswiftbus.service.xml @@ -66,8 +66,6 @@ R"XML( - -