From 055e4aae17555081a090dce170366472acf1f985 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 7 Feb 2016 18:40:28 +0100 Subject: [PATCH] Fix source code not in sync with doxygen doc refs #544 --- src/blackcore/simulator.h | 2 +- src/blackgui/views/aircraftmodelview.cpp | 4 ++-- src/blackgui/views/aircraftmodelview.h | 2 +- src/blackmisc/network/webdataservicesprovider.h | 2 +- src/blackmisc/simulation/remoteaircraftprovider.cpp | 2 +- src/blackmisc/simulation/remoteaircraftprovider.h | 2 +- src/plugins/simulator/fsx/simulatorfsxfactory.cpp | 4 ++-- src/plugins/simulator/fsx/simulatorfsxfactory.h | 2 +- src/plugins/simulator/xplane/simulatorxplane.cpp | 4 ++-- src/plugins/simulator/xplane/simulatorxplane.h | 2 +- src/plugins/simulator/xplane/xbusserviceproxy.cpp | 8 ++++---- src/plugins/simulator/xplane/xbusserviceproxy.h | 4 ++-- src/plugins/simulator/xplane/xbustrafficproxy.cpp | 4 ++-- src/plugins/simulator/xplane/xbustrafficproxy.h | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 9a59b9245..f3c58010d 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -282,7 +282,7 @@ namespace BlackCore virtual ISimulator *create( const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::IPluginStorageProvider *pluginStorageProvider) = 0; //! Simulator listener instance diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp index daea9996c..c5acfadfd 100644 --- a/src/blackgui/views/aircraftmodelview.cpp +++ b/src/blackgui/views/aircraftmodelview.cpp @@ -157,7 +157,7 @@ namespace BlackGui this->derivedModel()->setHighlightModelStringsColor(brush); } - bool CAircraftModelView::highlightModelsStrings() const + bool CAircraftModelView::highlightModelStrings() const { return this->derivedModel()->highlightModelStrings(); } @@ -287,7 +287,7 @@ namespace BlackGui void CAircraftModelView::ps_toogleHighlightInvalidModels() { - bool h = this->highlightModelsStrings(); + bool h = this->highlightModelStrings(); this->setHighlightModelStrings(!h); } diff --git a/src/blackgui/views/aircraftmodelview.h b/src/blackgui/views/aircraftmodelview.h index abd716662..22d04dfe5 100644 --- a/src/blackgui/views/aircraftmodelview.h +++ b/src/blackgui/views/aircraftmodelview.h @@ -73,8 +73,8 @@ namespace BlackGui //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStringsColor void setHighlightModelStringsColor(const QBrush &brush); - bool highlightModelsStrings() const; //! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModelStrings + bool highlightModelStrings() const; signals: //! Request to stash if applicable diff --git a/src/blackmisc/network/webdataservicesprovider.h b/src/blackmisc/network/webdataservicesprovider.h index 5bcd2a668..fcd868b4b 100644 --- a/src/blackmisc/network/webdataservicesprovider.h +++ b/src/blackmisc/network/webdataservicesprovider.h @@ -345,8 +345,8 @@ namespace BlackMisc //! \copydoc IWebDataServicesProvider::getMetars BlackMisc::Weather::CMetarSet getMetars() const; - int getMetarCount() const; //! \copydoc IWebDataServicesProvider::getMetarsCount + int getMetarsCount() const; //! \copydoc IWebDataServicesProvider::updateWithVatsimDataFileData void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 6fe8b3bb4..a223080eb 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -34,7 +34,7 @@ namespace BlackMisc return this->m_remoteAircraftProvider->getAircraftInRangeForCallsign(callsign); } - CAircraftModel CRemoteAircraftAware::getAircraftinRangeModelForCallsign(const CCallsign &callsign) const + CAircraftModel CRemoteAircraftAware::getAircraftInRangeModelForCallsign(const CCallsign &callsign) const { Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available"); return this->m_remoteAircraftProvider->getAircraftInRangeModelForCallsign(callsign); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index cd191f8e3..0164fec3e 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -130,8 +130,8 @@ namespace BlackMisc //! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const Aviation::CCallsign &callsign) const; - virtual BlackMisc::Simulation::CAircraftModel getAircraftinRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::getAircraftInRangeModelForCallsign + virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; //! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const; diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 7263f294f..41c2544f8 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -19,11 +19,11 @@ namespace BlackSimPlugin { BlackCore::ISimulator *CSimulatorFsxFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::IPluginStorageProvider *pluginStorageProvider) { Q_ASSERT(ownAircraftProvider); - return new CSimulatorFsx(info, ownAircraftProvider, renderedAircraftProvider, pluginStorageProvider, this); + return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, this); } BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index fc03d0ed1..00103abf6 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -36,7 +36,7 @@ namespace BlackSimPlugin //! \copydoc BlackCore::ISimulatorFactory::create virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::IPluginStorageProvider *pluginStorageProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 5b6072ef3..7d985d790 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -509,10 +509,10 @@ namespace BlackSimPlugin BlackCore::ISimulator *CSimulatorXPlaneFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *renderedAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, IPluginStorageProvider *pluginStorageProvider) { - return new CSimulatorXPlane(info, ownAircraftProvider, renderedAircraftProvider, pluginStorageProvider, this); + return new CSimulatorXPlane(info, ownAircraftProvider, remoteAircraftProvider, pluginStorageProvider, this); } CSimulatorXPlaneListener::CSimulatorXPlaneListener(const CSimulatorPluginInfo &info): ISimulatorListener(info) diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 4566b0052..ffc764c2b 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -229,7 +229,7 @@ namespace BlackSimPlugin //! \copydoc BlackCore::ISimulatorFactory::create virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider, + BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::IPluginStorageProvider *pluginStorageProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.cpp b/src/plugins/simulator/xplane/xbusserviceproxy.cpp index 69fe0c3a4..8d32e4680 100644 --- a/src/plugins/simulator/xplane/xbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xbusserviceproxy.cpp @@ -48,13 +48,13 @@ namespace BlackSimPlugin m_dbusInterface->callDBusAsync(QLatin1String("getAircraftModelFilename"), setterCallback(o_modelFilename)); } - QString CXBusServiceProxy::getAircraftModelLivery() const + QString CXBusServiceProxy::getAircraftLivery() const { - return m_dbusInterface->callDBusRet(QLatin1String("getAircraftModelLivery")); + return m_dbusInterface->callDBusRet(QLatin1String("getAircraftLivery")); } - void CXBusServiceProxy::getAircraftModelLiveryAsync(QString *o_modelLivery) + void CXBusServiceProxy::getAircraftLiveryAsync(QString *o_modelLivery) { - m_dbusInterface->callDBusAsync(QLatin1String("getAircraftModelLivery"), setterCallback(o_modelLivery)); + m_dbusInterface->callDBusAsync(QLatin1String("getAircraftLivery"), setterCallback(o_modelLivery)); } QString CXBusServiceProxy::getAircraftIcaoCode() const diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.h b/src/plugins/simulator/xplane/xbusserviceproxy.h index b89473cfe..99b245aee 100644 --- a/src/plugins/simulator/xplane/xbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xbusserviceproxy.h @@ -99,8 +99,8 @@ namespace BlackSimPlugin //! \copydoc XBus::CService::getAircraftLivery //! @{ - QString getAircraftModelLivery() const; - void getAircraftModelLiveryAsync(QString *o_modelLivery); + QString getAircraftLivery() const; + void getAircraftLiveryAsync(QString *o_modelLivery); //! @} //! \copydoc XBus::CService::getAircraftIcaoCode diff --git a/src/plugins/simulator/xplane/xbustrafficproxy.cpp b/src/plugins/simulator/xplane/xbustrafficproxy.cpp index 25caeccdb..7af2eb44b 100644 --- a/src/plugins/simulator/xplane/xbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xbustrafficproxy.cpp @@ -60,9 +60,9 @@ namespace BlackSimPlugin m_dbusInterface->callDBus(QLatin1String("setMaxPlanes"), planes); } - void CXBusTrafficProxy::setDrawDistance(float nauticalMiles) + void CXBusTrafficProxy::setMaxDrawDistance(float nauticalMiles) { - m_dbusInterface->callDBus(QLatin1String("setDrawDistance"), nauticalMiles); + m_dbusInterface->callDBus(QLatin1String("setMaxDrawDistance"), nauticalMiles); } void CXBusTrafficProxy::addPlane(const QString &callsign, const QString &modelName, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery) diff --git a/src/plugins/simulator/xplane/xbustrafficproxy.h b/src/plugins/simulator/xplane/xbustrafficproxy.h index 16e74d8a1..50f095299 100644 --- a/src/plugins/simulator/xplane/xbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xbustrafficproxy.h @@ -80,8 +80,8 @@ namespace BlackSimPlugin //! \copydoc XBus::CTraffic::setMaxPlanes void setMaxPlanes(int planes); - void setDrawDistance(float nauticalMiles); //! \copydoc XBus::CTraffic::setMaxDrawDistance + void setMaxDrawDistance(float nauticalMiles); //! \copydoc XBus::CTraffic::addPlane void addPlane(const QString &callsign, const QString &modelName, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery);