Fix BlackGui header includes

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

refs #598

src/blackgui/editors/aircrafticaoform.cpp

@@ -7,13 +7,27 @@
  * contained in the LICENSE file.
  */
 
+#include "blackcore/webdataservices.h"
+#include "blackgui/components/aircraftcombinedtypeselector.h"
+#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
+#include "blackgui/dropsite.h"
+#include "blackgui/editors/aircrafticaoform.h"
+#include "blackgui/editors/validationindicator.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
+#include "blackgui/labelandicon.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
-#include "aircrafticaoform.h"
+#include "blackmisc/compare.h"
 #include "blackmisc/datastore.h"
+#include "blackmisc/icons.h"
 #include "ui_aircrafticaoform.h"
 
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QMetaType>
+#include <QString>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackGui::Components;

src/blackgui/editors/aircrafticaoform.h

@@ -16,8 +16,13 @@
 #include "blackgui/editors/form.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/variant.h"
+
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
+
 namespace Ui { class CAircraftIcaoForm; }
 
 namespace BlackGui

src/blackgui/editors/airlineicaoform.cpp

@@ -7,12 +7,24 @@
  * contained in the LICENSE file.
  */
 
+#include "blackgui/components/dbairlineicaoselectorcomponent.h"
+#include "blackgui/components/dbairlinenameselectorcomponent.h"
+#include "blackgui/components/dbcountryselectorcomponent.h"
+#include "blackgui/dropsite.h"
+#include "blackgui/editors/airlineicaoform.h"
+#include "blackgui/editors/validationindicator.h"
 #include "blackgui/guiutility.h"
+#include "blackgui/labelandicon.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/country.h"
-#include "airlineicaoform.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/icons.h"
 #include "ui_airlineicaoform.h"
 
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMetaType>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackGui::Components;

src/blackgui/editors/airlineicaoform.h

@@ -13,11 +13,16 @@
 #define BLACKGUI_EDITORS_AIRLINEICAOFORM_H
 
 #include "blackgui/blackguiexport.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackgui/editors/form.h"
+#include "blackmisc/variant.h"
+
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
+
 namespace Ui { class CAirlineIcaoForm; }
 
 namespace BlackGui

src/blackgui/editors/distributorform.cpp

@@ -7,11 +7,20 @@
  * contained in the LICENSE file.
  */
 
+#include "blackgui/components/dbdistributorselectorcomponent.h"
+#include "blackgui/dropsite.h"
+#include "blackgui/editors/distributorform.h"
+#include "blackgui/editors/validationindicator.h"
+#include "blackgui/labelandicon.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/icons.h"
 #include "blackmisc/simulation/distributorlist.h"
-#include "blackmisc/country.h"
 #include "distributorform.h"
 #include "ui_distributorform.h"
 
+#include <QLineEdit>
+#include <QMetaType>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackGui::Components;

src/blackgui/editors/distributorform.h

@@ -16,8 +16,12 @@
 #include "blackgui/editors/form.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/variant.h"
+
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
 namespace Ui { class CDistributorForm; }
 
 namespace BlackGui

src/blackgui/editors/form.cpp

@@ -7,7 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "form.h"
+#include "blackgui/editors/form.h"
+
+class QWidget;
+namespace BlackMisc { namespace Network { class CAuthenticatedUser; } }
 
 namespace BlackGui
 {

src/blackgui/editors/form.h

@@ -12,10 +12,16 @@
 #ifndef BLACKGUI_EDITORS_FORM_H
 #define BLACKGUI_EDITORS_FORM_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackmisc/network/authenticateduser.h"
 #include "blackcore/data/authenticateduser.h"
+#include "blackgui/blackguiexport.h"
+#include "blackmisc/datacache.h"
+
 #include <QFrame>
+#include <QObject>
+
+class QWidget;
+
+namespace BlackMisc { namespace Network { class CAuthenticatedUser; } }
 
 namespace BlackGui
 {

src/blackgui/editors/liveryform.cpp

@@ -7,13 +7,26 @@
  * contained in the LICENSE file.
  */
 
-#include "blackgui/guiutility.h"
-#include "blackgui/guiapplication.h"
 #include "blackcore/webdataservices.h"
+#include "blackgui/components/colorselector.h"
+#include "blackgui/components/dbliveryselectorcomponent.h"
+#include "blackgui/dropsite.h"
+#include "blackgui/editors/airlineicaoform.h"
+#include "blackgui/editors/liveryform.h"
+#include "blackgui/editors/validationindicator.h"
+#include "blackgui/guiapplication.h"
+#include "blackgui/guiutility.h"
+#include "blackgui/labelandicon.h"
 #include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/icons.h"
 #include "liveryform.h"
 #include "ui_liveryform.h"
 
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QMetaType>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackGui;

src/blackgui/editors/liveryform.h

@@ -12,10 +12,17 @@
 #ifndef BLACKGUI_EDITORS_LIVERYFORM_H
 #define BLACKGUI_EDITORS_LIVERYFORM_H
 
-#include "blackgui/editors/form.h"
 #include "blackgui/blackguiexport.h"
+#include "blackgui/editors/form.h"
+#include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/variant.h"
+
+#include <QObject>
+#include <QScopedPointer>
+
+class QWidget;
 
 namespace Ui { class CLiveryForm; }
 

src/blackgui/editors/modelmappingform.cpp

@@ -7,9 +7,18 @@
  * contained in the LICENSE file.
  */
 
-#include "modelmappingform.h"
+#include "blackgui/components/modelmodeselector.h"
+#include "blackgui/components/simulatorselector.h"
+#include "blackgui/editors/modelmappingform.h"
+#include "blackgui/editors/validationindicator.h"
+#include "blackgui/labelandicon.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/network/authenticateduser.h"
 #include "ui_modelmappingform.h"
 
+#include <QLineEdit>
+#include <QPushButton>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;

src/blackgui/editors/modelmappingform.h

@@ -12,11 +12,16 @@
 #ifndef BLACKGUI_EDITORS_MODELMAPPINGFORM_H
 #define BLACKGUI_EDITORS_MODELMAPPINGFORM_H
 
-#include "blackgui/editors/form.h"
 #include "blackgui/blackguiexport.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/statusmessagelist.h"
+
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
+
 namespace Ui { class CModelMappingForm; }
 
 namespace BlackGui

src/blackgui/editors/modelmappingmodifyform.cpp

@@ -7,9 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "modelmappingmodifyform.h"
-#include "ui_modelmappingmodifyform.h"
+#include "blackgui/components/modelmodeselector.h"
+#include "blackgui/components/simulatorselector.h"
+#include "blackgui/editors/modelmappingmodifyform.h"
 #include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "ui_modelmappingmodifyform.h"
+
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QString>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/editors/modelmappingmodifyform.h

@@ -14,12 +14,15 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/simulation/aircraftmodel.h"
-#include <QFrame>
-#include <QScopedPointer>
-#include <QCheckBox>
-#include <QWidget>
 
+#include <QFrame>
+#include <QObject>
+#include <QScopedPointer>
+
+class QCheckBox;
+class QWidget;
+
+namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
 namespace Ui { class CModelMappingModifyForm; }
 
 namespace BlackGui

src/blackgui/editors/ownmodelsetform.cpp

@@ -7,12 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "ownmodelsetform.h"
-#include "ui_ownmodelsetform.h"
-#include "blackgui/models/distributorlistmodel.h"
-#include "blackgui/guiapplication.h"
 #include "blackcore/webdataservices.h"
+#include "blackgui/editors/ownmodelsetform.h"
+#include "blackgui/guiapplication.h"
+#include "blackgui/models/distributorlistmodel.h"
+#include "blackgui/views/distributorview.h"
 #include "blackmisc/simulation/distributorlist.h"
+#include "ui_ownmodelsetform.h"
+
+#include <QRadioButton>
+#include <QtGlobal>
 
 using namespace BlackMisc::Simulation;
 using namespace BlackGui::Models;

src/blackgui/editors/ownmodelsetform.h

@@ -13,9 +13,13 @@
 #define BLACKGUI_EDITORS_OWNMODELSETFORM_H
 
 #include "blackmisc/simulation/distributorlist.h"
+
 #include <QFrame>
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
+
 namespace Ui { class COwnModelSetForm; }
 
 namespace BlackGui

src/blackgui/editors/validationindicator.cpp

@@ -7,11 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "validationindicator.h"
-#include "ui_validationindicator.h"
+#include "blackgui/editors/validationindicator.h"
 #include "blackgui/stylesheetutility.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/icons.h"
 #include "blackmisc/statusmessage.h"
-#include <QPainter>
+#include "ui_validationindicator.h"
+
+#include <QLabel>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackgui/editors/validationindicator.h

@@ -14,10 +14,16 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/statusmessagelist.h"
+
 #include <QFrame>
+#include <QObject>
 #include <QScopedPointer>
+#include <QString>
 #include <QTimer>
 
+class QPaintEvent;
+class QWidget;
+
 namespace Ui { class CValidationIndicator; }
 
 namespace BlackGui