From a89c4a97758070b06e0cd878ba1932bb9574a28d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 27 May 2015 04:02:58 +0200 Subject: [PATCH] #refs 432 using forward declaration to reduce includes in header Remark: some related includes had to be updated --- .../components/maininfoareacomponent.cpp | 4 +--- .../components/maininfoareacomponent.h | 18 +++++++++++++++--- .../components/mainkeypadareacomponent.cpp | 2 ++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp index 930000fdc..b3fa307eb 100644 --- a/src/blackgui/components/maininfoareacomponent.cpp +++ b/src/blackgui/components/maininfoareacomponent.cpp @@ -9,6 +9,7 @@ #include "maininfoareacomponent.h" #include "ui_maininfoareacomponent.h" +#include "allmaininfoareacomponents.h" #include "../stylesheetutility.h" #include "../guiutility.h" #include "blackmisc/icons.h" @@ -97,7 +98,6 @@ namespace BlackGui case InfoAreaLog: case InfoAreaSimulator: return QSize(400, 300); - break; case InfoAreaMappings: case InfoAreaSettings: case InfoAreaTextMessages: @@ -105,10 +105,8 @@ namespace BlackGui break; case InfoAreaFlightPlan: return QSize(625, 500); - break; default: return QSize(400, 300); - break; } } diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h index 794b7a8d4..749e931ab 100644 --- a/src/blackgui/components/maininfoareacomponent.h +++ b/src/blackgui/components/maininfoareacomponent.h @@ -14,7 +14,6 @@ #include "blackgui/blackguiexport.h" #include "../infoarea.h" -#include "allmaininfoareacomponents.h" #include #include #include @@ -24,6 +23,19 @@ namespace BlackGui { namespace Components { + // forward declaration to break compile dependency from all components + class CCockpitComponent; + class CAtcStationComponent; + class CAircraftComponent; + class CMappingComponent; + class CUserComponent; + class CFlightPlanComponent; + class CSettingsComponent; + class CLogComponent; + class CSimulatorComponent; + class CTextMessageComponent; + + //! Main info area class BLACKGUI_EXPORT CMainInfoAreaComponent : public BlackGui::CInfoArea { @@ -104,7 +116,7 @@ namespace BlackGui private: QScopedPointer ui; }; - } -} + } // ns +} // ns #endif // guard diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index 0e0b1c158..125d3345e 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -10,6 +10,8 @@ #include "mainkeypadareacomponent.h" #include "ui_mainkeypadareacomponent.h" #include "blackcore/context_audio.h" +#include "blackcore/context_network.h" +#include "blackcore/context_ownaircraft.h" using namespace BlackMisc; using namespace BlackMisc::Aviation;