Clean up includes

src/blackcore/context/contextnetworkimpl.cpp

@@ -22,7 +22,6 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/network/entityflags.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/network/textmessage.h"

src/blackcore/context/contextnetworkproxy.h

@@ -14,7 +14,6 @@
 #include "blackcore/blackcoreexport.h"
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/corefacadeconfig.h"
-#include "blackcore/blackcoreexport.h"
 #include "blackmisc/aviation/airporticaocode.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"

src/blackcore/context/contextsimulatorimpl.cpp

@@ -12,7 +12,6 @@
 #include "blackcore/context/contextnetworkimpl.h"
 #include "blackcore/context/contextownaircraft.h"
 #include "blackcore/context/contextownaircraftimpl.h"
-#include "blackcore/context/contextsimulatorimpl.h"
 #include "blackcore/db/databaseutils.h"
 #include "blackcore/corefacade.h"
 #include "blackcore/application.h"

src/blackgui/components/aircraftmodelsetvalidationdialog.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "aircraftmodelsetvalidationdialog.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include "blackmisc/simulation/simulatorinfo.h"
 #include "ui_aircraftmodelsetvalidationdialog.h"
 

src/blackgui/components/airportsmallcompleter.cpp

@@ -8,7 +8,7 @@
 
 #include "airportsmallcompleter.h"
 #include "ui_airportsmallcompleter.h"
-#include "airportdialog.h"
+#include "blackgui/components/airportdialog.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
 #include "blackgui/uppercasevalidator.h"

src/blackgui/components/allmaininfoareacomponents.h

@@ -9,15 +9,15 @@
 #ifndef BLACKGUI_ALLMAININFOAREACOMPONENTS_H
 #define BLACKGUI_ALLMAININFOAREACOMPONENTS_H
 
-#include "atcstationcomponent.h"
+#include "blackgui/components/atcstationcomponent.h"
-#include "aircraftcomponent.h"
+#include "blackgui/components/aircraftcomponent.h"
-#include "cockpitcomponent.h"
+#include "blackgui/components/cockpitcomponent.h"
-#include "usercomponent.h"
+#include "blackgui/components/usercomponent.h"
-#include "mappingcomponent.h"
+#include "blackgui/components/mappingcomponent.h"
-#include "textmessagecomponent.h"
+#include "blackgui/components/textmessagecomponent.h"
-#include "simulatorcomponent.h"
+#include "blackgui/components/simulatorcomponent.h"
-#include "flightplancomponent.h"
+#include "blackgui/components/flightplancomponent.h"
-#include "settingscomponent.h"
+#include "blackgui/components/settingscomponent.h"
-#include "logcomponent.h"
+#include "blackgui/components/logcomponent.h"
 
 #endif // guard

src/blackgui/components/colorselector.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/icons.h"
 #include "blackmisc/rgbcolor.h"
 #include "blackmisc/variant.h"
-#include "colorselector.h"
 #include "ui_colorselector.h"
 
 #include <QColor>

src/blackgui/components/copyconfigurationcomponent.cpp

@@ -8,7 +8,7 @@
 
 #include "ui_copyconfigurationcomponent.h"
 #include "copyconfigurationcomponent.h"
-#include "configurationwizard.h"
+#include "blackgui/components/configurationwizard.h"
 #include "blackcore/data/globalsetup.h"
 #include "blackgui/guiapplication.h"
 #include "blackconfig/buildconfig.h"

src/blackgui/components/dbairlineicaoselectorcomponent.h

@@ -18,7 +18,6 @@
 #include <QObject>
 #include <QScopedPointer>
 #include <QString>
-#include <QScopedPointer>
 
 class QCompleter;
 class QWidget;

src/blackgui/components/dbautosimulatorstashingcomponent.cpp

@@ -8,7 +8,7 @@
 
 #include "blackcore/db/databaseutils.h"
 #include "dbautosimulatorstashingcomponent.h"
