From 59343c6c24aaf28e72b3d1df921df181ab47b737 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 14 Dec 2018 10:05:26 +0100 Subject: [PATCH] Minor style fixes --- src/blackcore/pluginmanager.cpp | 2 +- src/blackgui/pluginconfigwindow.cpp | 1 - src/plugins/simulator/fsx/simulatorfsxfactory.cpp | 5 +++-- .../simulator/fsxcommon/simconnectsettingscomponent.cpp | 2 +- src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp | 7 +++++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/blackcore/pluginmanager.cpp b/src/blackcore/pluginmanager.cpp index b200d7a43..a2c05c5f1 100644 --- a/src/blackcore/pluginmanager.cpp +++ b/src/blackcore/pluginmanager.cpp @@ -129,7 +129,7 @@ namespace BlackCore if (!m_paths.contains(identifier)) { - CLogMessage(this).warning("Plugin with id %1 does not exist") << identifier; + CLogMessage(this).warning("Plugin with id '%1' does not exist") << identifier; return nullptr; } diff --git a/src/blackgui/pluginconfigwindow.cpp b/src/blackgui/pluginconfigwindow.cpp index 4d090ce5a..47986c26a 100644 --- a/src/blackgui/pluginconfigwindow.cpp +++ b/src/blackgui/pluginconfigwindow.cpp @@ -17,7 +17,6 @@ namespace BlackGui { - CPluginConfigWindow::CPluginConfigWindow(QWidget *parent) : COverlayMessagesFrame(parent, Qt::Window) { this->setWindowModality(Qt::WindowModal); diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 66bbc12d8..e3f86a888 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -14,12 +14,13 @@ using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; using namespace BlackMisc::Weather; +using namespace BlackCore; namespace BlackSimPlugin { namespace Fsx { - BlackCore::ISimulator *CSimulatorFsxFactory::create(const CSimulatorPluginInfo &info, + ISimulator *CSimulatorFsxFactory::create(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, IWeatherGridProvider *weatherGridProvider, @@ -29,7 +30,7 @@ namespace BlackSimPlugin return new CSimulatorFsx(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, this); } - BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(const CSimulatorPluginInfo &info) + ISimulatorListener *CSimulatorFsxFactory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorFsxListener(info); } diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index 17bfda5a1..391bfae91 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "SimConnectsettingscomponent.h" +#include "simconnectsettingscomponent.h" #include "ui_simconnectsettingscomponent.h" #include "blackgui/guiapplication.h" #include "blackcore/context/contextapplication.h" diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp index 3abb51f3e..2bb98b3ca 100644 --- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp +++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp @@ -10,6 +10,9 @@ #include "simulatorfsxconfig.h" #include "../fsxcommon/simulatorfsxconfigwindow.h" +using namespace BlackGui; +using namespace BlackSimPlugin::FsxCommon; + namespace BlackSimPlugin { namespace Fsx @@ -19,9 +22,9 @@ namespace BlackSimPlugin // void } - BlackGui::CPluginConfigWindow *CSimulatorFsxConfig::createConfigWindow(QWidget *parent) + CPluginConfigWindow *CSimulatorFsxConfig::createConfigWindow(QWidget *parent) { - return new FsxCommon::CSimulatorFsxConfigWindow("FSX", parent); + return new CSimulatorFsxConfigWindow("FSX", parent); } } }