Fix xplane plugin header includes

* Include only what is used
* Use forward declaration when possible
* Sorted includes

refs #598

src/plugins/simulator/xplane/simulatorxplane.cpp

@@ -8,17 +8,55 @@
  */
 
 #include "simulatorxplane.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"
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/gridpoint.h"
+#include "blackmisc/weather/temperaturelayer.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/visibilitylayer.h"
+#include "blackmisc/weather/visibilitylayerlist.h"
+#include "blackmisc/weather/windlayer.h"
+#include "blackmisc/weather/windlayerlist.h"
+#include "qcompilerdetection.h"
 #include "xbusserviceproxy.h"
 #include "xbustrafficproxy.h"
 #include "xbusweatherproxy.h"
-#include "blackmisc/dbusserver.h"
-#include "blackmisc/logmessage.h"
-#include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/network/textmessage.h"
+
+#include <QColor>
 #include <QDBusServiceWatcher>
-#include <QTimer>
 #include <QString>
-#include <functional>
+#include <QTimer>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/plugins/simulator/xplane/simulatorxplane.h

@@ -12,15 +12,50 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
 
+#include "blackcore/simulator.h"
 #include "blackcore/simulatorcommon.h"
-#include "blackmisc/simulation/ownaircraftprovider.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/identifier.h"
 #include "blackmisc/pixmap.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/settingscache.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/statusmessage.h"
 #include "blackmisc/weather/weathergrid.h"
 #include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
+
 #include <QDBusConnection>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 
 class QDBusServiceWatcher;
+class QTimer;
+
+namespace BlackMisc
+{
+    class IPluginStorageProvider;
+    namespace Aviation
+    {
+        class CAircraftParts;
+        class CAircraftSituation;
+        class CCallsign;
+    }
+    namespace Network { class CTextMessage; }
+    namespace Simulation
+    {
+        class CSimulatedAircraft;
+        class CSimulatorPluginInfo;
+        class IOwnAircraftProvider;
+        class IRemoteAircraftProvider;
+    }
+    namespace Weather { class IWeatherGridProvider; }
+}
 
 namespace BlackSimPlugin
 {

src/plugins/simulator/xplane/xbusserviceproxy.cpp

@@ -8,8 +8,10 @@
  */
 
 #include "xbusserviceproxy.h"
-#include "blackmisc/dbusserver.h"
-#include <QMetaMethod>
+
+#include <QLatin1String>
+
+class QDBusConnection;
 
 #define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus"
 

src/plugins/simulator/xplane/xbusserviceproxy.h

@@ -7,15 +7,26 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKSIMPLUGIN_XBUS_SERVICE_PROXY_H
 #define BLACKSIMPLUGIN_XBUS_SERVICE_PROXY_H
 
-//! \file
+
 
 #include "blackmisc/genericdbusinterface.h"
-#include "blackmisc/sequence.h"
+
+#include <QDBusError>
+#include <QDBusPendingReply>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <functional>
 
+class QDBusConnection;
+class QDBusPendingCallWatcher;
+
 //! \cond PRIVATE
 #define XBUS_SERVICE_INTERFACENAME "org.swift_project.xbus.service"
 #define XBUS_SERVICE_OBJECTPATH "/xbus/service"

src/plugins/simulator/xplane/xbustrafficproxy.cpp

@@ -8,8 +8,10 @@
  */
 
 #include "xbustrafficproxy.h"
-#include "blackmisc/dbusserver.h"
-#include <QMetaMethod>
+
+#include <QLatin1String>
+
+class QDBusConnection;
 
 #define XBUS_SERVICENAME "org.swift-project.xbus"
 

src/plugins/simulator/xplane/xbustrafficproxy.h

@@ -7,13 +7,19 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKSIMPLUGIN_XBUS_TRAFFIC_PROXY_H
 #define BLACKSIMPLUGIN_XBUS_TRAFFIC_PROXY_H
 
-//! \file
-
 #include "blackmisc/genericdbusinterface.h"
 
+#include <QObject>
+#include <QString>
+#include <QStringList>
+
+class QDBusConnection;
+
 //! \cond PRIVATE
 #define XBUS_TRAFFIC_INTERFACENAME "org.swift_project.xbus.traffic"
 #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic"

src/plugins/simulator/xplane/xbusweatherproxy.cpp

@@ -8,7 +8,10 @@
  */
 
 #include "xbusweatherproxy.h"
-#include "blackmisc/dbusserver.h"
+
+#include <QLatin1String>
+
+class QDBusConnection;
 
 #define XBUS_SERVICENAME "org.swift-project.xbus"
 

src/plugins/simulator/xplane/xbusweatherproxy.h

@@ -7,13 +7,18 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKSIMPLUGIN_XBUS_WEATHER_PROXY_H
 #define BLACKSIMPLUGIN_XBUS_WEATHER_PROXY_H
 
-//! \file
-
 #include "blackmisc/genericdbusinterface.h"
 
+#include <QObject>
+#include <QString>
+
+class QDBusConnection;
+
 //! \cond PRIVATE
 #define XBUS_WEATHER_INTERFACENAME "org.swift_project.xbus.weather"
 #define XBUS_WEATHER_OBJECTPATH "/xbus/weather"

src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp

@@ -10,6 +10,8 @@
 #include "simulatorxplaneconfig.h"
 #include "simulatorxplaneconfigwindow.h"
 
+class QWidget;
+
 namespace BlackSimPlugin
 {
     namespace XPlane

src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h

@@ -15,6 +15,13 @@
 #include "blackgui/pluginconfig.h"
 #include "blackmisc/settingscache.h"
 
+#include <QObject>
+#include <QString>
+
+class QWidget;
+
+namespace BlackGui { class CPluginConfigWindow; }
+
 namespace BlackSimPlugin
 {
     namespace XPlane

src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp

@@ -8,16 +8,24 @@
  */
 
 #include "simulatorxplaneconfigwindow.h"
-#include "ui_simulatorxplaneconfigwindow.h"
 #include "blackmisc/dbusserver.h"
-#include "blackmisc/simulation/xplane/xplaneutil.h"
 #include "blackmisc/fileutils.h"
-#include <QStringBuilder>
+#include "blackmisc/simulation/xplane/xplaneutil.h"
+#include "ui_simulatorxplaneconfigwindow.h"
+
+#include <QComboBox>
+#include <QCoreApplication>
+#include <QDialogButtonBox>
+#include <QDir>
 #include <QFileDialog>
+#include <QFlags>
 #include <QMessageBox>
-#include <QStandardPaths>
+#include <QPushButton>
+#include <QString>
 #include <QStringBuilder>
 
+class QWidget;
+
 using namespace BlackGui;
 
 namespace

src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h

@@ -12,13 +12,16 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 #define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
 
-#include "simulatorxplaneconfig.h"
 #include "blackgui/pluginconfigwindow.h"
+#include "blackmisc/settingscache.h"
+#include "simulatorxplaneconfig.h"
+
+#include <QObject>
 #include <QScopedPointer>
 
-namespace Ui {
-class CSimulatorXPlaneConfigWindow;
-}
+class QWidget;
+
+namespace Ui { class CSimulatorXPlaneConfigWindow; }
 
 namespace BlackSimPlugin
 {

src/plugins/simulator/xplaneconfig/xplaneconfig.pro

@@ -1,6 +1,6 @@
 load(common_pre)
 
-QT       += core widgets dbus
+QT       += core dbus widgets
 
 TARGET = simulatorxplaneconfig
 TEMPLATE = lib