-#include "dbmappingcomponent.h"
+#include "blackgui/components/dbmappingcomponent.h"
 #include "ui_dbautosimulatorstashingcomponent.h"
 #include <QIntValidator>
 

src/blackgui/components/dbautostashingcomponent.cpp

@@ -20,7 +20,6 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/statusmessagelist.h"
-#include "dbautostashingcomponent.h"
 #include "ui_dbautostashingcomponent.h"
 
 #include <QCheckBox>

src/blackgui/components/dbdebugdatabasesetup.cpp

@@ -8,7 +8,6 @@
 
 #include "blackgui/components/dbdebugdatabasesetup.h"
 #include "blackgui/guiapplication.h"
-#include "dbdebugdatabasesetup.h"
 #include "ui_dbdebugdatabasesetup.h"
 
 #include <QCheckBox>

src/blackgui/components/dbdistributorcomponent.cpp

@@ -6,7 +6,6 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "dbdistributorcomponent.h"
 #include "ui_dbdistributorcomponent.h"
 #include "blackgui/components/dbdistributorcomponent.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/dbliverycolorsearch.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "dbliverycolorsearch.h"
+#include "blackgui/components/dbliverycolorsearch.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/liverylist.h"

src/blackgui/components/dbliverycomponent.cpp

@@ -11,7 +11,6 @@
 #include "blackgui/filters/liveryfilterbar.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/views/liveryview.h"
-#include "dbliverycomponent.h"
 #include "ui_dbliverycomponent.h"
 
 #include <QtGlobal>

src/blackgui/components/dbloaddatadialog.cpp

@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "dbloaddatadialog.h"
+#include "blackgui/components/dbloaddatadialog.h"
 #include "ui_dbloaddatadialog.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/webdataservices.h"

src/blackgui/components/dbmappingcomponentaware.cpp

@@ -8,7 +8,6 @@
 
 #include "blackgui/components/dbmappingcomponent.h"
 #include "blackgui/components/dbmappingcomponentaware.h"
-#include "dbmappingcomponentaware.h"
 
 #include <QObject>
 

src/blackgui/components/dbownmodelsdialog.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "dbownmodelsdialog.h"
-#include "dbownmodelscomponent.h"
+#include "blackgui/components/dbownmodelscomponent.h"
 #include "ui_dbownmodelsdialog.h"
 
 using namespace BlackMisc::Simulation;

src/blackgui/components/dbquickmappingwizard.cpp

@@ -8,8 +8,8 @@
 
 #include "dbquickmappingwizard.h"
 #include "ui_dbquickmappingwizard.h"
-#include "dbaircrafticaoselectorcomponent.h"
+#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "dbairlinenameselectorcomponent.h"
+#include "blackgui/components/dbairlinenameselectorcomponent.h"
 #include "blackgui/views/aircrafticaoview.h"
 #include "blackgui/views/liveryview.h"
 #include "blackgui/views/distributorview.h"

src/blackgui/components/dbstashcomponent.cpp

@@ -23,7 +23,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/verify.h"
-#include "dbstashcomponent.h"
 #include "ui_dbstashcomponent.h"
 
 #include <QCheckBox>

src/blackgui/components/downloaddialog.h

@@ -12,7 +12,7 @@
 #define BLACKGUI_COMPONENTS_DOWNLOADDIALOG_H
 
 #include "blackgui/blackguiexport.h"
-#include "downloadcomponent.h"
+#include "blackgui/components/downloadcomponent.h"
 
 #include <QDialog>
 #include <QScopedPointer>

src/blackgui/components/firstmodelsetcomponent.cpp

@@ -6,11 +6,11 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "firstmodelsetcomponent.h"
+#include "blackgui/components/firstmodelsetcomponent.h"
-#include "dbownmodelsdialog.h"
+#include "blackgui/components/dbownmodelsdialog.h"
-#include "dbownmodelscomponent.h"
+#include "blackgui/components/dbownmodelscomponent.h"
-#include "dbownmodelsetdialog.h"
+#include "blackgui/components/dbownmodelsetdialog.h"
-#include "dbownmodelsetcomponent.h"
+#include "blackgui/components/dbownmodelsetcomponent.h"
 #include "ui_firstmodelsetcomponent.h"
 
 #include "blackgui/views/distributorview.h"

