From cb4f8be4bef474b3195f0e82f21621d2edcd966c Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Fri, 1 Feb 2019 21:30:32 +0100 Subject: [PATCH] Remove Xplane version check in FG plugin --- .../simulator/flightgear/simulatorxplane.cpp | 3 +-- .../flightgear/xswiftbusserviceproxy.cpp | 18 ------------------ .../flightgear/xswiftbusserviceproxy.h | 12 ------------ 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/plugins/simulator/flightgear/simulatorxplane.cpp b/src/plugins/simulator/flightgear/simulatorxplane.cpp index a078a332d..a944b8970 100644 --- a/src/plugins/simulator/flightgear/simulatorxplane.cpp +++ b/src/plugins/simulator/flightgear/simulatorxplane.cpp @@ -355,8 +355,7 @@ namespace BlackSimPlugin emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(), m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); - QString xplaneVersion = QStringLiteral("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor()); - setSimulatorDetails("X-Plane", {}, xplaneVersion); + setSimulatorDetails("X-Plane", {}, ""); connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange); m_serviceProxy->updateAirportsInRange(); diff --git a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp b/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp index 4607caec4..e9619fe38 100644 --- a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp @@ -140,24 +140,6 @@ namespace BlackSimPlugin m_dbusInterface->callDBusAsync(QLatin1String("getAircraftName"), setterCallback(o_name)); } - int CXSwiftBusServiceProxy::getXPlaneVersionMajor() const - { - return m_dbusInterface->callDBusRet(QLatin1String("getXPlaneVersionMajor")); - } - void CXSwiftBusServiceProxy::getXPlaneVersionMajorAsync(int *o_versionMajor) - { - m_dbusInterface->callDBusAsync(QLatin1String("getXPlaneVersionMajor"), setterCallback(o_versionMajor)); - } - - int CXSwiftBusServiceProxy::getXPlaneVersionMinor() const - { - return m_dbusInterface->callDBusRet(QLatin1String("getXPlaneVersionMinor")); - } - void CXSwiftBusServiceProxy::getXPlaneVersionMinorAsync(int *o_versionMinor) - { - m_dbusInterface->callDBusAsync(QLatin1String("getXPlaneVersionMinor"), setterCallback(o_versionMinor)); - } - QString CXSwiftBusServiceProxy::getXPlaneInstallationPath() const { return m_dbusInterface->callDBusRet(QLatin1String("getXPlaneInstallationPath")); diff --git a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/xswiftbusserviceproxy.h index f82cac94b..88f1eac40 100644 --- a/src/plugins/simulator/flightgear/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/flightgear/xswiftbusserviceproxy.h @@ -152,18 +152,6 @@ namespace BlackSimPlugin void getAircraftNameAsync(QString *o_name); //! @} - //! \copydoc XSwiftBus::CService::getXPlaneVersionMajor - //! @{ - int getXPlaneVersionMajor() const; - void getXPlaneVersionMajorAsync(int *o_versionMajor); - //! @} - - //! \copydoc XSwiftBus::CService::getXPlaneVersionMinor - //! @{ - int getXPlaneVersionMinor() const; - void getXPlaneVersionMinorAsync(int *o_versionMinor); - //! @} - //! \copydoc XSwiftBus::CService::getXPlaneInstallationPath //! @{ QString getXPlaneInstallationPath() const;