Issue #77 Break redundant cyclic dependencies

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 <QChar>
 #include <QJsonValue>

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 <QtGlobal>
 
-using namespace BlackMisc::PhysicalQuantities;
-using namespace BlackMisc::Simulation;
 using namespace BlackConfig;
 
 namespace BlackMisc

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

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

src/blackmisc/aviation/aircraftsituation.h

@@ -36,7 +36,6 @@
 namespace BlackMisc
 {
     namespace Geo { class CElevationPlane; }
-    namespace Simulation { class CAircraftModel; }
     namespace Aviation
     {
         class CAircraftParts;

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

src/blackmisc/aviation/aircraftsituationlist.h

@@ -28,7 +28,6 @@
 namespace BlackMisc
 {
     namespace Geo { class CElevationPlane; }
-    namespace Simulation { class CAircraftModel; }
     namespace Aviation
     {
         class CAircraftParts;

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"

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"