From 6eb008c0a09f35e4e38df7c0c786fb724606babe Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Thu, 3 Oct 2019 19:08:50 +0100 Subject: [PATCH] [FSD] Use forward declaration to reduce header interdependency --- src/blackcore/airspacemonitor.cpp | 1 + src/blackcore/airspacemonitor.h | 6 +++++- src/blackcore/context/contextnetworkimpl.cpp | 1 + src/blackcore/context/contextnetworkimpl.h | 7 ++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 743b7cc22..2158d9dfb 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -14,6 +14,7 @@ #include "blackcore/application.h" #include "blackcore/webdataservices.h" #include "blackcore/context/contextnetwork.h" +#include "blackcore/fsd/fsdclient.h" #include "blackmisc/aviation/aircraftparts.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/comsystem.h" diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index 554a09ba5..7e34c5fc5 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -14,9 +14,9 @@ #include "blackcore/blackcoreexport.h" #include "blackmisc/simulation/settings/modelmatchersettings.h" #include "blackmisc/simulation/aircraftmodelsetprovider.h" -#include "blackcore/fsd/fsdclient.h" #include "blackmisc/network/server.h" #include "blackmisc/network/ecosystem.h" +#include "blackmisc/network/connectionstatus.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/matchinglog.h" @@ -52,6 +52,10 @@ namespace BlackCore { + namespace Fsd + { + class CFSDClient; + } class CAirspaceAnalyzer; //! Keeps track of other entities in the airspace: aircraft, ATC stations, etc. diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 565d3f6f8..d60353277 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -14,6 +14,7 @@ #include "blackcore/airspacemonitor.h" #include "blackcore/application.h" #include "blackcore/corefacade.h" +#include "blackcore/fsd/fsdclient.h" #include "blackcore/webdataservices.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/aviation/aircrafticaocode.h" diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/blackcore/context/contextnetworkimpl.h index 0e274446e..6f9c186c1 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/blackcore/context/contextnetworkimpl.h @@ -21,12 +21,12 @@ #include "blackcore/blackcoreexport.h" #include "blackcore/context/contextnetwork.h" #include "blackcore/corefacadeconfig.h" -#include "blackcore/fsd/fsdclient.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/simulation/simulationenvironmentprovider.h" #include "blackmisc/weather/metar.h" #include "blackmisc/weather/metarlist.h" #include "blackmisc/aviation/aircraftpartslist.h" @@ -69,6 +69,11 @@ namespace BlackCore class CAirspaceMonitor; class CCoreFacade; + namespace Fsd + { + class CFSDClient; + } + namespace Context { //! Network context implementation