src/blackgui/components/flightplancomponent.cpp

@@ -7,10 +7,10 @@
  */
 
 #include "flightplancomponent.h"
-#include "altitudedialog.h"
+#include "blackgui/components/altitudedialog.h"
-#include "stringlistdialog.h"
+#include "blackgui/components/stringlistdialog.h"
-#include "simbriefdownloaddialog.h"
+#include "blackgui/components/simbriefdownloaddialog.h"
-#include "selcalcodeselector.h"
+#include "blackgui/components/selcalcodeselector.h"
 #include "blackgui/uppercasevalidator.h"
 #include "blackgui/eventfilter.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/infobarwebreadersstatussmallcomponent.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
 #define BLACKGUI_COMPONENTS_INFOBARWEBREADERSSTATUSSMALLCOMPONENT_H
 
-#include "infobarwebreadersstatuscomponent.h"
+#include "blackgui/components/infobarwebreadersstatuscomponent.h"
 #include <QScopedPointer>
 
 namespace Ui { class CInfoBarWebReadersStatusSmallComponent; }

src/blackgui/components/loginadvcomponent.cpp

@@ -8,8 +8,8 @@
 
 #include "ui_loginadvcomponent.h"
 #include "loginadvcomponent.h"
-#include "serverlistselector.h"
+#include "blackgui/components/serverlistselector.h"
-#include "dbquickmappingwizard.h"
+#include "blackgui/components/dbquickmappingwizard.h"
 #include "blackgui/editors/serverform.h"
 #include "blackgui/editors/pilotform.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/logincomponent.cpp

@@ -8,8 +8,8 @@
 
 #include "ui_logincomponent.h"
 #include "logincomponent.h"
-#include "serverlistselector.h"
+#include "blackgui/components/serverlistselector.h"
-#include "dbquickmappingwizard.h"
+#include "blackgui/components/dbquickmappingwizard.h"
 #include "blackgui/editors/serverform.h"
 #include "blackgui/editors/pilotform.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/loginoverviewcomponent.cpp

@@ -8,8 +8,8 @@
 
 #include "ui_loginoverviewcomponent.h"
 #include "loginoverviewcomponent.h"
-#include "serverlistselector.h"
+#include "blackgui/components/serverlistselector.h"
-#include "dbquickmappingwizard.h"
+#include "blackgui/components/dbquickmappingwizard.h"
 #include "blackgui/editors/serverform.h"
 #include "blackgui/editors/pilotform.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/modelmatchercomponent.cpp

@@ -6,13 +6,13 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "aircraftcombinedtypeselector.h"
+#include "blackgui/components/aircraftcombinedtypeselector.h"
-#include "dbaircrafticaoselectorcomponent.h"
+#include "blackgui/components/dbaircrafticaoselectorcomponent.h"
-#include "dbairlineicaoselectorcomponent.h"
+#include "blackgui/components/dbairlineicaoselectorcomponent.h"
-#include "dbliveryselectorcomponent.h"
+#include "blackgui/components/dbliveryselectorcomponent.h"
-#include "modelmatchercomponent.h"
+#include "blackgui/components/modelmatchercomponent.h"
-#include "settingsmatchingdialog.h"
+#include "blackgui/components/settingsmatchingdialog.h"
-#include "simulatorselector.h"
+#include "blackgui/components/simulatorselector.h"
 #include "blackgui/models/statusmessagelistmodel.h"
 #include "blackgui/views/statusmessageview.h"
 #include "blackgui/views/aircraftmodelview.h"

src/blackgui/components/modelmatcherlogenable.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "modelmatcherlogenable.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include "ui_modelmatcherlogenable.h"
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/context/contextsimulator.h"

src/blackgui/components/otherswiftversionscomponent.cpp

@@ -10,7 +10,7 @@
 #include "ui_otherswiftversionscomponent.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include <QUrl>
 #include <QDesktopServices>
 

