Clean up

src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbusserviceproxy.h"
-#include "simulatorxplane.h"
+#include "fgswiftbusserviceproxy.h"
+#include "simulatorflightgear.h"
 
 #include <QLatin1String>
 #include <QPointer>

src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbustrafficproxy.h"
+#include "fgswiftbustrafficproxy.h"
 #include <QLatin1String>
 #include <QDBusConnection>
 

src/plugins/simulator/flightgear/fgswiftbusweatherproxy.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xswiftbusweatherproxy.h"
+#include "fgswiftbusweatherproxy.h"
 
 #include <QLatin1String>
 

src/plugins/simulator/flightgear/flightgear.pro

@@ -18,7 +18,7 @@ unix:!macx {
 
 SOURCES += *.cpp
 HEADERS += *.h
-DISTFILES += simulatorxplane.json
+DISTFILES += simulatorflightgear.json
 DESTDIR = $$DestRoot/bin/plugins/simulator
 
 win32 {

src/plugins/simulator/flightgear/flightgearmpaircraft.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "xplanempaircraft.h"
+#include "flightgearmpaircraft.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/simulation/interpolatormulti.h"
 

src/plugins/simulator/flightgear/simulatorflightgear.cpp

@@ -7,11 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplane.h"
+#include "simulatorflightgear.h"
 #include "qcompilerdetection.h"
-#include "xswiftbusserviceproxy.h"
-#include "xswiftbustrafficproxy.h"
-#include "xswiftbusweatherproxy.h"
+#include "fgswiftbusserviceproxy.h"
+#include "fgswiftbustrafficproxy.h"
+#include "fgswiftbusweatherproxy.h"
 #include "blackcore/aircraftmatcher.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"

src/plugins/simulator/flightgear/simulatorflightgear.h

@@ -12,13 +12,13 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 
-#include "xplanempaircraft.h"
-#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
+#include "flightgearmpaircraft.h"
+#include "plugins/simulator/flightgearconfig/simulatorflightgearconfig.h"
 #include "plugins/simulator/plugincommon/simulatorplugincommon.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/data/modelcaches.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
-#include "blackmisc/simulation/settings/mysettings.h"
+#include "blackmisc/simulation/settings/fgsettings.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/weather/weathergrid.h"
 #include "blackmisc/aviation/airportlist.h"
@@ -294,7 +294,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorxplane.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorflightgear.json")
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:

src/plugins/simulator/flightgearconfig/flightgearconfig.pro

@@ -14,7 +14,7 @@ INCLUDEPATH += . $$SourceRoot/src
 SOURCES += *.cpp
 HEADERS += *.h
 FORMS += *.ui
-DISTFILES += simulatorxplaneconfig.json
+DISTFILES += simulatorflightgearconfig.json
 
 DESTDIR = $$DestRoot/bin/plugins/simulator
 

src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplaneconfig.h"
-#include "simulatorxplaneconfigwindow.h"
+#include "simulatorflightgearconfig.h"
+#include "simulatorflightgearconfigwindow.h"
 
 class QWidget;
 

src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h

@@ -31,7 +31,7 @@ namespace BlackSimPlugin
         class CSimulatorXPlaneConfig : public QObject, public BlackGui::IPluginConfig
         {
             Q_OBJECT
-            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorxplaneconfig.json")
+            Q_PLUGIN_METADATA(IID "org.swift-project.blackgui.pluginconfiginterface" FILE "simulatorflightgearconfig.json")
             Q_INTERFACES(BlackGui::IPluginConfig)
 
         public:

src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatorxplaneconfigwindow.h"
+#include "simulatorflightgearconfigwindow.h"
 #include "blackcore/application.h"
-#include "ui_simulatorxplaneconfigwindow.h"
+#include "ui_simulatorflightgearconfigwindow.h"
 #include "blackmisc/simulation/xplane/xswiftbusconfigwriter.h"
 
 #include <QComboBox>

src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h

@@ -13,8 +13,8 @@
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 
 #include "blackgui/pluginconfigwindow.h"
-#include "blackmisc/simulation/settings/mysettings.h"
-#include "simulatorxplaneconfig.h"
+#include "blackmisc/simulation/settings/fgsettings.h"
+#include "simulatorflightgearconfig.h"
 #include <QObject>
 #include <QScopedPointer>