Fix BlackMisc header includes

* Include only what is used
* Use forward declaration when possible
* Sorted includes

refs #630

src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp

@@ -7,10 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftcfgentries.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
 #include "blackmisc/variant.h"
+
 #include <QDir>
 #include <QFile>
+#include <QFileInfo>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackmisc/simulation/fscommon/aircraftcfgentries.h

@@ -13,12 +13,16 @@
 #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGENTRY_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/timestampbased.h"
-#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/timestampbased.h"
+#include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 
+#include <QMetaType>
+#include <QString>
+
 namespace BlackMisc
 {
     namespace Simulation

src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp

@@ -7,9 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftcfgentrieslist.h"
 #include "blackmisc/predicates.h"
-#include "blackmisc/logmessage.h"
+#include "blackmisc/range.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h

@@ -13,14 +13,18 @@
 #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGLIST_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/collection.h"
-#include <QDir>
-#include <QVector>
-#include <QDebug>
-#include <QSettings>
+#include "blackmisc/sequence.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
+#include <Qt>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp

@@ -7,13 +7,29 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftcfgparser.h"
-#include "blackmisc/simulation/fscommon/fscommonutil.h"
-#include "blackmisc/simulation/aircraftmodelutils.h"
 #include "blackmisc/fileutils.h"
-#include "blackmisc/predicates.h"
 #include "blackmisc/logmessage.h"
+#include "blackmisc/simulation/aircraftmodelutils.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
+#include "blackmisc/simulation/fscommon/fscommonutil.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/worker.h"
 
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileInfoList>
+#include <QFlags>
+#include <QIODevice>
+#include <QList>
+#include <QMetaType>
+#include <QSettings>
+#include <QTextStream>
+#include <Qt>
+#include <QtGlobal>
+#include <atomic>
 #include <tuple>
 
 using namespace BlackMisc;

src/blackmisc/simulation/fscommon/aircraftcfgparser.h

@@ -13,17 +13,24 @@
 #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/worker.h"
-#include "blackmisc/pixmap.h"
-#include "blackmisc/datacache.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/aircraftmodelloader.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "blackmisc/simulation/data/modelcaches.h"
+#include "blackmisc/simulation/simulatorinfo.h"
 
+#include <QObject>
 #include <QPointer>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+#include <memory>
+
+class QSettings;
 
 namespace BlackMisc
 {
+    class CWorker;
+
     namespace Simulation
     {
         namespace FsCommon

src/blackmisc/simulation/fscommon/bcdconversions.cpp

@@ -7,12 +7,13 @@
  * contained in the LICENSE file.
  */
 
-#include "bcdconversions.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/simulation/fscommon/bcdconversions.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 
-
 namespace BlackMisc
 {
     namespace Simulation

src/blackmisc/simulation/fscommon/bcdconversions.h

@@ -14,11 +14,16 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/frequency.h"
-#include "blackmisc/aviation/transponder.h"
+
 #include <QtGlobal>
 
 namespace BlackMisc
 {
+    namespace Aviation
+    {
+        class CTransponder;
+    }
+
     namespace Simulation
     {
         namespace FsCommon

src/blackmisc/simulation/fscommon/fscommonutil.cpp

@@ -8,9 +8,14 @@
  */
 
 #include "blackmisc/buildconfig.h"
-#include "fscommonutil.h"
-#include <QSettings>
+#include "blackmisc/simulation/fscommon/fscommonutil.h"
+
 #include <QDir>
+#include <QList>
+#include <QPair>
+#include <QSettings>
+#include <QStringList>
+#include <QVariant>
 
 using namespace BlackMisc;
 

src/blackmisc/simulation/fscommon/fscommonutil.h

@@ -13,8 +13,11 @@
 #define BLACKMISC_SIMULATION_FSCOMMONUTIL_H
 
 #include "blackmisc/blackmiscexport.h"
+
 #include <QString>
 
+class QStringList;
+
 namespace BlackMisc
 {
     namespace Simulation

src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp

@@ -7,11 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "vpilotmodelrule.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/fscommon/vpilotmodelrule.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+
+#include <Qt>
 
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;

src/blackmisc/simulation/fscommon/vpilotmodelrule.h

@@ -13,11 +13,16 @@
 #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULE_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/simulation/aircraftmodel.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/datastore.h"
 #include "blackmisc/timestampbased.h"
-#include <QJsonObject>
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp

@@ -7,9 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "vpilotmodelruleset.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/range.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
+
+#include <QList>
+#include <QSet>
 #include <QStringList>
+#include <Qt>
+#include <tuple>
 
 using namespace BlackMisc::Network;
 

src/blackmisc/simulation/fscommon/vpilotmodelruleset.h

@@ -12,11 +12,18 @@
 #ifndef BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULELIST_H
 #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULELIST_H
 
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
+
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/simulation/fscommon/vpilotmodelrule.h"
-#include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/metaclassprivate.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/fscommon/vpilotmodelrule.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp

@@ -7,12 +7,29 @@
  * contained in the LICENSE file.
  */
 
-#include "vpilotrulesreader.h"
 #include "blackmisc/logmessage.h"
-#include <QtXml/QDomElement>
-#include <QFile>
+#include "blackmisc/simulation/fscommon/vpilotmodelrule.h"
+#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/worker.h"
+
+#include <QByteArray>
+#include <QDateTime>
 #include <QDir>
+#include <QDomDocument>
+#include <QDomNamedNodeMap>
+#include <QDomNode>
+#include <QDomNodeList>
+#include <QFile>
+#include <QFileInfo>
+#include <QFileInfoList>
+#include <QFlags>
+#include <QIODevice>
+#include <QReadLocker>
 #include <QStandardPaths>
+#include <QTimer>
+#include <QWriteLocker>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;

src/blackmisc/simulation/fscommon/vpilotrulesreader.h

@@ -13,16 +13,20 @@
 #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTRULESREADER_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/worker.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
 #include "blackmisc/simulation/data/modelcaches.h"
-#include <QStringList>
+#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
+
 #include <QObject>
 #include <QReadWriteLock>
+#include <QString>
+#include <QStringList>
 
 namespace BlackMisc
 {
+    class CWorker;
+
     namespace Simulation
     {
         namespace FsCommon