src/blackgui/components/ownaircraftcomponent.cpp

@@ -8,7 +8,7 @@
 
 #include "ownaircraftcomponent.h"
 #include "ui_ownaircraftcomponent.h"
-#include "dbquickmappingwizard.h"
+#include "blackgui/components/dbquickmappingwizard.h"
 
 #include "blackgui/uppercasevalidator.h"
 #include "blackgui/guiapplication.h"

src/blackgui/components/registermetadatacomponents.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "registermetadatacomponents.h"
-#include "textmessagecomponenttab.h"
+#include "blackgui/components/textmessagecomponenttab.h"
 
 #include <QMetaType>
 

src/blackgui/components/scalescreenfactor.cpp

@@ -8,7 +8,7 @@
 
 #include "scalescreenfactor.h"
 #include "ui_scalescreenfactor.h"
-#include "guiutility.h"
+#include "blackgui/guiutility.h"
 
 #include <QDesktopWidget>
 #include <QScreen>

src/blackgui/components/settingsswiftplugin.h

@@ -12,7 +12,7 @@
 #define BLACKGUI_COMPONENTS_SETTINGSSWIFTPLUGIN_H
 
 #include <QFrame>
-#include <blackmisc/simulation/settings/swiftpluginsettings.h>
+#include "blackmisc/simulation/settings/swiftpluginsettings.h"
 #include "blackgui/blackguiexport.h"
 
 namespace Ui { class CSettingsSwiftPlugin; }

src/blackgui/components/settingstextmessagestyle.cpp

@@ -8,9 +8,8 @@
 
 #include "settingstextmessagestyle.h"
 #include "ui_settingstextmessagestyle.h"
-#include "settingsfontdialog.h"
+#include "blackgui/components/settingsfontdialog.h"
-#include "texteditdialog.h"
+#include "blackgui/components/texteditdialog.h"
-#include "settingstextmessagestyle.h"
 #include "blackgui/shortcut.h"
 
 #include <QTextEdit>

src/blackgui/components/setuploadingdialog.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "setuploadingdialog.h"
-#include "copymodelsfromotherswiftversionsdialog.h"
+#include "blackgui/components/copymodelsfromotherswiftversionsdialog.h"
 #include "ui_setuploadingdialog.h"
 #include "blackgui/guiapplication.h"
 #include "blackcore/data/globalsetup.h"

src/blackgui/components/textmessagecomponent.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
 #define BLACKGUI_COMPONENTS_TEXTMESSAGECOMPONENT_H
 
-#include "textmessagecomponenttab.h"
+#include "blackgui/components/textmessagecomponenttab.h"
 #include "blackgui/settings/textmessagesettings.h"
 #include "blackgui/enablefordockwidgetinfoarea.h"
 #include "blackgui/blackguiexport.h"

src/blackgui/components/transpondermodecomponent.cpp

@@ -8,7 +8,7 @@
 
 #include "transpondermodecomponent.h"
 #include "ui_transpondermodecomponent.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include "blackcore/context/contextownaircraft.h"
 #include "blackmisc/aviation/transponder.h"
 

src/blackgui/components/updateinfocomponent.cpp

@@ -6,10 +6,10 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "updateinfocomponent.h"
+#include "blackgui/components/updateinfocomponent.h"
 #include "ui_updateinfocomponent.h"
-#include "installxswiftbusdialog.h"
+#include "blackgui/components/installxswiftbusdialog.h"
-#include "downloaddialog.h"
+#include "blackgui/components/downloaddialog.h"
 #include "blackgui/guiapplication.h"
 #include "blackmisc/network/networkutils.h"
 #include "blackmisc/db/distributionlist.h"

src/blackgui/copyxswiftbusdialog.cpp

@@ -10,7 +10,7 @@
 
 #include <QMessageBox>
 #include "copyxswiftbusdialog.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include "blackcore/context/contextsimulator.h"
 #include "blackmisc/simulation/xplane/xplaneutil.h"
 #include "blackmisc/swiftdirectories.h"

