Ref T270, added CSimulatorPluginCommon as base class in driver project

* unlike BlackCore::CSimulatorCommon we can add also UI aspects here
* used by emulated driver, XP and the FS series

src/plugins/simulator/xplane/simulatorxplane.cpp

@@ -8,33 +8,11 @@
  */
 
 #include "simulatorxplane.h"
+#include "qcompilerdetection.h"
+#include "xswiftbusserviceproxy.h"
+#include "xswiftbustrafficproxy.h"
+#include "xswiftbusweatherproxy.h"
 #include "blackcore/aircraftmatcher.h"
-#include "blackmisc/aviation/aircraftengine.h"
-#include "blackmisc/aviation/aircraftenginelist.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/aviation/aircraftparts.h"
-#include "blackmisc/aviation/aircraftsituation.h"
-#include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/aviation/callsign.h"
-#include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/aviation/heading.h"
-#include "blackmisc/aviation/livery.h"
-#include "blackmisc/aviation/transponder.h"
-#include "blackmisc/compare.h"
-#include "blackmisc/dbusserver.h"
-#include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/geo/latitude.h"
-#include "blackmisc/geo/longitude.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/logmessage.h"
-#include "blackmisc/network/textmessage.h"
-#include "blackmisc/pq/angle.h"
-#include "blackmisc/pq/frequency.h"
-#include "blackmisc/pq/length.h"
-#include "blackmisc/pq/pressure.h"
-#include "blackmisc/pq/speed.h"
-#include "blackmisc/pq/temperature.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
@@ -47,10 +25,32 @@
 #include "blackmisc/weather/visibilitylayerlist.h"
 #include "blackmisc/weather/windlayer.h"
 #include "blackmisc/weather/windlayerlist.h"
-#include "qcompilerdetection.h"
-#include "xswiftbusserviceproxy.h"
-#include "xswiftbustrafficproxy.h"
-#include "xswiftbusweatherproxy.h"
+#include "blackmisc/aviation/aircraftengine.h"
+#include "blackmisc/aviation/aircraftenginelist.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircraftparts.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/dbusserver.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/logmessage.h"
 
 #include <QColor>
 #include <QDBusServiceWatcher>
@@ -86,7 +86,7 @@ namespace BlackSimPlugin
                                            IWeatherGridProvider *weatherGridProvider,
                                            IClientProvider *clientProvider,
                                            QObject *parent) :
-            CSimulatorCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent)
+            CSimulatorPluginCommon(info, ownAircraftProvider, remoteAircraftProvider, weatherGridProvider, clientProvider, parent)
         {
             m_watcher = new QDBusServiceWatcher(this);
             m_watcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
@@ -112,7 +112,7 @@ namespace BlackSimPlugin
 
         void CSimulatorXPlane::unload()
         {
-            CSimulatorCommon::unload();
+            CSimulatorPluginCommon::unload();
             delete m_watcher;
             m_watcher = nullptr;
         }

src/plugins/simulator/xplane/simulatorxplane.h

@@ -13,20 +13,21 @@
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 
 #include "xplanempaircraft.h"
+#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
+#include "plugins/simulator/plugincommon/simulatorplugincommon.h"
 #include "blackcore/simulator.h"
 #include "blackcore/simulatorcommon.h"
-#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
-#include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/aviation/callsignset.h"
-#include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/pq/time.h"
-#include "blackmisc/pq/units.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/data/modelcaches.h"
 #include "blackmisc/simulation/settings/simulatorsettings.h"
 #include "blackmisc/simulation/settings/xswiftbussettings.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/weather/weathergrid.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/identifier.h"
@@ -103,7 +104,7 @@ namespace BlackSimPlugin
         };
 
         //! X-Plane ISimulator implementation
-        class CSimulatorXPlane : public BlackCore::CSimulatorCommon
+        class CSimulatorXPlane : public Common::CSimulatorPluginCommon
         {
             Q_OBJECT
 

src/plugins/simulator/xplane/xplane.pro

@@ -1,12 +1,12 @@
 load(common_pre)
 
-QT       += core dbus network
+QT       += core dbus network widgets
 
 TARGET = simulatorxplane
 TEMPLATE = lib
 
 CONFIG += plugin shared
-CONFIG += blackmisc blackcore
+CONFIG += blackmisc blackcore blackgui
 
 DEPENDPATH += . $$SourceRoot/src
 INCLUDEPATH += . $$SourceRoot/src
@@ -14,9 +14,11 @@ INCLUDEPATH += . $$SourceRoot/src
 SOURCES += *.cpp
 HEADERS += *.h
 DISTFILES += simulatorxplane.json
-
 DESTDIR = $$DestRoot/bin/plugins/simulator
 
+LIBS *= -lsimulatorplugincommon
+addStaticLibraryDependency(simulatorplugincommon)
+
 win32 {
     dlltarget.path = $$PREFIX/bin/plugins/simulator
     INSTALLS += dlltarget