From d09336bd26718771807f7af0c032f1d2ac6519cb Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Thu, 12 Nov 2020 20:44:25 +0000 Subject: [PATCH] Issue #77 Break redundant cyclic dependencies --- src/blackmisc/aviation/aircrafticaocode.cpp | 2 +- src/blackmisc/aviation/aircraftparts.cpp | 4 +--- src/blackmisc/aviation/aircraftparts.h | 1 - src/blackmisc/aviation/aircraftsituation.cpp | 2 -- src/blackmisc/aviation/aircraftsituation.h | 1 - src/blackmisc/aviation/aircraftsituationlist.cpp | 2 -- src/blackmisc/aviation/aircraftsituationlist.h | 1 - src/blackmisc/simulation/aircraftmodellist.cpp | 1 - src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp | 1 - 9 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 94849aa18..445e45546 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -6,7 +6,6 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/aviation/aircraftsituationchange.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/db/datastoreutility.h" #include "blackmisc/comparefunctions.h" @@ -14,6 +13,7 @@ #include "blackmisc/propertyindexref.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" +#include "blackmisc/pq/speed.h" #include #include diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 52d69f217..10352ad23 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/simulation/aircraftmodel.h" #include "aircraftparts.h" #include "aircraftlights.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/stringutils.h" #include "blackmisc/verify.h" #include "blackconfig/buildconfig.h" @@ -17,8 +17,6 @@ #include "QStringBuilder" #include -using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Simulation; using namespace BlackConfig; namespace BlackMisc diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index 8f22ae40e..2a6c3d8b3 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -24,7 +24,6 @@ namespace BlackMisc { - namespace Simulation { class CAircraftModel; } namespace Aviation { //! Value object encapsulating information of aircraft's parts diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index e0b5ce8c9..0f6754d4a 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -6,7 +6,6 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/aircraftpartslist.h" #include "blackmisc/aviation/aircraftlights.h" @@ -24,7 +23,6 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Simulation; using namespace BlackConfig; namespace BlackMisc diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index fd4508ff6..483ed1d74 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -36,7 +36,6 @@ namespace BlackMisc { namespace Geo { class CElevationPlane; } - namespace Simulation { class CAircraftModel; } namespace Aviation { class CAircraftParts; diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index c9bd068f8..add6a1580 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -6,7 +6,6 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/geo/elevationplane.h" #include "blackmisc/math/mathutils.h" @@ -18,7 +17,6 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Simulation; using namespace BlackMisc::Math; namespace BlackMisc diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index 85c00a602..5948ffd3d 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -28,7 +28,6 @@ namespace BlackMisc { namespace Geo { class CElevationPlane; } - namespace Simulation { class CAircraftModel; } namespace Aviation { class CAircraftParts; diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index ef58dfb7c..8e275fc52 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -7,7 +7,6 @@ */ #include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/simulation/matchingutils.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/math/mathutils.h" diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp index dd8a31ad8..ada9a18c8 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp @@ -6,7 +6,6 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/fscommon/aircraftcfgentries.h" #include "blackmisc/simulation/fscommon/aircraftcfgparser.h" #include "blackmisc/simulation/fscommon/fscommonutil.h"