src/blackgui/editors/aircraftmodelform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_AIRCRAFTMODELFORM_H
 #define BLACKGUI_EDITORS_AIRCRAFTMODELFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/simulation/distributor.h"

src/blackgui/editors/cockpitcomform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_COCKPITCOMFORM_H
 #define BLACKGUI_EDITORS_COCKPITCOMFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/aviation/atcstationlist.h"

src/blackgui/editors/fsdsetupform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_FSDSETUPCOMPONENT_H
 #define BLACKGUI_EDITORS_FSDSETUPCOMPONENT_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include <QFrame>
 #include <QScopedPointer>
 #include "blackmisc/network/fsdsetup.h"

src/blackgui/editors/interpolationsetupform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
 #define BLACKGUI_EDITORS_INTERPOLATIONSETUPFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/simulation/interpolationrenderingsetup.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/statusmessagelist.h"

src/blackgui/editors/matchingform.cpp

@@ -8,7 +8,7 @@
 
 #include "ui_matchingform.h"
 #include "matchingform.h"
-#include "guiutility.h"
+#include "blackgui/guiutility.h"
 
 #include <QPushButton>
 #include <QFileDialog>

src/blackgui/editors/matchingform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_MATCHINGFORM_H
 #define BLACKGUI_EDITORS_MATCHINGFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/simulation/aircraftmatchersetup.h"
 #include "blackmisc/directories.h"
 

src/blackgui/editors/modelmappingmodifyform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
 #define BLACKGUI_EDITORS_MODELMAPPINGMODIFYFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include <QFrame>

src/blackgui/editors/networksetupform.cpp

@@ -8,7 +8,7 @@
 
 #include "networksetupform.h"
 #include "ui_networksetupform.h"
-#include "guiutility.h"
+#include "blackgui/guiutility.h"
 
 using namespace BlackMisc;
 

src/blackgui/editors/networksetupform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_NETWORKSETUPFORM_H
 #define BLACKGUI_EDITORS_NETWORKSETUPFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include <QScopedPointer>
 
 namespace Ui { class CNetworkSetupForm; }

src/blackgui/editors/ownmodelsetform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_OWNMODELSETFORM_H
 #define BLACKGUI_EDITORS_OWNMODELSETFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/simulation/settings/modelsettings.h"
 #include <QObject>
 #include <QScopedPointer>

src/blackgui/editors/pbhsform.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_EDITORS_PBHSFORM_H
 #define BLACKGUI_EDITORS_PBHSFORM_H
 
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/heading.h"
 #include "blackmisc/pq/angle.h"

src/blackgui/editors/voicesetupform.h

@@ -13,7 +13,7 @@
 
 #include "blackmisc/audio/voicesetup.h"
 #include "blackmisc/statusmessagelist.h"
-#include "form.h"
+#include "blackgui/editors/form.h"
 #include <QFrame>
 #include <QScopedPointer>
 

src/blackgui/guiutility.cpp

@@ -11,7 +11,6 @@
 #include "blackgui/overlaymessagesframe.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/verify.h"
-#include "guiutility.h"
 
 #include <QApplication>
 #include <QCheckBox>

src/blackgui/loadindicator.cpp

@@ -9,7 +9,7 @@
  */
 
 #include "loadindicator.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/threadutils.h"
 

src/blackgui/models/aircraftcategorytreemodel.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
 #define BLACKGUI_MODELS_AIRCRAFTCATEGORYTREEMODEL_H
 
-#include "columns.h"
+#include "blackgui/models/columns.h"
 #include "blackmisc/aviation/aircraftcategorylist.h"
 #include "blackgui/blackguiexport.h"
 

src/blackgui/models/atcstationtreemodel.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_MODELS_ATCTREEMODEL_H
 #define BLACKGUI_MODELS_ATCTREEMODEL_H
 
-#include "columns.h"
+#include "blackgui/models/columns.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackgui/blackguiexport.h"
 

