From cbc39463067a6581bfe86ce463bfb29fd93ad25c Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 18 May 2016 14:44:54 +0200 Subject: [PATCH] Fix xplane plugin header includes * Include only what is used * Use forward declaration when possible * Sorted includes refs #598 --- .../simulator/xplane/simulatorxplane.cpp | 50 ++++++++++++++++--- .../simulator/xplane/simulatorxplane.h | 39 ++++++++++++++- .../simulator/xplane/xbusserviceproxy.cpp | 6 ++- .../simulator/xplane/xbusserviceproxy.h | 15 +++++- .../simulator/xplane/xbustrafficproxy.cpp | 6 ++- .../simulator/xplane/xbustrafficproxy.h | 10 +++- .../simulator/xplane/xbusweatherproxy.cpp | 5 +- .../simulator/xplane/xbusweatherproxy.h | 9 +++- .../xplaneconfig/simulatorxplaneconfig.cpp | 2 + .../xplaneconfig/simulatorxplaneconfig.h | 7 +++ .../simulatorxplaneconfigwindow.cpp | 16 ++++-- .../simulatorxplaneconfigwindow.h | 11 ++-- .../simulator/xplaneconfig/xplaneconfig.pro | 2 +- 13 files changed, 150 insertions(+), 28 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index fafbfc15a..88607755b 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/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 #include -#include #include -#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 4e48c367a..53610ac16 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/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 +#include +#include +#include +#include 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 { diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.cpp b/src/plugins/simulator/xplane/xbusserviceproxy.cpp index 2aaa6c319..5f176822c 100644 --- a/src/plugins/simulator/xplane/xbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xbusserviceproxy.cpp @@ -8,8 +8,10 @@ */ #include "xbusserviceproxy.h" -#include "blackmisc/dbusserver.h" -#include + +#include + +class QDBusConnection; #define XBUS_SERVICE_SERVICENAME "org.swift-project.xbus" diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.h b/src/plugins/simulator/xplane/xbusserviceproxy.h index 044db66c0..144768ed6 100644 --- a/src/plugins/simulator/xplane/xbusserviceproxy.h +++ b/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 +#include +#include +#include +#include +#include #include +class QDBusConnection; +class QDBusPendingCallWatcher; + //! \cond PRIVATE #define XBUS_SERVICE_INTERFACENAME "org.swift_project.xbus.service" #define XBUS_SERVICE_OBJECTPATH "/xbus/service" diff --git a/src/plugins/simulator/xplane/xbustrafficproxy.cpp b/src/plugins/simulator/xplane/xbustrafficproxy.cpp index a23805901..bd129efdd 100644 --- a/src/plugins/simulator/xplane/xbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xbustrafficproxy.cpp @@ -8,8 +8,10 @@ */ #include "xbustrafficproxy.h" -#include "blackmisc/dbusserver.h" -#include + +#include + +class QDBusConnection; #define XBUS_SERVICENAME "org.swift-project.xbus" diff --git a/src/plugins/simulator/xplane/xbustrafficproxy.h b/src/plugins/simulator/xplane/xbustrafficproxy.h index 7b69d8e37..2b60731aa 100644 --- a/src/plugins/simulator/xplane/xbustrafficproxy.h +++ b/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 +#include +#include + +class QDBusConnection; + //! \cond PRIVATE #define XBUS_TRAFFIC_INTERFACENAME "org.swift_project.xbus.traffic" #define XBUS_TRAFFIC_OBJECTPATH "/xbus/traffic" diff --git a/src/plugins/simulator/xplane/xbusweatherproxy.cpp b/src/plugins/simulator/xplane/xbusweatherproxy.cpp index 6e73ab03c..a62b6a3ea 100644 --- a/src/plugins/simulator/xplane/xbusweatherproxy.cpp +++ b/src/plugins/simulator/xplane/xbusweatherproxy.cpp @@ -8,7 +8,10 @@ */ #include "xbusweatherproxy.h" -#include "blackmisc/dbusserver.h" + +#include + +class QDBusConnection; #define XBUS_SERVICENAME "org.swift-project.xbus" diff --git a/src/plugins/simulator/xplane/xbusweatherproxy.h b/src/plugins/simulator/xplane/xbusweatherproxy.h index e7765d2b0..376df2260 100644 --- a/src/plugins/simulator/xplane/xbusweatherproxy.h +++ b/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 +#include + +class QDBusConnection; + //! \cond PRIVATE #define XBUS_WEATHER_INTERFACENAME "org.swift_project.xbus.weather" #define XBUS_WEATHER_OBJECTPATH "/xbus/weather" diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp index e17d85870..35dd47dc1 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp @@ -10,6 +10,8 @@ #include "simulatorxplaneconfig.h" #include "simulatorxplaneconfigwindow.h" +class QWidget; + namespace BlackSimPlugin { namespace XPlane diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h index e03aaf18e..985bf996c 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h @@ -15,6 +15,13 @@ #include "blackgui/pluginconfig.h" #include "blackmisc/settingscache.h" +#include +#include + +class QWidget; + +namespace BlackGui { class CPluginConfigWindow; } + namespace BlackSimPlugin { namespace XPlane diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp index b9038000f..74adc75fb 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp +++ b/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 +#include "blackmisc/simulation/xplane/xplaneutil.h" +#include "ui_simulatorxplaneconfigwindow.h" + +#include +#include +#include +#include #include +#include #include -#include +#include +#include #include +class QWidget; + using namespace BlackGui; namespace diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h index a6ee38a3e..3c40a0afb 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h +++ b/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 #include -namespace Ui { -class CSimulatorXPlaneConfigWindow; -} +class QWidget; + +namespace Ui { class CSimulatorXPlaneConfigWindow; } namespace BlackSimPlugin { diff --git a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro index 80a10923d..cbcacfdf2 100644 --- a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro +++ b/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