Refine header includes to improve build times.

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"

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

src/blackcore/network_vatlib.h

@@ -9,7 +9,6 @@
 #define BLACKCORE_NETWORK_VATLIB_H
 
 #include "network.h"
-#include "blackmisc/avallclasses.h"
 #include <vatlib/vatlib.h>
 #include <QScopedPointer>
 #include <QTimer>

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;

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;

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 <QWidget>
 #include <QPushButton>
 

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;

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 <QPoint>
 #include <QMenu>

src/blackgui/components/runtimebasedcomponent.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "runtimebasedcomponent.h"
+#include "blackcore/context_all_interfaces.h"
 #include <QWidget>
 
 namespace BlackGui

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 <QTimer>
 
+namespace BlackCore
+{
+    class CRuntime;
+    class CRuntimeConfig;
+    class IContextApplication;
+    class IContextAudio;
+    class IContextNetwork;
+    class IContextOwnAircraft;
+    class IContextSettings;
+    class IContextSimulator;
+}
+
 namespace BlackGui
 {
     namespace Components

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 <QColorDialog>
 
 using namespace BlackCore;

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 <QTabWidget>
 #include <QModelIndex>
 #include <QTimer>

src/blackgui/components/settingsfsxcomponent.cpp

@@ -9,16 +9,17 @@
 
 #include "settingsfsxcomponent.h"
 #include "ui_settingsfsxcomponent.h"
-#include <QDesktopServices>
-#include <QFile>
-#include <QDir>
-#include <QFileInfo>
-
+#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 <QDesktopServices>
+#include <QFile>
+#include <QDir>
+#include <QFileInfo>
 
 using namespace BlackMisc;
 using namespace BlackSim::Fsx;

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"

src/blackgui/components/settingssimulatorcomponent.h

@@ -2,6 +2,7 @@
 #define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H
 
 #include "runtimebasedcomponent.h"
+#include "blacksim/setsimulator.h"
 #include <QFrame>
 
 namespace Ui { class CSettingsSimulatorComponent; }

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 <QPushButton>

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 <QTabWidget>
 #include <QLineEdit>
 #include <QTextEdit>

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;

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"