src/blackgui/models/listmodelcallsignobjects.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "listmodelcallsignobjects.h"
-#include "allmodelcontainers.h"
+#include "blackgui/models/allmodelcontainers.h"
 #include "blackmisc/orderable.h"
 
 #include <QBrush>

src/blackgui/models/listmodeldbobjects.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "listmodeldbobjects.h"
-#include "allmodelcontainers.h"
+#include "blackgui/models/allmodelcontainers.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/aircraftmodel.h"

src/blackgui/models/listmodeltimestampobjects.cpp

@@ -6,8 +6,8 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "listmodeltimestampobjects.h"
+#include "blackgui/models/listmodeltimestampobjects.h"
-#include "allmodelcontainers.h"
+#include "blackgui/models/allmodelcontainers.h"
 
 #include <QModelIndex>
 #include <type_traits>

src/blackgui/models/windlayerlistmodel.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "windlayerlistmodel.h"
-#include "columnformatters.h"
+#include "blackgui/models/columnformatters.h"
 
 #include <Qt>
 #include <QtGlobal>

src/blackgui/overlaymessagesframe.cpp

@@ -8,7 +8,7 @@
 
 #include "blackgui/overlaymessagesframe.h"
 #include "blackgui/overlaymessages.h"
-#include "dockwidgetinfoarea.h"
+#include "blackgui/dockwidgetinfoarea.h"
 #include "blackgui/stylesheetutility.h"
 #include "blackgui/guiutility.h"
 #include "blackmisc/network/textmessage.h"

src/blackgui/singleapplicationui.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "singleapplicationui.h"
-#include "guiapplication.h"
+#include "blackgui/guiapplication.h"
 #include <QWidget>
 
 using namespace BlackMisc;

src/blackgui/views/aircraftmodelview.cpp

@@ -7,9 +7,9 @@
  */
 
 #include "aircraftmodelview.h"
-#include "viewbase.h"
+#include "blackgui/views/viewbase.h"
-#include "aircraftmodelstatisticsdialog.h"
+#include "blackgui/views/aircraftmodelstatisticsdialog.h"
-#include "aircraftmodelvalidationdialog.h"
+#include "blackgui/views/aircraftmodelvalidationdialog.h"
 #include "blackgui/filters/aircraftmodelfilterdialog.h"
 #include "blackgui/menus/menuaction.h"
 #include "blackgui/guiapplication.h"

src/blackgui/views/simulatedaircraftview.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "simulatedaircraftview.h"
-#include "flightplandialog.h"
+#include "blackgui/views/flightplandialog.h"
 #include "blackgui/models/simulatedaircraftlistmodel.h"
 #include "blackgui/menus/menuaction.h"
 #include "blackgui/guiapplication.h"

src/blackgui/views/viewbasenontemplate.cpp

@@ -19,7 +19,7 @@
 #include "blackgui/views/viewbase.h"
 #include "blackgui/shortcut.h"
 #include "blackmisc/logmessage.h"
-#include "viewbase.h"
+
 
 #include <QApplication>
 #include <QAction>

