From f7c714b1537011cbdebeadfa06b0023825b035bf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 10 Nov 2017 19:10:01 +0100 Subject: [PATCH] Ref T180, FSX/P3D driver formatting --- src/plugins/simulator/fsx/simulatorfsxfactory.cpp | 13 ++++++++----- src/plugins/simulator/fsx/simulatorfsxfactory.h | 1 - src/plugins/simulator/p3d/simulatorp3dfactory.cpp | 13 ++++++++----- .../simulator/p3dconfig/simulatorp3dconfig.cpp | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index ce834b6f1..043b66546 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -11,20 +11,23 @@ #include "simulatorfsx.h" #include "blackmisc/simulation/simulatorplugininfo.h" +using namespace BlackMisc::Simulation; +using namespace BlackMisc::Weather; + namespace BlackSimPlugin { namespace Fsx { - BlackCore::ISimulator *CSimulatorFsxFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) + BlackCore::ISimulator *CSimulatorFsxFactory::create(const CSimulatorPluginInfo &info, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IWeatherGridProvider *weatherGridProvider) { Q_ASSERT(ownAircraftProvider); return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } - BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) + BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorFsxListener(info); } diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index e8e92a56f..5fcf49547 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -41,7 +41,6 @@ namespace BlackSimPlugin //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override; }; - } // namespace } // namespace diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp index ba926efd6..14a0ee6ae 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp @@ -11,20 +11,23 @@ #include "simulatorp3d.h" #include "blackmisc/simulation/simulatorplugininfo.h" +using namespace BlackMisc::Simulation; +using namespace BlackMisc::Weather; + namespace BlackSimPlugin { namespace P3D { - BlackCore::ISimulator *CSimulatorP3DFactory::create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, - BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider) + BlackCore::ISimulator *CSimulatorP3DFactory::create(const CSimulatorPluginInfo &info, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IWeatherGridProvider *weatherGridProvider) { Q_ASSERT(ownAircraftProvider); return new CSimulatorP3D(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, this); } - BlackCore::ISimulatorListener *CSimulatorP3DFactory::createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) + BlackCore::ISimulatorListener *CSimulatorP3DFactory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorP3DListener(info); } diff --git a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp index 8d4b62c9c..4786785d1 100644 --- a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp +++ b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp @@ -21,7 +21,7 @@ namespace BlackSimPlugin BlackGui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent) { - return new BlackSimPlugin::FsxCommon::CSimulatorFsxConfigWindow("P3D", parent); + return new FsxCommon::CSimulatorFsxConfigWindow("P3D", parent); } } }