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

Remove Xplane version check in FG plugin

Browse Source
This commit is contained in:
Lars Toenning
2019-02-01 21:30:32 +01:00
committed by Mat Sutcliffe
parent 4953f929bb
commit cb4f8be4be
3 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/simulator/flightgear/simulatorxplane.cpp
View File

@@ -355,8 +355,7 @@ namespace BlackSimPlugin
emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(), emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(),
m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); 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", {}, "");
setSimulatorDetails("X-Plane", {}, xplaneVersion);
connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged);
connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange); connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange);
m_serviceProxy->updateAirportsInRange(); m_serviceProxy->updateAirportsInRange();

18
src/plugins/simulator/flightgear/xswiftbusserviceproxy.cpp
View File

@@ -140,24 +140,6 @@ namespace BlackSimPlugin
m_dbusInterface->callDBusAsync(QLatin1String("getAircraftName"), setterCallback(o_name)); m_dbusInterface->callDBusAsync(QLatin1String("getAircraftName"), setterCallback(o_name));
} }
int CXSwiftBusServiceProxy::getXPlaneVersionMajor() const
{
return m_dbusInterface->callDBusRet<int>(QLatin1String("getXPlaneVersionMajor"));
}
void CXSwiftBusServiceProxy::getXPlaneVersionMajorAsync(int *o_versionMajor)
{
m_dbusInterface->callDBusAsync(QLatin1String("getXPlaneVersionMajor"), setterCallback(o_versionMajor));
}
int CXSwiftBusServiceProxy::getXPlaneVersionMinor() const
{
return m_dbusInterface->callDBusRet<int>(QLatin1String("getXPlaneVersionMinor"));
}
void CXSwiftBusServiceProxy::getXPlaneVersionMinorAsync(int *o_versionMinor)
{
m_dbusInterface->callDBusAsync(QLatin1String("getXPlaneVersionMinor"), setterCallback(o_versionMinor));
}
QString CXSwiftBusServiceProxy::getXPlaneInstallationPath() const QString CXSwiftBusServiceProxy::getXPlaneInstallationPath() const
{ {
return m_dbusInterface->callDBusRet<QString>(QLatin1String("getXPlaneInstallationPath")); return m_dbusInterface->callDBusRet<QString>(QLatin1String("getXPlaneInstallationPath"));

12
src/plugins/simulator/flightgear/xswiftbusserviceproxy.h
View File

@@ -152,18 +152,6 @@ namespace BlackSimPlugin
void getAircraftNameAsync(QString *o_name); 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 //! \copydoc XSwiftBus::CService::getXPlaneInstallationPath
//! @{ //! @{
QString getXPlaneInstallationPath() const; QString getXPlaneInstallationPath() const;