src/blackgui/views/viewbaseproxystyle.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "viewbaseproxystyle.h"
-#include "viewbase.h"
+#include "blackgui/views/viewbase.h"
 
 namespace BlackGui::Views
 {

src/blackgui/views/viewcallsignobjects.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 #define BLACKGUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 
-#include "viewbase.h"
+#include "blackgui/views/viewbase.h"
 #include <QSet>
 #include <QObject>
 #include <QString>

src/blackgui/views/viewtimestampobjects.h

@@ -11,7 +11,7 @@
 #ifndef BLACKGUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
 #define BLACKGUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
 
-#include "viewbase.h"
+#include "blackgui/views/viewbase.h"
 #include <QObject>
 #include <QString>
 #include <QtGlobal>

src/blackinput/joystick.h

@@ -11,7 +11,7 @@
 #ifndef BLACKINPUT_JOYSTICK_H
 #define BLACKINPUT_JOYSTICK_H
 
-#include "blackinputexport.h"
+#include "blackinput/blackinputexport.h"
 #include "blackmisc/input/hotkeycombination.h"
 #include <QObject>
 #include <memory>

src/blackinput/keyboard.h

@@ -11,7 +11,7 @@
 #ifndef BLACKINPUT_KEYBOARD_H
 #define BLACKINPUT_KEYBOARD_H
 
-#include "blackinputexport.h"
+#include "blackinput/blackinputexport.h"
 #include "blackmisc/input/keyboardkeylist.h"
 #include "blackmisc/input/hotkeycombination.h"
 #include <QObject>

src/blackmisc/atomicfile.cpp

@@ -8,13 +8,11 @@
 
 #include "blackmisc/atomicfile.h"
 #include "blackmisc/algorithm.h"
-#include "blackmisc/stacktrace.h"
 
 #include <QDir>
 #include <QFileInfo>
 #include <QFlags>
 #include <QStringBuilder>
-#include <random>
 #include <type_traits>
 
 #if defined(Q_OS_POSIX)

src/blackmisc/audio/audiodeviceinfolist.cpp

@@ -7,15 +7,11 @@
  */
 
 #include "blackmisc/audio/audiodeviceinfolist.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/range.h"
 #include "blackmisc/stringutils.h"
 
 #include <QString>
 #include <QAudioDeviceInfo>
-#include <QHostInfo>
 #include <algorithm>
-#include <tuple>
 
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Audio, CAudioDeviceInfo, CAudioDeviceInfoList)
 

src/blackmisc/audio/audiosettings.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/fileutils.h"
-#include <QChar>
 #include <QtGlobal>
 #include <QStringBuilder>
 #include <QDir>

src/blackmisc/audio/audioutils.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/audio/audioutils.h"
 
 #include <QProcess>
-#include <QStringList>
 #include <QAudioDeviceInfo>
 
 using namespace BlackConfig;

src/blackmisc/audio/notificationsounds.cpp

@@ -12,8 +12,6 @@
 
 namespace BlackMisc::Audio
 {
-    constexpr CNotificationSounds::Notification CNotificationSounds::AllNotifications;
-    constexpr CNotificationSounds::Notification CNotificationSounds::DefaultNotifications;
 
     const QString &CNotificationSounds::flagToString(CNotificationSounds::NotificationFlag notification)
     {

src/blackmisc/audio/registermetadataaudio.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/audio/registermetadataaudio.h"
 #include "blackmisc/audio/audio.h"
 #include "blackmisc/audio/ptt.h"
-#include "blackmisc/variant.h"
 #include <QDBusMetaType>
 
 namespace BlackMisc

src/blackmisc/audio/voicesetup.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"
-#include "blackmisc/comparefunctions.h"
 
 #include <Qt>
 #include <QtGlobal>

src/blackmisc/aviation/adfsystem.h

@@ -14,8 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/modulator.h"
 
-#include <stdexcept>
-
 namespace BlackMisc::Aviation
 {
     //! ADF system ("for NDBs")

src/blackmisc/aviation/aircraftcategory.cpp

@@ -14,11 +14,7 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 
-#include <QChar>
-#include <QJsonValue>
-#include <QMultiMap>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>

src/blackmisc/aviation/aircraftcategory.h

@@ -21,7 +21,7 @@
 #include <QJsonObject>
 #include <QMap>
 #include <QList>
-#include <QStringList>
+#include <QString>
 #include <QMetaType>
 
 BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)

src/blackmisc/aviation/aircraftcategorylist.cpp

@@ -7,10 +7,8 @@
  */
 
 #include "blackmisc/aviation/aircraftcategorylist.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 
-#include <QJsonObject>
 #include <QJsonValue>
 #include <Qt>
 #include <QMap>

src/blackmisc/aviation/aircraftengine.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/stringutils.h"
 
-#include <QChar>
 #include <QtGlobal>
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)

src/blackmisc/aviation/aircraftenginelist.cpp

@@ -7,9 +7,7 @@
  */
 
 #include "blackmisc/aviation/aircraftenginelist.h"
-#include "blackmisc/range.h"
 
-#include <QJsonValue>
 #include <QString>
 #include <QtGlobal>
 

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -16,10 +16,8 @@
 #include "blackmisc/pq/speed.h"
 
 #include <QChar>
-#include <QJsonValue>
 #include <QMultiMap>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>

src/blackmisc/aviation/aircrafticaocodelist.cpp

@@ -8,10 +8,8 @@
 
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/aircraftcategorylist.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 
-#include <QJsonObject>
 #include <QJsonValue>
 #include <Qt>
 

src/blackmisc/aviation/aircraftparts.cpp

@@ -11,14 +11,10 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/verify.h"
-#include "blackconfig/buildconfig.h"
 
 #include "QStringBuilder"
 #include <QtGlobal>
 
-using namespace BlackConfig;
-
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)
 
 namespace BlackMisc::Aviation

