diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 3b8789f6f..a16a608cb 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -222,25 +222,6 @@ namespace BlackSimPlugin } } - void CSimulatorXPlane::ps_installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries) - { - m_installedModels.clear(); - auto modelStringsIt = modelStrings.begin(); - auto icaosIt = icaos.begin(); - auto airlinesIt = airlines.begin(); - auto liveriesIt = liveries.begin(); - for (; modelStringsIt != modelStrings.end() && icaosIt != icaos.end() && airlinesIt != airlines.end() && liveriesIt != liveries.end(); ++modelStringsIt, ++icaosIt, ++airlinesIt, ++liveriesIt) - { - Q_UNUSED(liveriesIt); - using namespace BlackMisc::Simulation; - CAircraftIcaoCode aircraftIcao(*icaosIt); - CLivery livery; //! \todo resolve livery - livery.setAirlineIcaoCode(CAirlineIcaoCode(*airlinesIt)); - CAircraftModel aircraftModel(*modelStringsIt, CAircraftModel::TypeDatabaseEntry, QString(), aircraftIcao, livery); - m_installedModels.push_back(aircraftModel); - } - } - bool CSimulatorXPlane::isConnected() const { return m_service && m_traffic && m_weather; @@ -256,12 +237,9 @@ namespace BlackSimPlugin if (m_service->isValid() && m_traffic->isValid() && m_weather->isValid() && m_traffic->initialize()) { - // FIXME duplication connect(m_service, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitOwnAircraftModelChanged); connect(m_service, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange); - connect(m_traffic, &CXSwiftBusTrafficProxy::installedModelsUpdated, this, &CSimulatorXPlane::ps_installedModelsUpdated); m_service->updateAirportsInRange(); - m_traffic->updateInstalledModels(); if (m_watcher) { m_watcher->setConnection(m_conn); } loadCslPackages(); emitSimulatorCombinedStatus(); diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 426f5114d..c2cf130c6 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -138,7 +138,6 @@ namespace BlackSimPlugin const QString &modelString, const QString &name, const QString &distributor, const QString &description); void ps_fastTimerTimeout(); void ps_slowTimerTimeout(); - void ps_installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries); private: void loadCslPackages(); @@ -152,7 +151,6 @@ namespace BlackSimPlugin QTimer *m_fastTimer { nullptr }; QTimer *m_slowTimer { nullptr }; BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft - BlackMisc::Simulation::CAircraftModelList m_installedModels; //!< \todo Do we still need this, as we now focus on model set BlackMisc::CData m_modelSet { this }; //! \todo Add units to members? pitchDeg?, altitudeFt? diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index 441c1041c..58a9a6fb1 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -56,11 +56,6 @@ namespace BlackSimPlugin return m_dbusInterface->callDBusRet(QLatin1String("isDrawingLabels")); } - void CXSwiftBusTrafficProxy::updateInstalledModels() const - { - m_dbusInterface->callDBus(QLatin1String("updateInstalledModels")); - } - void CXSwiftBusTrafficProxy::setMaxPlanes(int planes) { m_dbusInterface->callDBus(QLatin1String("setMaxPlanes"), planes); diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index c349c2ff6..75e3843ed 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -61,10 +61,6 @@ namespace BlackSimPlugin private: BlackMisc::CGenericDBusInterface *m_dbusInterface = nullptr; - signals: - //! \copydoc XSwiftBus::CTraffic::installedModelsUpdated - void installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries); - public slots: //! \copydoc XSwiftBus::CTraffic::initialize bool initialize(); @@ -84,9 +80,6 @@ namespace BlackSimPlugin //! \copydoc XSwiftBus::CTraffic::isDrawingLabels bool isDrawingLabels() const; - //! \copydoc XSwiftBus::CTraffic::updateInstalledModels - void updateInstalledModels() const; - //! \copydoc XSwiftBus::CTraffic::setMaxPlanes void setMaxPlanes(int planes); diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 7cb7d9ad0..720570a9a 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -180,30 +180,6 @@ namespace XSwiftBus return XPMPDrawingAircraftLabels(); } - void CTraffic::updateInstalledModels() - { - int numberOfModels = XPMPGetNumberOfInstalledModels(); - QStringList modelNames; - QStringList icaos; - QStringList airlines; - QStringList liveries; - - for (int i = 0; i < numberOfModels; ++i) - { - const char *modelName = nullptr; - const char *icao = nullptr; - const char *airline = nullptr; - const char *livery = nullptr; - XPMPGetModelInfo(i, &modelName, &icao, &airline, &livery); - modelNames.append(QString::fromLocal8Bit(modelName)); - icaos.append(QString::fromLocal8Bit(icao)); - airlines.append(QString::fromLocal8Bit(airline)); - liveries.append(QString::fromLocal8Bit(livery)); - } - - emit installedModelsUpdated(modelNames, icaos, airlines, liveries); - } - void CTraffic::setMaxPlanes(int planes) { g_maxPlanes = planes; diff --git a/src/xswiftbus/traffic.h b/src/xswiftbus/traffic.h index 48f6fd438..05833c3d7 100644 --- a/src/xswiftbus/traffic.h +++ b/src/xswiftbus/traffic.h @@ -65,10 +65,6 @@ namespace XSwiftBus //! Called by XPluginStart static void initLegacyData(); - signals: - //! Installed models updated. - void installedModelsUpdated(const QStringList &modelStrings, const QStringList &icaos, const QStringList &airlines, const QStringList &liveries); - public slots: //! Initialize the multiplayer planes rendering and return true if successful bool initialize(); @@ -88,9 +84,6 @@ namespace XSwiftBus //! Get whether the plugin draws type and callsign labels above aircraft bool isDrawingLabels() const; - //! Called by newly connected client to cause installedModelsUpdated to be emitted. - void updateInstalledModels(); - //! Set the maximum number of aircraft. void setMaxPlanes(int planes);