From e32ea65a271ccb394668b7ba8d4a92e03d223cdb Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 17 Dec 2018 16:45:04 +0000 Subject: [PATCH] Fixed clazy warnings: fully-qualified signal parameter types. --- src/blackcore/simulator.h | 2 +- src/blackgui/dockwidget.h | 2 +- src/blackgui/filters/filterbarbuttons.h | 4 ++-- src/blackmisc/simulation/aircraftmodelloader.h | 12 ++++++------ src/blackmisc/simulation/data/modelcaches.h | 2 +- .../simulation/settings/simulatorsettings.h | 2 +- src/blacksound/threadedtonepairplayer.h | 2 +- src/plugins/simulator/xplane/xswiftbusserviceproxy.h | 2 +- src/plugins/simulator/xplane/xswiftbustrafficproxy.h | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 8457c664b..5a399219c 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -337,7 +337,7 @@ namespace BlackCore signals: //! Simulator combined status - void simulatorStatusChanged(SimulatorStatus status); // use emitSimulatorCombinedStatus to emit + void simulatorStatusChanged(BlackCore::ISimulator::SimulatorStatus status); // use emitSimulatorCombinedStatus to emit //! Emitted when own aircraft model has changed void ownAircraftModelChanged(const BlackMisc::Simulation::CAircraftModel &model); diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h index 1a0ed98cb..5a46ebc72 100644 --- a/src/blackgui/dockwidget.h +++ b/src/blackgui/dockwidget.h @@ -146,7 +146,7 @@ namespace BlackGui signals: //! Top level has changed for given widget - void widgetTopLevelChanged(CDockWidget *, bool topLevel); + void widgetTopLevelChanged(BlackGui::CDockWidget *, bool topLevel); //! Font size signals @{ void fontSizePlus(); diff --git a/src/blackgui/filters/filterbarbuttons.h b/src/blackgui/filters/filterbarbuttons.h index bec103263..2012d6fa5 100644 --- a/src/blackgui/filters/filterbarbuttons.h +++ b/src/blackgui/filters/filterbarbuttons.h @@ -53,14 +53,14 @@ namespace BlackGui signals: //! Filter button clicked - void buttonClicked(FilterButton filterButton); + void buttonClicked(BlackGui::Filters::CFilterBarButtons::FilterButton filterButton); public slots: //! Row count has been changed void onRowCountChanged(int count, bool withFilter); //! Trigger button - void clickButton(FilterButton filterButton); + void clickButton(BlackGui::Filters::CFilterBarButtons::FilterButton filterButton); private slots: //! Button was clicked diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index bcdf78e27..bc9d09ffc 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -132,15 +132,15 @@ namespace BlackMisc signals: //! Disk loading started //! \remark will only indicate loading from disk, not cache loading - void diskLoadingStarted(const CSimulatorInfo &simulator, LoadMode loadMode); + void diskLoadingStarted(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode loadMode); //! Parsing is finished or cache has been loaded //! \remark does to fire if the cache has been changed elsewhere and it has just been reloaded here! - void loadingFinished(const CStatusMessageList &status, const CSimulatorInfo &simulator, LoadFinishedInfo info); + void loadingFinished(const BlackMisc::CStatusMessageList &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); //! Relayed from centralized caches //! \remark this can result from loading, the cache changed elsewhere or clearing data - void cacheChanged(const CSimulatorInfo &simulator); + void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); protected: //! Constructor @@ -219,13 +219,13 @@ namespace BlackMisc signals: //! \copydoc IAircraftModelLoader::loadingFinished - void loadingFinished(const CStatusMessageList &status, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info); + void loadingFinished(const BlackMisc::CStatusMessageList &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); //! \copydoc IAircraftModelLoader::diskLoadingStarted - void diskLoadingStarted(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode); + void diskLoadingStarted(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode); //! \copydoc IAircraftModelLoader::cacheChanged - void cacheChanged(const CSimulatorInfo &simulator); + void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); private: IAircraftModelLoader *m_loaderFsx = nullptr; diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index b130e54c9..b8a930411 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -277,7 +277,7 @@ namespace BlackMisc signals: //! Cache has been changed //! \note this detects caches changed elsewhere or set here (the normal caches detect only "elsewhere" - void cacheChanged(const CSimulatorInfo &simulator); + void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); protected: //! Construtor diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index 2f7022cc1..fd1b87369 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -341,7 +341,7 @@ namespace BlackMisc signals: //! Simulator settings have been changed - void settingsChanged(const CSimulatorInfo &simulator); + void settingsChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); private: CSetting m_simSettingsFsx { this, &CMultiSimulatorSettings::onFsxSettingsChanged }; //!< FSX settings diff --git a/src/blacksound/threadedtonepairplayer.h b/src/blacksound/threadedtonepairplayer.h index 5e8f31bf4..aef67d467 100644 --- a/src/blacksound/threadedtonepairplayer.h +++ b/src/blacksound/threadedtonepairplayer.h @@ -43,7 +43,7 @@ namespace BlackSound public slots: //! Play the list of tones. //! If the player is currently active, this call will be ignored. - void play(int volume, const QList &tonePairs); + void play(int volume, const QList &tonePairs); protected slots: //! \copydoc BlackMisc::CContinuousWorker::initialize diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index 864676660..fb7a050f8 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -100,7 +100,7 @@ namespace BlackSimPlugin QString getVersionNumber(); //! Get own aircraft situation data - void getOwnAircraftSituationData(XPlaneData *o_xplaneData); + void getOwnAircraftSituationData(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData); //! \copydoc XSwiftBus::CService::addTextMessage void addTextMessage(const QString &text, double red, double green, double blue); diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 143bc395e..e7ff23ae7 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -189,13 +189,13 @@ namespace BlackSimPlugin void removeAllPlanes(); //! \copydoc XSwiftBus::CTraffic::setPlanesPositions - void setPlanesPositions(const PlanesPositions &planesPositions); + void setPlanesPositions(const BlackSimPlugin::XPlane::PlanesPositions &planesPositions); //! \copydoc XSwiftBus::CTraffic::setPlanesSurfaces - void setPlanesSurfaces(const PlanesSurfaces &planesSurfaces); + void setPlanesSurfaces(const BlackSimPlugin::XPlane::PlanesSurfaces &planesSurfaces); //! \copydoc XSwiftBus::CTraffic::setPlanesTransponders - void setPlanesTransponders(const PlanesTransponders &planesTransponders); + void setPlanesTransponders(const BlackSimPlugin::XPlane::PlanesTransponders &planesTransponders); //! \deprecated XSwiftBus::CTraffic::setInterpolatorMode void setInterpolatorMode(const QString &callsign, bool spline);