src/blackmisc/aviation/aircraftpartslist.cpp

@@ -9,8 +9,6 @@
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/aviation/aircraftpartslist.h"
 
-#include <tuple>
-
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CAircraftParts, CAircraftPartsList)
 
 namespace BlackMisc::Aviation

src/blackmisc/aviation/aircraftsituationchangelist.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "blackmisc/aviation/aircraftsituationchangelist.h"
-#include <tuple>
 
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CAircraftSituationChange, CAircraftSituationChangeList)
 

src/blackmisc/aviation/aircraftsituationlist.cpp

@@ -10,10 +10,8 @@
 #include "blackmisc/geo/elevationplane.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/verify.h"
 
 #include <QList>
-#include <tuple>
 
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/aviation/airlineicaocode.cpp

@@ -16,13 +16,9 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/setbuilder.h"
 
-#include <QJsonValue>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <QDir>
 #include <Qt>

src/blackmisc/aviation/airlineicaocodelist.cpp

@@ -9,10 +9,8 @@
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/logcategories.h"
 #include "blackmisc/country.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 
-#include <QJsonObject>
 #include <QJsonValue>
 #include <QStringBuilder>
 

src/blackmisc/aviation/airporticaocode.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/stringutils.h"
 
-#include <QRegularExpression>
 #include <Qt>
 #include <QtGlobal>
 

src/blackmisc/aviation/airportlist.cpp

@@ -8,11 +8,9 @@
 
 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 
 #include <QString>
-#include <tuple>
 
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackmisc/aviation/altitude.cpp

@@ -13,7 +13,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/iconlist.h"

src/blackmisc/aviation/atcstationlist.cpp

@@ -10,8 +10,6 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/network/user.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/range.h"
 

src/blackmisc/aviation/callsignset.cpp

@@ -8,10 +8,8 @@
 
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/containerbase.h"
-#include "blackmisc/dbus.h"
 
 #include <QDBusMetaType>
-#include <QJsonObject>
 #include <QString>
 
 BLACK_DEFINE_COLLECTION_MIXINS(BlackMisc::Aviation, CCallsign, CCallsignSet)

src/blackmisc/aviation/comsystem.cpp

@@ -8,11 +8,9 @@
 
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/dbus.h"
 #include "blackmisc/stringutils.h"
 
 #include <QDBusMetaType>
-#include <QtDebug>
 #include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/aviation/flightplan.cpp

@@ -8,7 +8,6 @@
 
 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/speed.h"

src/blackmisc/aviation/flightplanlist.cpp

@@ -7,13 +7,6 @@
  */
 
 #include "blackmisc/aviation/flightplanlist.h"
-#include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/predicates.h"
-#include "blackmisc/range.h"
-
-#include <QString>
-#include <QtGlobal>
 
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CFlightPlan, CFlightPlanList)
 

src/blackmisc/aviation/livery.cpp

@@ -20,7 +20,6 @@
 #include <QJsonValue>
 #include <Qt>
 #include <QtGlobal>
-#include <tuple>
 #include <QStringBuilder>
 
 using namespace BlackMisc;