From ac9960d615fde2298f7714c07378bd9c4d712ab3 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 14 Nov 2014 02:40:26 +0000 Subject: [PATCH] Refine header includes to improve build times. --- src/blackcore/context_network.h | 3 ++- src/blackcore/context_ownaircraft.h | 3 ++- src/blackcore/network_vatlib.h | 1 - src/blackgui/components/aircraftcomponent.cpp | 2 ++ src/blackgui/components/atcstationcomponent.cpp | 1 + src/blackgui/components/cockpitv1component.h | 4 ++++ src/blackgui/components/flightplancomponent.cpp | 2 ++ src/blackgui/components/infobarstatuscomponent.cpp | 3 +++ src/blackgui/components/runtimebasedcomponent.cpp | 1 + src/blackgui/components/runtimebasedcomponent.h | 13 ++++++++++++- src/blackgui/components/settingscomponent.cpp | 3 +++ src/blackgui/components/settingscomponent.h | 2 ++ src/blackgui/components/settingsfsxcomponent.cpp | 11 ++++++----- .../components/settingssimulatorcomponent.cpp | 1 + .../components/settingssimulatorcomponent.h | 1 + src/blackgui/components/textmessagecomponent.cpp | 1 + src/blackgui/components/textmessagecomponent.h | 4 +++- src/blackgui/components/usercomponent.cpp | 1 + src/swiftgui_standard/mainwindow.cpp | 1 + 19 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index ca8c5251c..6ee333d67 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -13,7 +13,8 @@ #define BLACKCORE_CONTEXTNETWORK_H #include "blackcore/context.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/avatcstationlist.h" +#include "blackmisc/avaircraftlist.h" #include "blackmisc/statusmessage.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/nwtextmessagelist.h" diff --git a/src/blackcore/context_ownaircraft.h b/src/blackcore/context_ownaircraft.h index 371bdaa72..ff51916d3 100644 --- a/src/blackcore/context_ownaircraft.h +++ b/src/blackcore/context_ownaircraft.h @@ -9,7 +9,8 @@ #define BLACKCORE_CONTEXTOWNAIRCRAFT_H #include "blackcore/context.h" -#include "blackmisc/avallclasses.h" +#include "blackmisc/avaircraft.h" +#include "blackmisc/avatcstation.h" #include "blackmisc/voiceroomlist.h" //! \addtogroup dbus diff --git a/src/blackcore/network_vatlib.h b/src/blackcore/network_vatlib.h index 7efabbf93..df5d31d43 100644 --- a/src/blackcore/network_vatlib.h +++ b/src/blackcore/network_vatlib.h @@ -9,7 +9,6 @@ #define BLACKCORE_NETWORK_VATLIB_H #include "network.h" -#include "blackmisc/avallclasses.h" #include #include #include diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp index a60b10264..6e3025761 100644 --- a/src/blackgui/components/aircraftcomponent.cpp +++ b/src/blackgui/components/aircraftcomponent.cpp @@ -11,6 +11,8 @@ #include "ui_aircraftcomponent.h" #include "dockwidgetinfoareacomponent.h" #include "../guiutility.h" +#include "blackcore/context_network.h" +#include "blackcore/context_simulator.h" using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index ae7806f07..f993ba26a 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -15,6 +15,7 @@ #include "ui_atcstationcomponent.h" #include "blackmisc/avinformationmessage.h" #include "blackmisc/logmessage.h" +#include "blackcore/context_network.h" using namespace BlackGui; using namespace BlackGui::Models; diff --git a/src/blackgui/components/cockpitv1component.h b/src/blackgui/components/cockpitv1component.h index 0b26be864..9e58b9aa7 100644 --- a/src/blackgui/components/cockpitv1component.h +++ b/src/blackgui/components/cockpitv1component.h @@ -13,6 +13,10 @@ #define BLACKGUI_COCKPITV1COMPONENT_H #include "blackgui/components/runtimebasedcomponent.h" +#include "blackmisc/avaircraft.h" +#include "blackmisc/aviocomsystem.h" +#include "blackmisc/voiceroomlist.h" +#include "blackcore/context_audio.h" #include #include diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index a4962bcf7..f0ce3ed87 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -10,6 +10,8 @@ #include "flightplancomponent.h" #include "ui_flightplancomponent.h" #include "blackmisc/logmessage.h" +#include "blackcore/context_network.h" +#include "blackcore/context_ownaircraft.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index 2c48e7c75..77e00d66d 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -10,6 +10,9 @@ #include "infobarstatuscomponent.h" #include "ui_infobarstatuscomponent.h" #include "blackmisc/icons.h" +#include "blackcore/context_simulator.h" +#include "blackcore/context_network.h" +#include "blackcore/context_application.h" #include #include diff --git a/src/blackgui/components/runtimebasedcomponent.cpp b/src/blackgui/components/runtimebasedcomponent.cpp index 7a05a84a4..3fded1059 100644 --- a/src/blackgui/components/runtimebasedcomponent.cpp +++ b/src/blackgui/components/runtimebasedcomponent.cpp @@ -8,6 +8,7 @@ */ #include "runtimebasedcomponent.h" +#include "blackcore/context_all_interfaces.h" #include namespace BlackGui diff --git a/src/blackgui/components/runtimebasedcomponent.h b/src/blackgui/components/runtimebasedcomponent.h index 57297c4b6..ce9055a74 100644 --- a/src/blackgui/components/runtimebasedcomponent.h +++ b/src/blackgui/components/runtimebasedcomponent.h @@ -13,10 +13,21 @@ #define BLACKGUI_RUNTIMEBASEDCOMPONENT_H #include "blackcore/context_runtime.h" -#include "blackcore/context_all_interfaces.h" #include "blackmisc/notificationsounds.h" #include +namespace BlackCore +{ + class CRuntime; + class CRuntimeConfig; + class IContextApplication; + class IContextAudio; + class IContextNetwork; + class IContextOwnAircraft; + class IContextSettings; + class IContextSimulator; +} + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 5d47ce85d..641a4afe6 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -13,9 +13,12 @@ #include "blackgui/stylesheetutility.h" #include "blackcore/dbus_server.h" #include "blackcore/context_network.h" +#include "blackcore/context_settings.h" +#include "blackcore/context_audio.h" #include "blackmisc/hwkeyboardkeylist.h" #include "blackmisc/setaudio.h" #include "blackmisc/logmessage.h" +#include "blackmisc/settingsblackmiscclasses.h" #include using namespace BlackCore; diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index a51cd2fff..6e66fcf8d 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -13,6 +13,8 @@ #define BLACKGUI_SETTINGSCOMPONENT_H #include "blackgui/components/runtimebasedcomponent.h" +#include "blackmisc/nwserver.h" +#include "blackmisc/avaircrafticao.h" #include #include #include diff --git a/src/blackgui/components/settingsfsxcomponent.cpp b/src/blackgui/components/settingsfsxcomponent.cpp index 4bd8cacae..153de5b1f 100644 --- a/src/blackgui/components/settingsfsxcomponent.cpp +++ b/src/blackgui/components/settingsfsxcomponent.cpp @@ -9,16 +9,17 @@ #include "settingsfsxcomponent.h" #include "ui_settingsfsxcomponent.h" -#include -#include -#include -#include - +#include "blackcore/context_simulator.h" +#include "blackcore/context_application.h" #include "blackmisc/networkutils.h" #include "blackmisc/statusmessage.h" #include "blackmisc/logmessage.h" #include "blacksim/fsx/fsxsimulatorsetup.h" #include "blacksim/fsx/simconnectutilities.h" +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackSim::Fsx; diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index 5ec8acd22..6f34fcfb2 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -2,6 +2,7 @@ #include "ui_settingssimulatorcomponent.h" #include "blackcore/context_settings.h" +#include "blackcore/context_simulator.h" #include "blacksim/simulatorinfolist.h" #include "blacksim/setsimulator.h" #include "blackmisc/settingutilities.h" diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h index 15759f2a7..b9536ed9e 100644 --- a/src/blackgui/components/settingssimulatorcomponent.h +++ b/src/blackgui/components/settingssimulatorcomponent.h @@ -2,6 +2,7 @@ #define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H #include "runtimebasedcomponent.h" +#include "blacksim/setsimulator.h" #include namespace Ui { class CSettingsSimulatorComponent; } diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 8dd62d7d1..567a36a1e 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -11,6 +11,7 @@ #include "blackmisc/nwuser.h" #include "blackmisc/notificationsounds.h" #include "blackmisc/logmessage.h" +#include "blackcore/context_audio.h" #include "ui_textmessagecomponent.h" #include diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 3ac2ae2a1..e70512de2 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -16,7 +16,9 @@ #include "blackgui/components/timerbasedcomponent.h" #include "blackmisc/nwtextmessage.h" #include "blackmisc/avaircraft.h" - +#include "blackmisc/nwtextmessagelist.h" +#include "blackcore/context_network.h" +#include "blackcore/context_ownaircraft.h" #include #include #include diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index dba2f4eee..8b80928a4 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -11,6 +11,7 @@ #include "ui_usercomponent.h" #include "../guiutility.h" #include "blackmisc/nwuserlist.h" +#include "blackcore/context_network.h" using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/swiftgui_standard/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp index d1909f32f..8cd97a15d 100644 --- a/src/swiftgui_standard/mainwindow.cpp +++ b/src/swiftgui_standard/mainwindow.cpp @@ -15,6 +15,7 @@ #include "blackcore/dbus_server.h" #include "blackcore/context_network.h" #include "blackcore/context_application.h" +#include "blackcore/context_ownaircraft.h" #include "blackcore/network.h" #include "blackmisc/avaircraft.h" #include "blackmisc/logmessage.h"