From f4c2939253ea6b3407f04e34c83403508a66dc77 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 18 May 2016 16:30:30 +0200 Subject: [PATCH] Fix BlackGui header includes * Include only what is used * Use forward declaration when possible * Sorted includes refs #598 --- .../aircraftcombinedtypeselector.cpp | 9 ++- .../components/aircraftcombinedtypeselector.h | 10 ++- src/blackgui/components/aircraftcomponent.cpp | 18 +++-- src/blackgui/components/aircraftcomponent.h | 16 +++- .../components/atcstationcomponent.cpp | 32 ++++++-- src/blackgui/components/atcstationcomponent.h | 22 ++++-- src/blackgui/components/audiocomponent.cpp | 2 +- src/blackgui/components/audiocomponent.h | 4 + .../components/audiosetupcomponent.cpp | 16 +++- src/blackgui/components/audiosetupcomponent.h | 7 +- .../components/audiovolumecomponent.cpp | 14 +++- .../components/audiovolumecomponent.h | 5 ++ .../components/cockpitcomcomponent.cpp | 25 ++++-- src/blackgui/components/cockpitcomcomponent.h | 16 +++- src/blackgui/components/cockpitcomponent.cpp | 11 ++- src/blackgui/components/cockpitcomponent.h | 9 ++- .../components/cockpitinfoareacomponent.cpp | 8 +- .../components/cockpitinfoareacomponent.h | 10 ++- .../cockpittranspondermodeledscomponent.cpp | 10 ++- .../cockpittranspondermodeledscomponent.h | 12 ++- src/blackgui/components/colorselector.cpp | 27 +++++-- src/blackgui/components/colorselector.h | 12 +++ src/blackgui/components/commandinput.cpp | 5 +- src/blackgui/components/commandinput.h | 5 ++ .../components/coreinfoareacomponent.cpp | 13 +-- .../components/coreinfoareacomponent.h | 13 ++- .../components/corestatuscomponent.cpp | 4 +- src/blackgui/components/corestatuscomponent.h | 4 + .../components/datainfoareacomponent.cpp | 23 ++++-- .../components/datainfoareacomponent.h | 12 ++- .../components/datamaininfoareacomponent.cpp | 11 ++- .../components/datamaininfoareacomponent.h | 11 ++- .../components/datasettingscomponent.cpp | 2 +- .../components/datasettingscomponent.h | 5 +- .../components/dbaircrafticaocomponent.cpp | 14 +++- .../components/dbaircrafticaocomponent.h | 7 +- .../dbaircrafticaoselectorcomponent.cpp | 21 ++++- .../dbaircrafticaoselectorcomponent.h | 13 ++- .../components/dbairlineicaocomponent.cpp | 13 ++- .../components/dbairlineicaocomponent.h | 6 +- .../components/dbairlineicaoselectorbase.cpp | 17 +++- .../components/dbairlineicaoselectorbase.h | 13 ++- .../dbairlineicaoselectorcomponent.cpp | 12 ++- .../dbairlineicaoselectorcomponent.h | 9 ++- .../dbairlinenameselectorcomponent.cpp | 12 ++- .../dbairlinenameselectorcomponent.h | 8 +- .../components/dbautostashingcomponent.cpp | 30 ++++++- .../components/dbautostashingcomponent.h | 22 ++++-- .../components/dbcountrycomponent.cpp | 13 ++- src/blackgui/components/dbcountrycomponent.h | 6 +- .../components/dbcountryselectorcomponent.cpp | 22 +++++- .../components/dbcountryselectorcomponent.h | 13 ++- .../components/dbdebugdatabasesetup.cpp | 3 + .../components/dbdebugdatabasesetup.h | 7 +- .../components/dbdistributorcomponent.cpp | 10 ++- .../components/dbdistributorcomponent.h | 6 +- .../dbdistributorselectorcomponent.cpp | 23 +++++- .../dbdistributorselectorcomponent.h | 12 ++- src/blackgui/components/dbliverycomponent.cpp | 12 ++- src/blackgui/components/dbliverycomponent.h | 7 +- .../components/dbliveryselectorcomponent.cpp | 23 +++++- .../components/dbliveryselectorcomponent.h | 15 +++- src/blackgui/components/dblogincomponent.cpp | 22 ++++-- src/blackgui/components/dblogincomponent.h | 9 ++- .../components/dbmappingcomponent.cpp | 43 ++++++++-- src/blackgui/components/dbmappingcomponent.h | 48 ++++++++--- .../components/dbmappingcomponentaware.cpp | 5 +- .../components/dbmappingcomponentaware.h | 3 +- src/blackgui/components/dbmodelcomponent.cpp | 17 ++-- src/blackgui/components/dbmodelcomponent.h | 11 ++- .../dbmodelmappingmodifycomponent.cpp | 6 +- .../dbmodelmappingmodifycomponent.h | 8 +- .../components/dbownmodelscomponent.cpp | 15 +++- .../components/dbownmodelscomponent.h | 21 ++++- .../components/dbownmodelsetcomponent.cpp | 31 ++++++-- .../components/dbownmodelsetcomponent.h | 25 ++++-- .../components/dbownmodelsetdialog.cpp | 14 +++- src/blackgui/components/dbownmodelsetdialog.h | 10 ++- src/blackgui/components/dbstashcomponent.cpp | 29 +++++-- src/blackgui/components/dbstashcomponent.h | 37 +++++++-- .../distributorpreferencescomponent.cpp | 23 +++++- .../distributorpreferencescomponent.h | 9 +++ .../enablefordockwidgetinfoarea.cpp | 9 ++- .../components/enablefordockwidgetinfoarea.h | 10 ++- .../components/flightplancomponent.cpp | 33 ++++++-- src/blackgui/components/flightplancomponent.h | 12 ++- src/blackgui/components/hotkeydialog.cpp | 32 ++++++-- src/blackgui/components/hotkeydialog.h | 17 ++-- .../components/infobarstatuscomponent.cpp | 22 ++++-- .../components/infobarstatuscomponent.h | 10 ++- .../infobarwebreadersstatuscomponent.cpp | 11 +-- .../infobarwebreadersstatuscomponent.h | 9 ++- .../components/internalscomponent.cpp | 25 +++++- src/blackgui/components/internalscomponent.h | 6 +- src/blackgui/components/logcomponent.cpp | 14 +++- src/blackgui/components/logcomponent.h | 14 +++- src/blackgui/components/logincomponent.cpp | 36 +++++++-- src/blackgui/components/logincomponent.h | 28 +++++-- .../components/maininfoareacomponent.cpp | 11 +-- .../components/maininfoareacomponent.h | 21 +++-- .../components/mainkeypadareacomponent.cpp | 13 ++- .../components/mainkeypadareacomponent.h | 14 +++- src/blackgui/components/mappingcomponent.cpp | 34 ++++++-- src/blackgui/components/mappingcomponent.h | 29 +++++-- .../components/modelmatchercomponent.cpp | 32 +++++++- .../components/modelmatchercomponent.h | 9 ++- src/blackgui/components/modelmodeselector.cpp | 4 +- src/blackgui/components/modelmodeselector.h | 6 +- src/blackgui/components/navigatordialog.cpp | 24 ++++-- src/blackgui/components/navigatordialog.h | 10 ++- src/blackgui/components/registercomponent.cpp | 10 ++- src/blackgui/components/registercomponent.h | 9 ++- .../components/remoteaircraftselector.cpp | 15 +++- .../components/remoteaircraftselector.h | 6 +- .../components/selcalcodeselector.cpp | 10 ++- src/blackgui/components/selcalcodeselector.h | 9 ++- src/blackgui/components/serverform.cpp | 7 +- src/blackgui/components/serverform.h | 5 ++ .../components/serverlistselector.cpp | 5 +- src/blackgui/components/serverlistselector.h | 6 +- src/blackgui/components/settingscomponent.cpp | 23 +++--- src/blackgui/components/settingscomponent.h | 10 ++- .../components/settingshotkeycomponent.cpp | 23 +++++- .../components/settingshotkeycomponent.h | 19 +++-- .../components/settingsnetworkcomponent.cpp | 8 +- .../components/settingsnetworkcomponent.h | 5 ++ .../settingsnetworkserverscomponent.cpp | 22 ++++-- .../settingsnetworkserverscomponent.h | 9 ++- .../components/settingssimulatorcomponent.cpp | 35 +++++--- .../components/settingssimulatorcomponent.h | 12 ++- .../components/simulatorcomponent.cpp | 20 ++++- src/blackgui/components/simulatorcomponent.h | 11 ++- src/blackgui/components/simulatorselector.cpp | 8 +- src/blackgui/components/simulatorselector.h | 6 +- src/blackgui/components/statusmessageform.cpp | 7 +- src/blackgui/components/statusmessageform.h | 6 ++ .../components/statusmessageformsmall.cpp | 5 +- .../components/statusmessageformsmall.h | 6 ++ .../components/textmessagecomponent.cpp | 36 +++++++-- .../components/textmessagecomponent.h | 24 ++++-- .../components/transpondercodespinbox.cpp | 4 +- .../components/transpondercodespinbox.h | 5 ++ .../components/transpondermodeselector.cpp | 4 +- .../components/transpondermodeselector.h | 10 ++- src/blackgui/components/updatetimer.cpp | 2 +- src/blackgui/components/updatetimer.h | 6 +- src/blackgui/components/usercomponent.cpp | 14 ++-- src/blackgui/components/usercomponent.h | 10 ++- .../components/voiceroomscomponent.cpp | 15 +++- src/blackgui/components/voiceroomscomponent.h | 4 + src/blackgui/dockwidget.cpp | 24 ++++-- src/blackgui/dockwidget.h | 23 ++++-- src/blackgui/dockwidgetinfoarea.cpp | 8 +- src/blackgui/dockwidgetinfoarea.h | 6 ++ src/blackgui/dockwidgetinfobar.cpp | 11 ++- src/blackgui/dockwidgetinfobar.h | 5 ++ src/blackgui/dropbase.cpp | 7 +- src/blackgui/dropbase.h | 6 +- src/blackgui/dropsite.cpp | 14 +++- src/blackgui/dropsite.h | 14 +++- src/blackgui/editors/aircrafticaoform.cpp | 16 +++- src/blackgui/editors/aircrafticaoform.h | 5 ++ src/blackgui/editors/airlineicaoform.cpp | 16 +++- src/blackgui/editors/airlineicaoform.h | 7 +- src/blackgui/editors/distributorform.cpp | 11 ++- src/blackgui/editors/distributorform.h | 4 + src/blackgui/editors/form.cpp | 5 +- src/blackgui/editors/form.h | 10 ++- src/blackgui/editors/liveryform.cpp | 17 +++- src/blackgui/editors/liveryform.h | 9 ++- src/blackgui/editors/modelmappingform.cpp | 11 ++- src/blackgui/editors/modelmappingform.h | 7 +- .../editors/modelmappingmodifyform.cpp | 11 ++- src/blackgui/editors/modelmappingmodifyform.h | 13 +-- src/blackgui/editors/ownmodelsetform.cpp | 12 ++- src/blackgui/editors/ownmodelsetform.h | 4 + src/blackgui/editors/validationindicator.cpp | 10 ++- src/blackgui/editors/validationindicator.h | 6 ++ src/blackgui/enableforframelesswindow.cpp | 16 +++- src/blackgui/enableforframelesswindow.h | 21 +++-- src/blackgui/enableforviewbasedindicator.cpp | 4 +- .../filters/aircrafticaofilterbar.cpp | 10 ++- src/blackgui/filters/aircrafticaofilterbar.h | 19 ++++- .../filters/aircraftmodelfilterbar.cpp | 13 ++- src/blackgui/filters/aircraftmodelfilterbar.h | 14 +++- .../filters/aircraftmodelfilterdialog.cpp | 4 +- .../filters/aircraftmodelfilterdialog.h | 13 ++- src/blackgui/filters/airlineicaofilterbar.cpp | 13 ++- src/blackgui/filters/airlineicaofilterbar.h | 18 ++++- src/blackgui/filters/countryfilterbar.cpp | 9 ++- src/blackgui/filters/countryfilterbar.h | 12 ++- src/blackgui/filters/filterbarbuttons.cpp | 6 +- src/blackgui/filters/filterbarbuttons.h | 5 ++ src/blackgui/filters/filterdialog.cpp | 6 +- src/blackgui/filters/filterdialog.h | 4 + src/blackgui/filters/filterwidget.cpp | 7 +- src/blackgui/filters/filterwidget.h | 4 + src/blackgui/filters/liveryfilterbar.cpp | 14 +++- src/blackgui/filters/liveryfilterbar.h | 20 ++++- src/blackgui/foreignwindows.cpp | 6 +- src/blackgui/foreignwindows.h | 10 ++- src/blackgui/guiapplication.cpp | 34 ++++++-- src/blackgui/guiapplication.h | 22 ++++-- src/blackgui/guiutility.cpp | 34 ++++---- src/blackgui/guiutility.h | 19 +++-- src/blackgui/infoarea.cpp | 31 +++++--- src/blackgui/infoarea.h | 29 +++++-- src/blackgui/labelandicon.cpp | 4 +- src/blackgui/labelandicon.h | 6 ++ src/blackgui/led.cpp | 18 +++-- src/blackgui/led.h | 16 +++- src/blackgui/levelmeter.cpp | 9 ++- src/blackgui/levelmeter.h | 6 ++ src/blackgui/loadindicator.cpp | 10 +-- src/blackgui/loadindicator.h | 10 ++- src/blackgui/loginmodebuttons.cpp | 4 +- src/blackgui/loginmodebuttons.h | 5 +- src/blackgui/mainwindowaccess.cpp | 8 +- src/blackgui/mainwindowaccess.h | 4 +- src/blackgui/managedstatusbar.cpp | 14 +++- src/blackgui/managedstatusbar.h | 9 ++- src/blackgui/menus/aircraftmodelmenus.cpp | 2 + src/blackgui/menus/aircraftmodelmenus.h | 18 ++++- src/blackgui/menus/menuaction.cpp | 9 ++- src/blackgui/menus/menuaction.h | 11 ++- src/blackgui/menus/menudelegate.h | 8 +- src/blackgui/models/actionhotkeylistmodel.cpp | 9 ++- src/blackgui/models/actionhotkeylistmodel.h | 7 ++ src/blackgui/models/actionitem.cpp | 4 +- src/blackgui/models/actionitem.h | 2 +- src/blackgui/models/actionmodel.cpp | 8 +- src/blackgui/models/actionmodel.h | 6 +- src/blackgui/models/aircrafticaofilter.cpp | 2 +- src/blackgui/models/aircrafticaofilter.h | 2 + src/blackgui/models/aircrafticaolistmodel.cpp | 12 ++- src/blackgui/models/aircrafticaolistmodel.h | 6 +- src/blackgui/models/aircraftmodelfilter.cpp | 5 +- src/blackgui/models/aircraftmodelfilter.h | 7 +- .../models/aircraftmodellistmodel.cpp | 16 +++- src/blackgui/models/aircraftmodellistmodel.h | 11 ++- src/blackgui/models/airlineicaofilter.cpp | 2 +- src/blackgui/models/airlineicaofilter.h | 2 + src/blackgui/models/airlineicaolistmodel.cpp | 14 +++- src/blackgui/models/airlineicaolistmodel.h | 13 ++- src/blackgui/models/airportlistmodel.cpp | 12 ++- src/blackgui/models/airportlistmodel.h | 6 +- src/blackgui/models/atcstationlistmodel.cpp | 22 +++++- src/blackgui/models/atcstationlistmodel.h | 9 ++- src/blackgui/models/clientlistmodel.cpp | 15 +++- src/blackgui/models/clientlistmodel.h | 9 ++- src/blackgui/models/columnformatters.cpp | 15 +++- src/blackgui/models/columnformatters.h | 19 +++-- src/blackgui/models/columns.cpp | 6 +- src/blackgui/models/columns.h | 14 ++-- src/blackgui/models/countryfilter.cpp | 2 +- src/blackgui/models/countryfilter.h | 2 + src/blackgui/models/countrylistmodel.cpp | 10 ++- src/blackgui/models/countrylistmodel.h | 12 ++- src/blackgui/models/distributorlistmodel.cpp | 14 +++- src/blackgui/models/distributorlistmodel.h | 9 ++- src/blackgui/models/identifierlistmodel.cpp | 9 ++- src/blackgui/models/identifierlistmodel.h | 6 +- src/blackgui/models/listmodelbase.cpp | 52 ++++++++++-- src/blackgui/models/listmodelbase.h | 22 +++++- src/blackgui/models/listmodeldbobjects.cpp | 8 +- src/blackgui/models/listmodeldbobjects.h | 24 +++++- src/blackgui/models/liveryfilter.cpp | 5 +- src/blackgui/models/liveryfilter.h | 3 + src/blackgui/models/liverylistmodel.cpp | 15 +++- src/blackgui/models/liverylistmodel.h | 13 ++- src/blackgui/models/modelfilter.cpp | 5 +- src/blackgui/models/modelfilter.h | 19 ++++- .../models/namevariantpairlistmodel.cpp | 11 ++- .../models/namevariantpairlistmodel.h | 15 +++- src/blackgui/models/serverlistmodel.cpp | 9 ++- src/blackgui/models/serverlistmodel.h | 7 +- .../models/simulatedaircraftlistmodel.cpp | 16 +++- .../models/simulatedaircraftlistmodel.h | 8 +- .../models/statusmessagelistmodel.cpp | 13 +-- src/blackgui/models/statusmessagelistmodel.h | 7 +- src/blackgui/models/textmessagelistmodel.cpp | 12 ++- src/blackgui/models/textmessagelistmodel.h | 9 ++- src/blackgui/models/userlistmodel.cpp | 12 ++- src/blackgui/models/userlistmodel.h | 6 +- src/blackgui/overlaymessages.cpp | 20 +++++ src/blackgui/overlaymessages.h | 17 +++- src/blackgui/overlaymessagesframe.cpp | 8 +- src/blackgui/overlaymessagesframe.h | 19 ++++- src/blackgui/pluginconfig.h | 4 +- src/blackgui/pluginconfigwindow.cpp | 7 +- src/blackgui/pluginconfigwindow.h | 4 + src/blackgui/plugindetailswindow.cpp | 9 ++- src/blackgui/plugindetailswindow.h | 5 ++ src/blackgui/pluginselector.cpp | 8 +- src/blackgui/pluginselector.h | 5 +- src/blackgui/registermetadata.cpp | 4 +- src/blackgui/shortcut.cpp | 5 +- src/blackgui/shortcut.h | 3 +- src/blackgui/showhidebar.cpp | 4 +- src/blackgui/showhidebar.h | 5 ++ src/blackgui/stylesheetutility.cpp | 17 +++- src/blackgui/stylesheetutility.h | 12 ++- src/blackgui/systemtraywindow.cpp | 19 ++--- src/blackgui/systemtraywindow.h | 14 +++- src/blackgui/textmessagetextedit.cpp | 17 +++- src/blackgui/textmessagetextedit.h | 11 ++- src/blackgui/ticklabel.cpp | 2 +- src/blackgui/ticklabel.h | 5 ++ src/blackgui/uppercasevalidator.cpp | 5 +- src/blackgui/uppercasevalidator.h | 4 + src/blackgui/views/aircrafticaoview.cpp | 5 +- src/blackgui/views/aircrafticaoview.h | 15 +++- src/blackgui/views/aircraftmodelview.cpp | 34 +++++--- src/blackgui/views/aircraftmodelview.h | 32 +++++++- src/blackgui/views/airlineicaoview.cpp | 5 +- src/blackgui/views/airlineicaoview.h | 15 +++- src/blackgui/views/airportview.cpp | 4 +- src/blackgui/views/airportview.h | 9 ++- src/blackgui/views/atcstationview.cpp | 11 ++- src/blackgui/views/atcstationview.h | 22 +++++- src/blackgui/views/checkboxdelegate.cpp | 12 ++- src/blackgui/views/checkboxdelegate.h | 10 ++- src/blackgui/views/clientview.cpp | 5 +- src/blackgui/views/clientview.h | 13 ++- src/blackgui/views/countryview.cpp | 3 +- src/blackgui/views/countryview.h | 7 +- src/blackgui/views/distributorview.cpp | 5 +- src/blackgui/views/distributorview.h | 16 +++- src/blackgui/views/identifierview.cpp | 4 +- src/blackgui/views/identifierview.h | 9 ++- src/blackgui/views/liveryview.cpp | 4 +- src/blackgui/views/liveryview.h | 13 ++- src/blackgui/views/namevariantpairview.cpp | 6 +- src/blackgui/views/namevariantpairview.h | 13 ++- src/blackgui/views/serverview.cpp | 5 +- src/blackgui/views/serverview.h | 9 ++- src/blackgui/views/simulatedaircraftview.cpp | 10 ++- src/blackgui/views/simulatedaircraftview.h | 18 ++++- src/blackgui/views/statusmessageview.cpp | 7 +- src/blackgui/views/statusmessageview.h | 14 +++- src/blackgui/views/textmessageview.cpp | 6 +- src/blackgui/views/textmessageview.h | 9 ++- src/blackgui/views/userview.cpp | 6 +- src/blackgui/views/userview.h | 8 +- src/blackgui/views/viewbase.cpp | 79 +++++++++++++++---- src/blackgui/views/viewbase.h | 63 +++++++++++---- src/blackgui/views/viewdbobjects.cpp | 10 ++- src/blackgui/views/viewdbobjects.h | 29 ++++++- src/blackgui/win/windowfinderwindows.cpp | 2 +- src/blackgui/win/windowfinderwindows.h | 2 +- src/blackgui/windowfinder.cpp | 4 +- .../simulation/simulatorplugininfolist.h | 1 + 352 files changed, 3422 insertions(+), 959 deletions(-) diff --git a/src/blackgui/components/aircraftcombinedtypeselector.cpp b/src/blackgui/components/aircraftcombinedtypeselector.cpp index 1e3859b7d..ba03e9968 100644 --- a/src/blackgui/components/aircraftcombinedtypeselector.cpp +++ b/src/blackgui/components/aircraftcombinedtypeselector.cpp @@ -7,10 +7,15 @@ * contained in the LICENSE file. */ -#include "aircraftcombinedtypeselector.h" -#include "ui_aircraftcombinedtypeselector.h" +#include "blackgui/components/aircraftcombinedtypeselector.h" #include "blackgui/guiutility.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "ui_aircraftcombinedtypeselector.h" + +#include +#include +#include using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/aircraftcombinedtypeselector.h b/src/blackgui/components/aircraftcombinedtypeselector.h index 0cc6e88fe..998245941 100644 --- a/src/blackgui/components/aircraftcombinedtypeselector.h +++ b/src/blackgui/components/aircraftcombinedtypeselector.h @@ -14,9 +14,15 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/aviation/aircrafticaocode.h" -#include -#include +#include +#include +#include +#include + +class QWidget; + +namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace Ui { class CAircraftCombinedTypeSelector; } namespace BlackGui diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp index bc718d69d..540bcd77c 100644 --- a/src/blackgui/components/aircraftcomponent.cpp +++ b/src/blackgui/components/aircraftcomponent.cpp @@ -7,14 +7,22 @@ * contained in the LICENSE file. */ -#include "aircraftcomponent.h" -#include "ui_aircraftcomponent.h" -#include "enablefordockwidgetinfoarea.h" -#include "blackgui/guiutility.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextsimulator.h" #include "blackcore/network.h" +#include "blackgui/components/aircraftcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/infoarea.h" +#include "blackgui/models/simulatedaircraftlistmodel.h" +#include "blackgui/views/airportview.h" +#include "blackgui/views/simulatedaircraftview.h" +#include "blackgui/views/viewbase.h" +#include "ui_aircraftcomponent.h" + +#include +#include +#include using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/blackgui/components/aircraftcomponent.h b/src/blackgui/components/aircraftcomponent.h index 646fae7d0..809f6d5e5 100644 --- a/src/blackgui/components/aircraftcomponent.h +++ b/src/blackgui/components/aircraftcomponent.h @@ -12,17 +12,29 @@ #ifndef BLACKGUI_AIRCRAFTCOMPONENT_H #define BLACKGUI_AIRCRAFTCOMPONENT_H +#include "blackcore/network.h" #include "blackgui/blackguiexport.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackcore/network.h" -#include +#include #include +#include +#include +class QWidget; + +namespace BlackMisc +{ + namespace Aviation { class CCallsign; } + namespace Simulation { class CSimulatedAircraft; } +} namespace Ui { class CAircraftComponent; } + namespace BlackGui { + class CDockWidgetInfoArea; + namespace Components { //! Aircraft widget diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 9fb9ad394..81716aa48 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -7,15 +7,33 @@ * contained in the LICENSE file. */ -#include "atcstationcomponent.h" -#include "ui_atcstationcomponent.h" -#include "blackgui/guiutility.h" -#include "blackgui/guiapplication.h" -#include "blackmisc/aviation/informationmessage.h" -#include "blackmisc/logmessage.h" -#include "blackmisc/weather/metar.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextownaircraft.h" +#include "blackgui/components/atcstationcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/infoarea.h" +#include "blackgui/models/atcstationlistmodel.h" +#include "blackgui/views/atcstationview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/informationmessage.h" +#include "blackmisc/compare.h" +#include "blackmisc/icons.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/weather/metar.h" +#include "ui_atcstationcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackGui::Models; diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index 35dceae06..e9a68814d 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -12,20 +12,32 @@ #ifndef BLACKGUI_ATCSTATIONCOMPONENT_H #define BLACKGUI_ATCSTATIONCOMPONENT_H +#include "blackcore/network.h" #include "blackgui/blackguiexport.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackcore/network.h" -#include "blackmisc/identifiable.h" #include "blackmisc/aviation/atcstation.h" -#include -#include -#include +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/identifiable.h" +#include "blackmisc/pq/frequency.h" +#include +#include +#include +#include +#include +#include +#include + +class QWidget; + +namespace BlackMisc { namespace Aviation { class CCallsign; } } namespace Ui { class CAtcStationComponent; } namespace BlackGui { + class CDockWidgetInfoArea; + namespace Components { //! ATC stations component diff --git a/src/blackgui/components/audiocomponent.cpp b/src/blackgui/components/audiocomponent.cpp index 8313f2ff9..674d4278f 100644 --- a/src/blackgui/components/audiocomponent.cpp +++ b/src/blackgui/components/audiocomponent.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "audiocomponent.h" +#include "blackgui/components/audiocomponent.h" #include "ui_audiocomponent.h" namespace BlackGui diff --git a/src/blackgui/components/audiocomponent.h b/src/blackgui/components/audiocomponent.h index ac8a15c77..733bd60fe 100644 --- a/src/blackgui/components/audiocomponent.h +++ b/src/blackgui/components/audiocomponent.h @@ -13,9 +13,13 @@ #define BLACKGUI_AUDIOCOMPONENT_H #include "blackgui/blackguiexport.h" + #include +#include #include +class QWidget; + namespace Ui { class CAudioComponent; } namespace BlackGui diff --git a/src/blackgui/components/audiosetupcomponent.cpp b/src/blackgui/components/audiosetupcomponent.cpp index 9b4cf53cb..2bfefe62c 100644 --- a/src/blackgui/components/audiosetupcomponent.cpp +++ b/src/blackgui/components/audiosetupcomponent.cpp @@ -7,11 +7,19 @@ * contained in the LICENSE file. */ -#include "audiosetupcomponent.h" -#include "ui_audiosetupcomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextaudio.h" -#include "blackmisc/logmessage.h" +#include "blackgui/components/audiosetupcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/audio/audiodeviceinfo.h" +#include "blackmisc/audio/notificationsounds.h" +#include "blackmisc/audio/settings/settingsaudio.h" +#include "blackmisc/sequence.h" +#include "ui_audiosetupcomponent.h" + +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h index 589b3dcc1..57066cc40 100644 --- a/src/blackgui/components/audiosetupcomponent.h +++ b/src/blackgui/components/audiosetupcomponent.h @@ -12,12 +12,17 @@ #ifndef BLACKGUI_AUDIOSETUPCOMPONENT_H #define BLACKGUI_AUDIOSETUPCOMPONENT_H -#include "blackgui/blackguiexport.h" #include "blackcore/settings/audio.h" +#include "blackgui/blackguiexport.h" #include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/settingscache.h" + #include +#include #include +class QWidget; + namespace Ui { class CAudioSetupComponent; } namespace BlackGui diff --git a/src/blackgui/components/audiovolumecomponent.cpp b/src/blackgui/components/audiovolumecomponent.cpp index 96cfc1f1c..1a173f5e3 100644 --- a/src/blackgui/components/audiovolumecomponent.cpp +++ b/src/blackgui/components/audiovolumecomponent.cpp @@ -7,12 +7,20 @@ * contained in the LICENSE file. */ -#include "blackgui/guiapplication.h" -#include "blackcore/contextaudio.h" -#include "blackmisc/audio/audioutils.h" #include "audiovolumecomponent.h" +#include "blackcore/contextaudio.h" +#include "blackgui/components/audiovolumecomponent.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/audio/audioutils.h" #include "ui_audiovolumecomponent.h" +#include +#include +#include +#include +#include +#include + using namespace BlackCore; namespace BlackGui diff --git a/src/blackgui/components/audiovolumecomponent.h b/src/blackgui/components/audiovolumecomponent.h index 15f3a3447..8475be16c 100644 --- a/src/blackgui/components/audiovolumecomponent.h +++ b/src/blackgui/components/audiovolumecomponent.h @@ -13,10 +13,15 @@ #define BLACKGUI_AUDIOVOLUME_H #include "blackgui/blackguiexport.h" + #include +#include #include +class QWidget; + namespace Ui { class CAudioVolumeComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index 0df60ce55..249e69458 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -7,18 +7,33 @@ * contained in the LICENSE file. */ -#include "cockpitcomcomponent.h" -#include "ui_cockpitcomcomponent.h" -#include "../stylesheetutility.h" -#include "blackgui/guiapplication.h" +#include "blackcore/contextaudio.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextownaircraft.h" -#include "blackcore/contextaudio.h" +#include "blackgui/components/cockpitcomcomponent.h" +#include "blackgui/components/selcalcodeselector.h" +#include "blackgui/components/transpondercodespinbox.h" +#include "blackgui/components/transpondermodeselector.h" +#include "blackgui/guiapplication.h" +#include "blackgui/led.h" +#include "blackgui/stylesheetutility.h" +#include "blackmisc/audio/voiceroom.h" #include "blackmisc/audio/voiceroomlist.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" #include "blackmisc/logmessage.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/sequence.h" +#include "ui_cockpitcomcomponent.h" #include +#include #include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/cockpitcomcomponent.h b/src/blackgui/components/cockpitcomcomponent.h index bb584c1f6..b44bc82b1 100644 --- a/src/blackgui/components/cockpitcomcomponent.h +++ b/src/blackgui/components/cockpitcomcomponent.h @@ -13,14 +13,22 @@ #define BLACKGUI_COCKPITCOMCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "enablefordockwidgetinfoarea.h" -#include "blackmisc/identifiable.h" -#include "blackmisc/aviation/transponder.h" -#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackmisc/audio/voiceroomlist.h" +#include "blackmisc/aviation/selcal.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/identifiable.h" +#include "blackmisc/identifier.h" +#include "blackmisc/simulation/simulatedaircraft.h" + #include +#include #include +class QPaintEvent; +class QWidget; + +namespace BlackMisc { namespace Aviation { class CComSystem; } } namespace Ui { class CCockpitMainComponent; } namespace BlackGui diff --git a/src/blackgui/components/cockpitcomponent.cpp b/src/blackgui/components/cockpitcomponent.cpp index 2cde9a016..110726e5c 100644 --- a/src/blackgui/components/cockpitcomponent.cpp +++ b/src/blackgui/components/cockpitcomponent.cpp @@ -7,11 +7,16 @@ * contained in the LICENSE file. */ -#include "cockpitcomponent.h" -#include "../showhidebar.h" -#include "../dockwidgetinfoarea.h" +#include "blackgui/components/cockpitcomcomponent.h" +#include "blackgui/components/cockpitcomponent.h" +#include "blackgui/components/cockpitinfoareacomponent.h" +#include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/showhidebar.h" #include "ui_cockpitcomponent.h" +#include +#include + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/cockpitcomponent.h b/src/blackgui/components/cockpitcomponent.h index 51874c697..1a68f154f 100644 --- a/src/blackgui/components/cockpitcomponent.h +++ b/src/blackgui/components/cockpitcomponent.h @@ -13,14 +13,19 @@ #define BLACKGUI_COCKPITCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "enablefordockwidgetinfoarea.h" -#include +#include "blackgui/components/enablefordockwidgetinfoarea.h" + +#include #include +#include +#include namespace Ui { class CCockpitComponent; } namespace BlackGui { + class CDockWidgetInfoArea; + namespace Components { //! Cockpit component: COM unit, show / hide bar, voice rooms diff --git a/src/blackgui/components/cockpitinfoareacomponent.cpp b/src/blackgui/components/cockpitinfoareacomponent.cpp index 29f61fea4..f29610f4a 100644 --- a/src/blackgui/components/cockpitinfoareacomponent.cpp +++ b/src/blackgui/components/cockpitinfoareacomponent.cpp @@ -7,9 +7,13 @@ * contained in the LICENSE file. */ -#include "cockpitinfoareacomponent.h" -#include "ui_cockpitinfoareacomponent.h" +#include "blackgui/components/cockpitinfoareacomponent.h" +#include "blackgui/infoarea.h" #include "blackmisc/icons.h" +#include "ui_cockpitinfoareacomponent.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/components/cockpitinfoareacomponent.h b/src/blackgui/components/cockpitinfoareacomponent.h index d2f348e5a..d4366a005 100644 --- a/src/blackgui/components/cockpitinfoareacomponent.h +++ b/src/blackgui/components/cockpitinfoareacomponent.h @@ -13,11 +13,17 @@ #define BLACKGUI_COCKPITINFOAREACOMPONENT_H #include "blackgui/blackguiexport.h" -#include "../infoarea.h" -#include +#include "blackgui/infoarea.h" + +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CCockpitInfoAreaComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp index 0c37eea82..a89c064b3 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp @@ -7,11 +7,15 @@ * contained in the LICENSE file. */ -#include "cockpittranspondermodeledscomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextownaircraft.h" -#include +#include "blackgui/components/cockpittranspondermodeledscomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/led.h" + +#include #include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.h b/src/blackgui/components/cockpittranspondermodeledscomponent.h index 759ed1fee..03dbc8d4b 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.h +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.h @@ -13,11 +13,17 @@ #define BLACKMISC_COCKPITTRANSPONDERMODELEDSCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "../led.h" -#include "blackmisc/identifiable.h" -#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackgui/led.h" #include "blackmisc/aviation/transponder.h" +#include "blackmisc/identifiable.h" +#include "blackmisc/identifier.h" +#include "blackmisc/simulation/simulatedaircraft.h" + #include +#include +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/components/colorselector.cpp b/src/blackgui/components/colorselector.cpp index b9f01011e..aa37b0a57 100644 --- a/src/blackgui/components/colorselector.cpp +++ b/src/blackgui/components/colorselector.cpp @@ -7,16 +7,33 @@ * contained in the LICENSE file. */ +#include "blackgui/components/colorselector.h" +#include "blackgui/guiutility.h" +#include "blackmisc/compare.h" +#include "blackmisc/icons.h" #include "blackmisc/rgbcolor.h" +#include "blackmisc/variant.h" #include "colorselector.h" -#include "guiutility.h" #include "ui_colorselector.h" -#include + #include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/components/colorselector.h b/src/blackgui/components/colorselector.h index 595da432e..73e79b891 100644 --- a/src/blackgui/components/colorselector.h +++ b/src/blackgui/components/colorselector.h @@ -14,7 +14,19 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/rgbcolor.h" + +#include #include +#include +#include +#include + +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QMouseEvent; +class QWidget; namespace Ui { class CColorSelector; } diff --git a/src/blackgui/components/commandinput.cpp b/src/blackgui/components/commandinput.cpp index 90fc1c0cd..3ee5031db 100644 --- a/src/blackgui/components/commandinput.cpp +++ b/src/blackgui/components/commandinput.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "commandinput.h" -#include +#include "blackgui/components/commandinput.h" + +class QWidget; using namespace BlackMisc; diff --git a/src/blackgui/components/commandinput.h b/src/blackgui/components/commandinput.h index 050552172..4a20d77a0 100644 --- a/src/blackgui/components/commandinput.h +++ b/src/blackgui/components/commandinput.h @@ -14,9 +14,14 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/identifiable.h" +#include "blackmisc/identifier.h" + #include +#include #include +class QWidget; + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/coreinfoareacomponent.cpp b/src/blackgui/components/coreinfoareacomponent.cpp index b9c10d4de..3620fab18 100644 --- a/src/blackgui/components/coreinfoareacomponent.cpp +++ b/src/blackgui/components/coreinfoareacomponent.cpp @@ -7,17 +7,10 @@ * contained in the LICENSE file. */ -#include "coreinfoareacomponent.h" -#include "ui_coreinfoareacomponent.h" -#include "blackgui/components/logcomponent.h" -#include "blackgui/components/corestatuscomponent.h" -#include "blackgui/stylesheetutility.h" -#include "blackgui/guiutility.h" +#include "blackgui/components/coreinfoareacomponent.h" +#include "blackgui/infoarea.h" #include "blackmisc/icons.h" -#include -#include -#include -#include +#include "ui_coreinfoareacomponent.h" using namespace BlackMisc; using namespace BlackGui; diff --git a/src/blackgui/components/coreinfoareacomponent.h b/src/blackgui/components/coreinfoareacomponent.h index e54502d83..b86030072 100644 --- a/src/blackgui/components/coreinfoareacomponent.h +++ b/src/blackgui/components/coreinfoareacomponent.h @@ -13,18 +13,23 @@ #define BLACKGUI_COMPONENTS_COREINFOAREACOMPONENT_H #include "blackgui/blackguiexport.h" -#include "../infoarea.h" -#include -#include +#include "blackgui/infoarea.h" + +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CCoreInfoAreaComponent; } + namespace BlackGui { namespace Components { - class CLogComponent; class CCoreStatusComponent; + class CLogComponent; //! Main info area class BLACKGUI_EXPORT CCoreInfoAreaComponent : public BlackGui::CInfoArea diff --git a/src/blackgui/components/corestatuscomponent.cpp b/src/blackgui/components/corestatuscomponent.cpp index e93222f4b..e5dc8007c 100644 --- a/src/blackgui/components/corestatuscomponent.cpp +++ b/src/blackgui/components/corestatuscomponent.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "corestatuscomponent.h" +#include "blackgui/components/corestatuscomponent.h" #include "ui_corestatuscomponent.h" +class QWidget; + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/corestatuscomponent.h b/src/blackgui/components/corestatuscomponent.h index 2493a44e5..eab3b2be0 100644 --- a/src/blackgui/components/corestatuscomponent.h +++ b/src/blackgui/components/corestatuscomponent.h @@ -13,9 +13,13 @@ #define BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H #include "blackgui/blackguiexport.h" + #include +#include #include +class QWidget; + namespace Ui { class CCoreStatusComponent; } namespace BlackGui diff --git a/src/blackgui/components/datainfoareacomponent.cpp b/src/blackgui/components/datainfoareacomponent.cpp index 709ddac72..29c51025c 100644 --- a/src/blackgui/components/datainfoareacomponent.cpp +++ b/src/blackgui/components/datainfoareacomponent.cpp @@ -7,16 +7,27 @@ * contained in the LICENSE file. */ -#include "ui_datainfoareacomponent.h" -#include "blackgui/guiapplication.h" -#include "blackgui/components/logcomponent.h" -#include "blackgui/components/datainfoareacomponent.h" -#include "blackmisc/network/entityflags.h" #include "blackcore/webdataservices.h" +#include "blackgui/components/datainfoareacomponent.h" +#include "blackgui/components/dbaircrafticaocomponent.h" +#include "blackgui/components/dbairlineicaocomponent.h" +#include "blackgui/components/dbcountrycomponent.h" +#include "blackgui/components/dbdistributorcomponent.h" +#include "blackgui/components/dbliverycomponent.h" +#include "blackgui/components/dbmodelcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/buildconfig.h" #include "blackmisc/icons.h" #include "blackmisc/logmessage.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/verify.h" -#include "blackmisc/buildconfig.h" +#include "ui_datainfoareacomponent.h" + +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/datainfoareacomponent.h b/src/blackgui/components/datainfoareacomponent.h index 3fc195c97..302b551e6 100644 --- a/src/blackgui/components/datainfoareacomponent.h +++ b/src/blackgui/components/datainfoareacomponent.h @@ -15,8 +15,13 @@ #include "blackgui/blackguiexport.h" #include "blackgui/infoarea.h" #include "blackmisc/network/entityflags.h" -#include + +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CDataInfoAreaComponent; } @@ -24,13 +29,12 @@ namespace BlackGui { namespace Components { - class CDataMappingComponent; class CDbAircraftIcaoComponent; class CDbAirlineIcaoComponent; - class CDbModelComponent; + class CDbCountryComponent; class CDbDistributorComponent; class CDbLiveryComponent; - class CDbCountryComponent; + class CDbModelComponent; /** * Info area containing the DB data (models, liveries ...) diff --git a/src/blackgui/components/datamaininfoareacomponent.cpp b/src/blackgui/components/datamaininfoareacomponent.cpp index 0e286dc0f..4132aaecd 100644 --- a/src/blackgui/components/datamaininfoareacomponent.cpp +++ b/src/blackgui/components/datamaininfoareacomponent.cpp @@ -7,14 +7,17 @@ * contained in the LICENSE file. */ -#include "blackgui/components/logcomponent.h" +#include "blackgui/components/datainfoareacomponent.h" #include "blackgui/components/datamaininfoareacomponent.h" -#include "blackgui/components/dbliverycomponent.h" #include "blackgui/components/dbaircrafticaocomponent.h" +#include "blackgui/components/dbliverycomponent.h" +#include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbmodelcomponent.h" -#include "blackgui/components/dbstashcomponent.h" -#include "ui_datamaininfoareacomponent.h" +#include "blackgui/components/logcomponent.h" #include "blackmisc/icons.h" +#include "ui_datamaininfoareacomponent.h" + +#include using namespace BlackMisc; using namespace BlackGui; diff --git a/src/blackgui/components/datamaininfoareacomponent.h b/src/blackgui/components/datamaininfoareacomponent.h index d33d49881..271456e07 100644 --- a/src/blackgui/components/datamaininfoareacomponent.h +++ b/src/blackgui/components/datamaininfoareacomponent.h @@ -14,8 +14,13 @@ #include "blackgui/blackguiexport.h" #include "blackgui/infoarea.h" -#include + +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CDataMainInfoAreaComponent; } @@ -23,9 +28,9 @@ namespace BlackGui { namespace Components { - class CLogComponent; - class CDbMappingComponent; class CDataInfoAreaComponent; + class CDbMappingComponent; + class CLogComponent; /** * Main info area for data entry tool diff --git a/src/blackgui/components/datasettingscomponent.cpp b/src/blackgui/components/datasettingscomponent.cpp index fb5667308..7eb38e0bb 100644 --- a/src/blackgui/components/datasettingscomponent.cpp +++ b/src/blackgui/components/datasettingscomponent.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "datasettingscomponent.h" +#include "blackgui/components/datasettingscomponent.h" #include "ui_datasettingscomponent.h" using namespace BlackGui; diff --git a/src/blackgui/components/datasettingscomponent.h b/src/blackgui/components/datasettingscomponent.h index 70765bd07..e52b034cf 100644 --- a/src/blackgui/components/datasettingscomponent.h +++ b/src/blackgui/components/datasettingscomponent.h @@ -14,9 +14,12 @@ #include "blackgui/blackguiexport.h" #include "blackgui/overlaymessagesframe.h" -#include + +#include #include +class QWidget; + namespace Ui { class CDataSettingsComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index 459a6ca6a..1e50c94ff 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -7,11 +7,17 @@ * contained in the LICENSE file. */ -#include "ui_dbaircrafticaocomponent.h" -#include "dbaircrafticaocomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/webdataservices.h" -#include +#include "blackgui/components/dbaircrafticaocomponent.h" +#include "blackgui/filters/aircrafticaofilterbar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/aircrafticaoview.h" +#include "blackgui/views/viewbase.h" +#include "dbaircrafticaocomponent.h" +#include "ui_dbaircrafticaocomponent.h" + +#include +#include using namespace BlackCore; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbaircrafticaocomponent.h b/src/blackgui/components/dbaircrafticaocomponent.h index 1da84283e..41d0a91aa 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.h +++ b/src/blackgui/components/dbaircrafticaocomponent.h @@ -13,12 +13,17 @@ #define BLACKGUI_COMPONENTS_DBAIRCRAFTICAOCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" + #include +#include #include +class QWidget; + +namespace BlackMisc { namespace Aviation { class CAircraftIcaoCode; } } namespace Ui { class CDbAircraftIcaoComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index e7b76e750..0e2fe336f 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -7,13 +7,28 @@ * contained in the LICENSE file. */ -#include "dbaircrafticaoselectorcomponent.h" -#include "ui_dbaircrafticaoselectorcomponent.h" +#include "blackcore/application.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbaircrafticaoselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/compare.h" #include "blackmisc/datastoreutility.h" #include "blackmisc/stringutils.h" -#include +#include "blackmisc/variant.h" +#include "ui_dbaircrafticaoselectorcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/blackgui/components/dbaircrafticaoselectorcomponent.h index ae9839a3a..0a208691b 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.h @@ -13,12 +13,21 @@ #define BLACKGUI_COMPONENTS_DBAIRCRAFTICAOSELECTORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/webdataservices.h" #include "blackgui/dropbase.h" #include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/network/entityflags.h" + #include +#include #include -#include +#include + +class QCompleter; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QWidget; namespace Ui { class CDbAircraftIcaoSelectorComponent; } diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index 2f57c5007..2e3572b7f 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -7,11 +7,16 @@ * contained in the LICENSE file. */ -#include "dbairlineicaocomponent.h" -#include "ui_dbairlineicaocomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/webdataservices.h" -#include +#include "blackgui/components/dbairlineicaocomponent.h" +#include "blackgui/filters/airlineicaofilterbar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/airlineicaoview.h" +#include "blackgui/views/viewbase.h" +#include "ui_dbairlineicaocomponent.h" + +#include +#include using namespace BlackCore; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbairlineicaocomponent.h b/src/blackgui/components/dbairlineicaocomponent.h index be5ba2c6b..bc8e79a1d 100644 --- a/src/blackgui/components/dbairlineicaocomponent.h +++ b/src/blackgui/components/dbairlineicaocomponent.h @@ -13,12 +13,16 @@ #define BLACKGUI_COMPONENTS_DBAIRLINEICAOCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" + #include +#include #include +class QWidget; + namespace Ui { class CDbAirlineIcaoComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbairlineicaoselectorbase.cpp b/src/blackgui/components/dbairlineicaoselectorbase.cpp index 89dc51ee1..75402a5a8 100644 --- a/src/blackgui/components/dbairlineicaoselectorbase.cpp +++ b/src/blackgui/components/dbairlineicaoselectorbase.cpp @@ -7,11 +7,22 @@ * contained in the LICENSE file. */ -#include "dbairlineicaoselectorbase.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbairlineicaoselectorbase.h" #include "blackgui/guiapplication.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/compare.h" #include "blackmisc/datastoreutility.h" -#include -#include +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/dbairlineicaoselectorbase.h b/src/blackgui/components/dbairlineicaoselectorbase.h index c9bc9699e..ef7bf83f8 100644 --- a/src/blackgui/components/dbairlineicaoselectorbase.h +++ b/src/blackgui/components/dbairlineicaoselectorbase.h @@ -13,12 +13,21 @@ #define BLACKGUI_DBAIRLINEICAOSELECTORBASE_H #include "blackgui/blackguiexport.h" -#include "blackcore/webdataservices.h" #include "blackgui/dropbase.h" #include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/network/entityflags.h" + #include +#include #include -#include +#include + +class QCompleter; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp index 2b343efd8..1f69e4af5 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp @@ -7,13 +7,19 @@ * contained in the LICENSE file. */ -#include "dbairlineicaoselectorcomponent.h" -#include "ui_dbairlineicaoselectorcomponent.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbairlineicaoselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/airlineicaocodelist.h" #include "blackmisc/datastoreutility.h" #include "blackmisc/stringutils.h" -#include +#include "ui_dbairlineicaoselectorcomponent.h" + +#include +#include +#include +#include using namespace BlackCore; using namespace BlackGui; diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.h b/src/blackgui/components/dbairlineicaoselectorcomponent.h index 073e21df6..265280828 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.h +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.h @@ -13,9 +13,14 @@ #define BLACKGUI_COMPONENTS_DBAIRLINEICAOSELECTORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "dbairlineicaoselectorbase.h" +#include "blackgui/components/dbairlineicaoselectorbase.h" #include "blackmisc/aviation/airlineicaocode.h" -#include + +#include +#include + +class QCompleter; +class QWidget; namespace Ui { class CDbAirlineIcaoSelectorComponent; } diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.cpp b/src/blackgui/components/dbairlinenameselectorcomponent.cpp index 781dad99d..46508a19e 100644 --- a/src/blackgui/components/dbairlinenameselectorcomponent.cpp +++ b/src/blackgui/components/dbairlinenameselectorcomponent.cpp @@ -7,11 +7,17 @@ * contained in the LICENSE file. */ -#include "dbairlinenameselectorcomponent.h" -#include "ui_dbairlinenameselectorcomponent.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbairlinenameselectorcomponent.h" #include "blackgui/guiapplication.h" -#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" #include "blackmisc/datastoreutility.h" +#include "ui_dbairlinenameselectorcomponent.h" + +#include +#include +#include +#include using namespace BlackCore; using namespace BlackGui; diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.h b/src/blackgui/components/dbairlinenameselectorcomponent.h index b5c3b18dd..6e96b92e9 100644 --- a/src/blackgui/components/dbairlinenameselectorcomponent.h +++ b/src/blackgui/components/dbairlinenameselectorcomponent.h @@ -13,9 +13,15 @@ #define BLACKGUI_COMPONENTS_DBAIRLINENAMESELECTORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "dbairlineicaoselectorbase.h" +#include "blackgui/components/dbairlineicaoselectorbase.h" +#include "blackmisc/aviation/airlineicaocode.h" + +#include #include +class QCompleter; +class QWidget; + namespace Ui { class CDbAirlineNameSelectorComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index d2c986a30..296cedcdf 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/src/blackgui/components/dbautostashingcomponent.cpp @@ -7,13 +7,35 @@ * contained in the LICENSE file. */ -#include "ui_dbautostashingcomponent.h" -#include "dbautostashingcomponent.h" -#include "dbmappingcomponent.h" -#include "dbstashcomponent.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbautostashingcomponent.h" +#include "blackgui/components/dbmappingcomponent.h" +#include "blackgui/components/dbstashcomponent.h" #include "blackgui/guiapplication.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/statusmessageview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/sequence.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/statusmessagelist.h" +#include "dbautostashingcomponent.h" +#include "ui_dbautostashingcomponent.h" + +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/blackgui/components/dbautostashingcomponent.h index 6c205d18b..cd6b48cce 100644 --- a/src/blackgui/components/dbautostashingcomponent.h +++ b/src/blackgui/components/dbautostashingcomponent.h @@ -13,16 +13,28 @@ #define BLACKGUI_COMPONENTS_DBAUTOSTASHINGCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/webdataservices.h" -#include "dbmappingcomponentaware.h" -#include "blackmisc/logcategorylist.h" -#include "blackgui/views/aircraftmodelview.h" -#include +#include "blackgui/components/dbmappingcomponentaware.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/statusmessage.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + class CLogCategoryList; + namespace Simulation { class CAircraftModel; } +} namespace Ui { class CDbAutoStashingComponent; } namespace BlackGui { + namespace Views { class CAircraftModelView; } + namespace Components { /*! diff --git a/src/blackgui/components/dbcountrycomponent.cpp b/src/blackgui/components/dbcountrycomponent.cpp index 17bdfed81..8c887a221 100644 --- a/src/blackgui/components/dbcountrycomponent.cpp +++ b/src/blackgui/components/dbcountrycomponent.cpp @@ -7,11 +7,16 @@ * contained in the LICENSE file. */ -#include "dbcountrycomponent.h" -#include "ui_dbcountrycomponent.h" -#include "blackgui/guiapplication.h" +#include "blackcore/application.h" #include "blackcore/webdataservices.h" -#include +#include "blackgui/components/dbcountrycomponent.h" +#include "blackgui/filters/countryfilterbar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/countryview.h" +#include "blackgui/views/viewbase.h" +#include "ui_dbcountrycomponent.h" + +#include using namespace BlackCore; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbcountrycomponent.h b/src/blackgui/components/dbcountrycomponent.h index 9b114d30f..f05390235 100644 --- a/src/blackgui/components/dbcountrycomponent.h +++ b/src/blackgui/components/dbcountrycomponent.h @@ -13,12 +13,16 @@ #define BLACKGUI_COMPONENTS_DBCOUNTRYCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" + #include +#include #include +class QWidget; + namespace Ui { class CDbCountryComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbcountryselectorcomponent.cpp b/src/blackgui/components/dbcountryselectorcomponent.cpp index 723a56732..943eb8119 100644 --- a/src/blackgui/components/dbcountryselectorcomponent.cpp +++ b/src/blackgui/components/dbcountryselectorcomponent.cpp @@ -7,12 +7,26 @@ * contained in the LICENSE file. */ -#include "dbcountryselectorcomponent.h" -#include "ui_dbcountryselectorcomponent.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbcountryselectorcomponent.h" #include "blackgui/guiapplication.h" -#include "blackgui/guiutility.h" #include "blackgui/uppercasevalidator.h" -#include +#include "blackmisc/compare.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/variant.h" +#include "ui_dbcountryselectorcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/dbcountryselectorcomponent.h b/src/blackgui/components/dbcountryselectorcomponent.h index 0ed49f588..5876fec35 100644 --- a/src/blackgui/components/dbcountryselectorcomponent.h +++ b/src/blackgui/components/dbcountryselectorcomponent.h @@ -13,12 +13,21 @@ #define BLACKGUI_DBCOUNTRYSELECTORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/webdataservices.h" #include "blackgui/dropbase.h" #include "blackmisc/country.h" +#include "blackmisc/network/entityflags.h" + #include +#include #include -#include +#include + +class QCompleter; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QWidget; namespace Ui { class CDbCountrySelectorComponent; } diff --git a/src/blackgui/components/dbdebugdatabasesetup.cpp b/src/blackgui/components/dbdebugdatabasesetup.cpp index f69e98b3b..79a87ce3b 100644 --- a/src/blackgui/components/dbdebugdatabasesetup.cpp +++ b/src/blackgui/components/dbdebugdatabasesetup.cpp @@ -7,10 +7,13 @@ * contained in the LICENSE file. */ +#include "blackgui/components/dbdebugdatabasesetup.h" #include "blackgui/guiapplication.h" #include "dbdebugdatabasesetup.h" #include "ui_dbdebugdatabasesetup.h" +#include + using namespace BlackCore::Data; using namespace BlackMisc; diff --git a/src/blackgui/components/dbdebugdatabasesetup.h b/src/blackgui/components/dbdebugdatabasesetup.h index e09868ba7..c058e60f8 100644 --- a/src/blackgui/components/dbdebugdatabasesetup.h +++ b/src/blackgui/components/dbdebugdatabasesetup.h @@ -12,11 +12,16 @@ #ifndef BLACKGUI_COMPONENTS_DBDEBUGDATABASESETUP_H #define BLACKGUI_COMPONENTS_DBDEBUGDATABASESETUP_H -#include "blackgui/blackguiexport.h" #include "blackcore/data/globalsetup.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/datacache.h" + #include +#include #include +class QWidget; + namespace Ui { class CDbDebugDatabaseSetup; } namespace BlackGui diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/blackgui/components/dbdistributorcomponent.cpp index ab99d8e3a..c0e068ecb 100644 --- a/src/blackgui/components/dbdistributorcomponent.cpp +++ b/src/blackgui/components/dbdistributorcomponent.cpp @@ -7,13 +7,17 @@ * contained in the LICENSE file. */ -#include "ui_dbdistributorcomponent.h" -#include "blackgui/guiapplication.h" -#include "dbdistributorcomponent.h" #include "blackcore/webdataservices.h" +#include "blackgui/components/dbdistributorcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/distributorview.h" +#include "blackgui/views/viewbase.h" +#include "dbdistributorcomponent.h" +#include "ui_dbdistributorcomponent.h" #include #include +#include using namespace BlackCore; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbdistributorcomponent.h b/src/blackgui/components/dbdistributorcomponent.h index 8a64126d9..bda8b4127 100644 --- a/src/blackgui/components/dbdistributorcomponent.h +++ b/src/blackgui/components/dbdistributorcomponent.h @@ -13,12 +13,16 @@ #define BLACKGUI_COMPONENTS_DBDISTRIBUTORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" + #include +#include #include +class QWidget; + namespace Ui { class CDbDistributorComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbdistributorselectorcomponent.cpp b/src/blackgui/components/dbdistributorselectorcomponent.cpp index e71dbf856..dca2598bd 100644 --- a/src/blackgui/components/dbdistributorselectorcomponent.cpp +++ b/src/blackgui/components/dbdistributorselectorcomponent.cpp @@ -7,13 +7,28 @@ * contained in the LICENSE file. */ -#include "dbdistributorselectorcomponent.h" -#include "ui_dbdistributorselectorcomponent.h" +#include "blackcore/application.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbdistributorselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "blackmisc/compare.h" #include "blackmisc/simulation/distributorlist.h" -#include +#include "blackmisc/variant.h" +#include "ui_dbdistributorselectorcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/dbdistributorselectorcomponent.h b/src/blackgui/components/dbdistributorselectorcomponent.h index f190438e0..442c324e1 100644 --- a/src/blackgui/components/dbdistributorselectorcomponent.h +++ b/src/blackgui/components/dbdistributorselectorcomponent.h @@ -16,9 +16,19 @@ #include "blackgui/dropbase.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/simulation/distributor.h" + #include +#include +#include #include -#include +#include + +class QCompleter; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QWidget; namespace Ui { class CDbDistributorSelectorComponent; } diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index 097fa15b1..7bcdc05bc 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -7,11 +7,15 @@ * contained in the LICENSE file. */ -#include "ui_dbliverycomponent.h" -#include "dbliverycomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/webdataservices.h" -#include +#include "blackgui/components/dbliverycomponent.h" +#include "blackgui/filters/liveryfilterbar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/liveryview.h" +#include "dbliverycomponent.h" +#include "ui_dbliverycomponent.h" + +#include using namespace BlackCore; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbliverycomponent.h b/src/blackgui/components/dbliverycomponent.h index 11550cd0e..340caa0bb 100644 --- a/src/blackgui/components/dbliverycomponent.h +++ b/src/blackgui/components/dbliverycomponent.h @@ -13,12 +13,17 @@ #define BLACKGUI_COMPONENTS_DBLIVERYCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" + #include +#include #include +class QWidget; + +namespace BlackMisc { namespace Aviation { class CLivery; } } namespace Ui { class CDbLiveryComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/blackgui/components/dbliveryselectorcomponent.cpp index 9a8ee7d7c..fc5edcfae 100644 --- a/src/blackgui/components/dbliveryselectorcomponent.cpp +++ b/src/blackgui/components/dbliveryselectorcomponent.cpp @@ -7,14 +7,29 @@ * contained in the LICENSE file. */ -#include "dbliveryselectorcomponent.h" -#include "ui_dbliveryselectorcomponent.h" -#include "blackgui/uppercasevalidator.h" -#include "blackgui/guiapplication.h" +#include "blackcore/application.h" #include "blackcore/webdataservices.h" +#include "blackgui/components/dbliveryselectorcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/uppercasevalidator.h" #include "blackmisc/aviation/liverylist.h" +#include "blackmisc/compare.h" #include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" +#include "ui_dbliveryselectorcomponent.h" + +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackCore; diff --git a/src/blackgui/components/dbliveryselectorcomponent.h b/src/blackgui/components/dbliveryselectorcomponent.h index f3e76099b..d04e41bbd 100644 --- a/src/blackgui/components/dbliveryselectorcomponent.h +++ b/src/blackgui/components/dbliveryselectorcomponent.h @@ -13,16 +13,25 @@ #define BLACKGUI_COMPONENTS_CDBLIVERYSELECTORCOMPONENT_H #include "blackgui/blackguiexport.h" +#include "blackgui/dropbase.h" #include "blackmisc/aviation/livery.h" #include "blackmisc/network/entityflags.h" -#include "blackgui/dropbase.h" + #include +#include +#include #include -#include +#include + +class QCompleter; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QWidget; namespace Ui { class CDbLiverySelectorComponent; } - namespace BlackGui { namespace Components diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index ed8446ef2..ecaff328c 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -7,13 +7,25 @@ * contained in the LICENSE file. */ -#include "dblogincomponent.h" -#include "ui_dblogincomponent.h" -#include "blackgui/overlaymessagesframe.h" +#include "blackcore/data/globalsetup.h" +#include "blackgui/components/dblogincomponent.h" #include "blackgui/guiapplication.h" -#include "blackmisc/verify.h" -#include "blackmisc/network/url.h" +#include "blackgui/overlaymessagesframe.h" #include "blackmisc/logmessage.h" +#include "blackmisc/network/authenticateduser.h" +#include "blackmisc/network/url.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/verify.h" +#include "ui_dblogincomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/dblogincomponent.h b/src/blackgui/components/dblogincomponent.h index 04de381d8..fe6332514 100644 --- a/src/blackgui/components/dblogincomponent.h +++ b/src/blackgui/components/dblogincomponent.h @@ -12,12 +12,17 @@ #ifndef BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H #define BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H -#include "blackgui/blackguiexport.h" #include "blackcore/databaseauthentication.h" -#include "blackcore/data/globalsetup.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/statusmessagelist.h" + #include +#include #include +class QWidget; + +namespace BlackMisc { namespace Network { class CAuthenticatedUser; } } namespace Ui { class CDbLoginComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index ede852397..1adfd45ae 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -7,20 +7,47 @@ * contained in the LICENSE file. */ -#include "dbmappingcomponent.h" -#include "ui_dbmappingcomponent.h" +#include "blackcore/webdataservices.h" #include "blackgui/components/dbautostashingcomponent.h" +#include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbmodelmappingmodifycomponent.h" +#include "blackgui/components/dbownmodelscomponent.h" +#include "blackgui/components/dbownmodelsetcomponent.h" +#include "blackgui/components/dbstashcomponent.h" #include "blackgui/components/modelmatchercomponent.h" -#include "blackgui/menus/aircraftmodelmenus.h" +#include "blackgui/editors/aircrafticaoform.h" +#include "blackgui/editors/distributorform.h" +#include "blackgui/editors/liveryform.h" +#include "blackgui/editors/modelmappingform.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackgui/shortcut.h" -#include "blackmisc/simulation/fscommon/aircraftcfgparser.h" -#include "blackmisc/simulation/aircraftmodelutils.h" +#include "blackgui/menus/aircraftmodelmenus.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/icons.h" #include "blackmisc/logmessage.h" -#include -#include +#include "blackmisc/network/authenticateduser.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/aircraftmodelutils.h" +#include "ui_dbmappingcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index 591c2e209..fbbf3b958 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -14,24 +14,48 @@ #include "blackcore/data/authenticateduser.h" #include "blackgui/blackguiexport.h" -#include "blackgui/overlaymessagesframe.h" -#include "blackgui/menus/menudelegate.h" -#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" -#include "blackgui/views/aircraftmodelview.h" -#include "blackmisc/simulation/aircraftmodelloader.h" -#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" -#include "blackmisc/simulation/data/modelcaches.h" -#include "blackmisc/network/entityflags.h" -#include "blackmisc/statusmessagelist.h" +#include "blackgui/enableforviewbasedindicator.h" +#include "blackgui/menus/menudelegate.h" +#include "blackgui/overlaymessagesframe.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/datacache.h" #include "blackmisc/digestsignal.h" -#include -#include +#include "blackmisc/network/entityflags.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" +#include +#include +#include +#include +#include + +class QAction; +class QModelIndex; +class QPoint; +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CAircraftIcaoCode; + class CLivery; + } +} namespace Ui { class CDbMappingComponent; } namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Views { class CAircraftModelView; } + namespace Components { class CDbAutoStashingComponent; @@ -112,7 +136,7 @@ namespace BlackGui BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const; //! Own models for simulator - const Simulation::CSimulatorInfo getOwnModelsSimulator() const; + const BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const; //! Number of own models int getOwnModelsCount() const; diff --git a/src/blackgui/components/dbmappingcomponentaware.cpp b/src/blackgui/components/dbmappingcomponentaware.cpp index f4a09378a..d67cc8026 100644 --- a/src/blackgui/components/dbmappingcomponentaware.cpp +++ b/src/blackgui/components/dbmappingcomponentaware.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "dbmappingcomponent.h" +#include "blackgui/components/dbmappingcomponent.h" +#include "blackgui/components/dbmappingcomponentaware.h" #include "dbmappingcomponentaware.h" +#include + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/dbmappingcomponentaware.h b/src/blackgui/components/dbmappingcomponentaware.h index 6afdf0f9b..337ed51f0 100644 --- a/src/blackgui/components/dbmappingcomponentaware.h +++ b/src/blackgui/components/dbmappingcomponentaware.h @@ -13,7 +13,8 @@ #define BLACKGUI_COMPONENTS_DBMAPPINGCOMPONENTAWARE_H #include "blackgui/blackguiexport.h" -#include + +class QObject; namespace BlackGui { diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp index b8e0a7ff7..40ad610de 100644 --- a/src/blackgui/components/dbmodelcomponent.cpp +++ b/src/blackgui/components/dbmodelcomponent.cpp @@ -7,15 +7,20 @@ * contained in the LICENSE file. */ -#include "dbmodelcomponent.h" -#include "dbmappingcomponent.h" -#include "blackgui/guiapplication.h" -#include "blackgui/stylesheetutility.h" -#include "blackgui/shortcut.h" +#include "blackcore/application.h" #include "blackcore/webdataservices.h" +#include "blackgui/components/dbmodelcomponent.h" +#include "blackgui/filters/aircraftmodelfilterbar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/viewbase.h" #include "blackmisc/simulation/aircraftmodel.h" #include "ui_dbmodelcomponent.h" -#include + +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbmodelcomponent.h b/src/blackgui/components/dbmodelcomponent.h index d65718477..1d6a37a8e 100644 --- a/src/blackgui/components/dbmodelcomponent.h +++ b/src/blackgui/components/dbmodelcomponent.h @@ -13,14 +13,19 @@ #define BLACKUI_COMPONENTS_DBMODELCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/enableforviewbasedindicator.h" -#include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/dbmappingcomponentaware.h" -#include "blackgui/menus/menudelegate.h" +#include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackmisc/network/entityflags.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" + #include +#include #include +class QWidget; + namespace Ui { class CDbModelComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbmodelmappingmodifycomponent.cpp b/src/blackgui/components/dbmodelmappingmodifycomponent.cpp index af4eba53c..a6493e552 100644 --- a/src/blackgui/components/dbmodelmappingmodifycomponent.cpp +++ b/src/blackgui/components/dbmodelmappingmodifycomponent.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "dbmodelmappingmodifycomponent.h" +#include "blackgui/components/dbmodelmappingmodifycomponent.h" +#include "blackgui/editors/modelmappingmodifyform.h" #include "ui_dbmodelmappingmodifycomponent.h" -#include "dbmappingcomponent.h" + +#include using namespace BlackMisc; diff --git a/src/blackgui/components/dbmodelmappingmodifycomponent.h b/src/blackgui/components/dbmodelmappingmodifycomponent.h index 9b041c1a6..b7fb73862 100644 --- a/src/blackgui/components/dbmodelmappingmodifycomponent.h +++ b/src/blackgui/components/dbmodelmappingmodifycomponent.h @@ -13,12 +13,16 @@ #define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackmisc/simulation/aircraftmodel.h" +#include "blackgui/components/dbmappingcomponentaware.h" #include "blackmisc/propertyindexvariantmap.h" -#include "dbmappingcomponentaware.h" + #include +#include #include +class QWidget; + +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace Ui { class CDbModelMappingModifyComponent; } namespace BlackGui diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 1ec7f460d..9734a4912 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -7,15 +7,22 @@ * contained in the LICENSE file. */ -#include "dbownmodelscomponent.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/dbownmodelscomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/menus/aircraftmodelmenus.h" -#include "blackcore/webdataservices.h" -#include "blackmisc/statusmessage.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackmisc/icons.h" #include "blackmisc/logmessage.h" -#include "blackmisc/verify.h" +#include "blackmisc/statusmessage.h" #include "ui_dbownmodelscomponent.h" +#include +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackGui::Menus; diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h index 2f5fce2f2..d659d1630 100644 --- a/src/blackgui/components/dbownmodelscomponent.h +++ b/src/blackgui/components/dbownmodelscomponent.h @@ -12,16 +12,33 @@ #ifndef BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H #define BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H -#include "blackgui/models/aircraftmodellistmodel.h" #include "blackgui/menus/menudelegate.h" +#include "blackmisc/datacache.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelloader.h" +#include "blackmisc/simulation/data/modelcaches.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" + #include +#include +#include #include +#include +#include + +class QAction; +class QWidget; namespace Ui { class CDbOwnModelsComponent; } + namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Models { class CAircraftModelListModel; } namespace Views { class CAircraftModelView; } + namespace Components { /*! @@ -87,7 +104,7 @@ namespace BlackGui BlackMisc::CData m_simulatorSelection {this }; //!< last selection //! Init model loader - bool initModelLoader(const Simulation::CSimulatorInfo &simulator); + bool initModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simulator); //! File name for savinf void setSaveFileName(const BlackMisc::Simulation::CSimulatorInfo &sim); diff --git a/src/blackgui/components/dbownmodelsetcomponent.cpp b/src/blackgui/components/dbownmodelsetcomponent.cpp index dc99804f5..8ad5a7302 100644 --- a/src/blackgui/components/dbownmodelsetcomponent.cpp +++ b/src/blackgui/components/dbownmodelsetcomponent.cpp @@ -7,16 +7,35 @@ * contained in the LICENSE file. */ -#include "dbownmodelsetcomponent.h" -#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/components/dbmappingcomponent.h" +#include "blackgui/components/dbownmodelsetcomponent.h" +#include "blackgui/components/dbownmodelsetdialog.h" #include "blackgui/menus/aircraftmodelmenus.h" -#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/compare.h" +#include "blackmisc/icons.h" #include "blackmisc/logmessage.h" -#include "blackmisc/verify.h" -#include "dbmappingcomponent.h" -#include "dbownmodelsetdialog.h" +#include "blackmisc/orderable.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/distributorlistpreferences.h" #include "ui_dbownmodelsetcomponent.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackGui::Models; diff --git a/src/blackgui/components/dbownmodelsetcomponent.h b/src/blackgui/components/dbownmodelsetcomponent.h index 94c108ebd..fd5474b41 100644 --- a/src/blackgui/components/dbownmodelsetcomponent.h +++ b/src/blackgui/components/dbownmodelsetcomponent.h @@ -12,22 +12,35 @@ #ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H #define BLACKGUI_COMPONENTS_DBOWNMODELSETCOMPONENT_H -#include "blackgui/menus/menudelegate.h" #include "blackcore/settings/distributorpreferences.h" +#include "blackgui/components/dbmappingcomponentaware.h" +#include "blackgui/menus/menudelegate.h" +#include "blackmisc/settingscache.h" +#include "blackmisc/simulation/aircraftmodelinterfaces.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelsetloader.h" -#include "dbmappingcomponentaware.h" -#include -#include -#include +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" +#include +#include +#include +#include + +class QAction; +class QWidget; + +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace Ui { class CDbOwnModelSetComponent; } namespace BlackGui { + namespace Menus { class CMenuActions; } namespace Views { class CAircraftModelView; } + namespace Components { + class CDbMappingComponent; class CDbOwnModelSetDialog; /*! @@ -67,7 +80,7 @@ namespace BlackGui const BlackMisc::Simulation::CAircraftModelList &getModelSet() const; //! Model set is for simulator - const Simulation::CSimulatorInfo getModelSetSimulator() const; + const BlackMisc::Simulation::CSimulatorInfo getModelSetSimulator() const; //! \copydoc CDbMappingComponentAware::setMappingComponent virtual void setMappingComponent(CDbMappingComponent *component) override; diff --git a/src/blackgui/components/dbownmodelsetdialog.cpp b/src/blackgui/components/dbownmodelsetdialog.cpp index 95f3b8d13..2f3acfa2c 100644 --- a/src/blackgui/components/dbownmodelsetdialog.cpp +++ b/src/blackgui/components/dbownmodelsetdialog.cpp @@ -7,11 +7,19 @@ * contained in the LICENSE file. */ -#include "dbownmodelsetdialog.h" -#include "ui_dbownmodelsetdialog.h" -#include "blackgui/components/dbmappingcomponent.h" #include "blackcore/modelsetbuilder.h" +#include "blackgui/components/dbmappingcomponent.h" +#include "blackgui/components/dbownmodelsetdialog.h" +#include "blackgui/editors/ownmodelsetform.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" #include "blackmisc/simulation/distributorlist.h" +#include "ui_dbownmodelsetdialog.h" + +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/dbownmodelsetdialog.h b/src/blackgui/components/dbownmodelsetdialog.h index 9b04cb1cd..b272af4e0 100644 --- a/src/blackgui/components/dbownmodelsetdialog.h +++ b/src/blackgui/components/dbownmodelsetdialog.h @@ -12,13 +12,17 @@ #ifndef BLACKGUI_COMPONENTS_DBOWNMODELSETDIALOG_H #define BLACKGUI_COMPONENTS_DBOWNMODELSETDIALOG_H +#include "blackgui/components/dbmappingcomponentaware.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/simulatorinfo.h" + #include +#include #include -#include "blackmisc/logcategorylist.h" -#include "blackmisc/simulation/aircraftmodellist.h" -#include "blackgui/components/dbmappingcomponentaware.h" +class QWidget; +namespace BlackMisc { class CLogCategoryList; } namespace Ui { class CDbOwnModelSetDialog; } namespace BlackGui diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 09ee02813..99e38567d 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -7,15 +7,32 @@ * contained in the LICENSE file. */ -#include "dbstashcomponent.h" -#include "dbmappingcomponent.h" -#include "ui_dbstashcomponent.h" -#include "blackgui/guiapplication.h" -#include "blackgui/views/aircraftmodelview.h" +#include "blackcore/application.h" #include "blackcore/databasewriter.h" #include "blackcore/webdataservices.h" -#include "blackmisc/icons.h" +#include "blackgui/components/dbmappingcomponent.h" +#include "blackgui/components/dbstashcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/sequence.h" #include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/verify.h" +#include "ui_dbstashcomponent.h" + +#include +#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h index 1e9bbbb7d..74d7b68f6 100644 --- a/src/blackgui/components/dbstashcomponent.h +++ b/src/blackgui/components/dbstashcomponent.h @@ -12,19 +12,42 @@ #ifndef BLACKGUI_COMPONENTS_DBSTASHCOMPONENT_H #define BLACKGUI_COMPONENTS_DBSTASHCOMPONENT_H -#include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/blackguiexport.h" #include "blackgui/components/dbmappingcomponentaware.h" -#include "blackgui/menus/menudelegate.h" -#include "blackmisc/verify.h" -#include -#include -#include +#include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" +#include +#include +#include +#include +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + class CLogCategoryList; + namespace Aviation + { + class CAircraftIcaoCode; + class CLivery; + } +} namespace Ui { class CDbStashComponent; } namespace BlackGui { namespace Views { class CAircraftModelView; } + namespace Components { /*! @@ -75,7 +98,7 @@ namespace BlackGui const BlackMisc::Simulation::CAircraftModelList &getStashedModels() const; //! Model for model string - Simulation::CAircraftModel getStashedModel(const QString &modelString) const; + BlackMisc::Simulation::CAircraftModel getStashedModel(const QString &modelString) const; //! Apply livery to selected objects void applyToSelected(const BlackMisc::Aviation::CLivery &livery, bool acceptWarnings = true); diff --git a/src/blackgui/components/distributorpreferencescomponent.cpp b/src/blackgui/components/distributorpreferencescomponent.cpp index f7fd9084e..888d7568e 100644 --- a/src/blackgui/components/distributorpreferencescomponent.cpp +++ b/src/blackgui/components/distributorpreferencescomponent.cpp @@ -7,13 +7,28 @@ * contained in the LICENSE file. */ -#include "distributorpreferencescomponent.h" -#include "ui_distributorpreferencescomponent.h" -#include "blackgui/overlaymessagesframe.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/distributorpreferencescomponent.h" +#include "blackgui/components/simulatorselector.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/webdataservices.h" +#include "blackgui/models/distributorlistmodel.h" +#include "blackgui/overlaymessagesframe.h" +#include "blackgui/views/distributorview.h" +#include "blackgui/views/viewbase.h" #include "blackmisc/logmessage.h" +#include "blackmisc/orderable.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlistpreferences.h" +#include "blackmisc/statusmessage.h" +#include "ui_distributorpreferencescomponent.h" + +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/distributorpreferencescomponent.h b/src/blackgui/components/distributorpreferencescomponent.h index 708e7d237..08bc37f55 100644 --- a/src/blackgui/components/distributorpreferencescomponent.h +++ b/src/blackgui/components/distributorpreferencescomponent.h @@ -13,14 +13,23 @@ #define BLACKGUI_COMPONENTS_DISTRIBUTORPREFERENCESCOMPONENT_H #include "blackcore/settings/distributorpreferences.h" +#include "blackmisc/settingscache.h" #include "blackmisc/simulation/aircraftmodelsetloader.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfo.h" + #include +#include #include +class QWidget; + namespace Ui { class CDistributorPreferencesComponent; } + namespace BlackGui { class COverlayMessagesFrame; + namespace Components { /*! diff --git a/src/blackgui/components/enablefordockwidgetinfoarea.cpp b/src/blackgui/components/enablefordockwidgetinfoarea.cpp index 0f69e7cca..f805594df 100644 --- a/src/blackgui/components/enablefordockwidgetinfoarea.cpp +++ b/src/blackgui/components/enablefordockwidgetinfoarea.cpp @@ -7,9 +7,16 @@ * contained in the LICENSE file. */ -#include "enablefordockwidgetinfoarea.h" +#include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/enableforframelesswindow.h" #include "blackgui/guiutility.h" +#include "blackgui/infoarea.h" + #include +#include +#include +#include using namespace BlackGui; diff --git a/src/blackgui/components/enablefordockwidgetinfoarea.h b/src/blackgui/components/enablefordockwidgetinfoarea.h index fa1dbb5ae..8cab47be0 100644 --- a/src/blackgui/components/enablefordockwidgetinfoarea.h +++ b/src/blackgui/components/enablefordockwidgetinfoarea.h @@ -13,14 +13,16 @@ #define BLACKGUI_ENABLEFORDOCKWIDGETINFOAREA_H #include "blackgui/blackguiexport.h" -#include "blackgui/dockwidgetinfoarea.h" -#include "blackgui/infoarea.h" -#include "blackgui/enableforframelesswindow.h" #include "blackmisc/connectionguard.h" -#include + +class QWidget; namespace BlackGui { + class CDockWidgetInfoArea; + class CEnableForFramelessWindow; + class CInfoArea; + namespace Components { //! Helper class: If a component is residing in an dockable widget. diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 9ca50e4db..6590117b2 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -7,13 +7,36 @@ * contained in the LICENSE file. */ -#include "flightplancomponent.h" -#include "blackgui/stylesheetutility.h" -#include "blackgui/guiapplication.h" -#include "ui_flightplancomponent.h" -#include "blackmisc/logmessage.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextownaircraft.h" +#include "blackgui/components/flightplancomponent.h" +#include "blackgui/components/selcalcodeselector.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/network/user.h" +#include "blackmisc/pq/pqstring.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/statusmessage.h" +#include "ui_flightplancomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index e0a27ced9..db0d71c00 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -13,13 +13,21 @@ #define BLACKGUI_FLIGHTPLANCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackmisc/identifier.h" #include "blackmisc/aviation/flightplan.h" -#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/identifier.h" +#include "blackmisc/statusmessagelist.h" +#include +#include +#include #include +#include +class QWidget; + +namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } } namespace Ui { class CFlightPlanComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index 24254b294..642b0284e 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -1,11 +1,33 @@ -#include "hotkeydialog.h" -#include "ui_hotkeydialog.h" +#include "blackcore/inputmanager.h" +#include "blackgui/components/hotkeydialog.h" #include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" +#include "blackmisc/icons.h" +#include "blackmisc/identifier.h" #include "blackmisc/input/hotkeycombination.h" -#include "blackmisc/icon.h" +#include "blackmisc/input/keyboardkey.h" +#include "blackmisc/input/keyboardkeylist.h" #include "blackmisc/logmessage.h" -#include -#include +#include "blackmisc/statusmessage.h" +#include "ui_hotkeydialog.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Input; diff --git a/src/blackgui/components/hotkeydialog.h b/src/blackgui/components/hotkeydialog.h index 36665828b..8649dbf5b 100644 --- a/src/blackgui/components/hotkeydialog.h +++ b/src/blackgui/components/hotkeydialog.h @@ -14,14 +14,19 @@ #include "blackgui/blackguiexport.h" #include "blackgui/models/actionmodel.h" -#include "blackcore/inputmanager.h" -#include "blackmisc/input/hotkeycombination.h" -#include "blackmisc/input/actionhotkeylist.h" #include "blackmisc/identifierlist.h" -#include -#include -#include +#include "blackmisc/input/actionhotkey.h" +#include +#include +#include +#include + +class QItemSelection; +class QWidget; + +namespace BlackCore { class CInputManager; } +namespace BlackMisc { namespace Input { class CHotkeyCombination; } } namespace Ui { class CHotkeyDialog; } namespace BlackGui diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index 3bc26d7c2..6850b6483 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -7,21 +7,27 @@ * contained in the LICENSE file. */ -#include "infobarstatuscomponent.h" -#include "ui_infobarstatuscomponent.h" -#include "blackgui/guiapplication.h" -#include "blackcore/contextsimulator.h" -#include "blackcore/contextnetwork.h" #include "blackcore/contextapplication.h" #include "blackcore/contextaudio.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextsimulator.h" #include "blackcore/simulator.h" +#include "blackgui/components/infobarstatuscomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/led.h" #include "blackmisc/audio/audioutils.h" #include "blackmisc/buildconfig.h" -#include "blackmisc/icons.h" +#include "blackmisc/network/server.h" +#include "blackmisc/simulation/simulatorplugininfo.h" +#include "ui_infobarstatuscomponent.h" -#include +#include +#include #include -#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackGui; diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h index cee8aa7b8..fa1e6c808 100644 --- a/src/blackgui/components/infobarstatuscomponent.h +++ b/src/blackgui/components/infobarstatuscomponent.h @@ -12,13 +12,19 @@ #ifndef BLACKGUI_INFOBARSTATUSCOMPONENT_H #define BLACKGUI_INFOBARSTATUSCOMPONENT_H -#include "blackgui/blackguiexport.h" #include "blackcore/network.h" -#include "../led.h" +#include "blackgui/blackguiexport.h" + #include +#include #include +#include + +class QPoint; +class QWidget; namespace Ui { class CInfoBarStatusComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp b/src/blackgui/components/infobarwebreadersstatuscomponent.cpp index 412fcc2b3..a03b4bbaf 100644 --- a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp +++ b/src/blackgui/components/infobarwebreadersstatuscomponent.cpp @@ -7,13 +7,14 @@ * contained in the LICENSE file. */ -#include "infobarwebreadersstatuscomponent.h" -#include "ui_infobarwebreadersstatuscomponent.h" -#include "blackgui/guiapplication.h" -#include "blackcore/webreaderflags.h" #include "blackcore/webdataservices.h" -#include "blackmisc/icons.h" +#include "blackgui/components/infobarwebreadersstatuscomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/led.h" #include "blackmisc/verify.h" +#include "ui_infobarwebreadersstatuscomponent.h" + +#include using namespace BlackGui; using namespace BlackMisc; diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.h b/src/blackgui/components/infobarwebreadersstatuscomponent.h index 62efeb250..11bfa13c9 100644 --- a/src/blackgui/components/infobarwebreadersstatuscomponent.h +++ b/src/blackgui/components/infobarwebreadersstatuscomponent.h @@ -13,15 +13,22 @@ #define BLACKGUI_INFOBARWEBREADERSSTATUSCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackgui/led.h" #include "blackmisc/network/entityflags.h" + #include +#include +#include #include #include +class QWidget; + namespace Ui { class CInfoBarWebReadersStatusComponent; } + namespace BlackGui { + class CLedWidget; + namespace Components { //! Info bar displaying status of web readers(swift DB, ...) diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 5f14b5cad..afea49cff 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/src/blackgui/components/internalscomponent.cpp @@ -7,11 +7,30 @@ * contained in the LICENSE file. */ -#include "internalscomponent.h" -#include "ui_internalscomponent.h" +#include "blackcore/contextapplication.h" +#include "blackcore/contextaudio.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" +#include "blackcore/contextsimulator.h" +#include "blackgui/components/internalscomponent.h" +#include "blackgui/components/remoteaircraftselector.h" #include "blackgui/guiapplication.h" -#include "blackcore/contextallinterfaces.h" +#include "blackmisc/aviation/aircraftenginelist.h" +#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/statusmessage.h" +#include "ui_internalscomponent.h" + +#include +#include #include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/internalscomponent.h b/src/blackgui/components/internalscomponent.h index 628f2d339..35a91bae1 100644 --- a/src/blackgui/components/internalscomponent.h +++ b/src/blackgui/components/internalscomponent.h @@ -14,8 +14,12 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/aviation/aircraftparts.h" + +#include +#include #include -#include + +class QShowEvent; namespace Ui { class CInternalsComponent; } diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index 4168f1f65..d13276f94 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -7,9 +7,19 @@ * contained in the LICENSE file. */ -#include "logcomponent.h" +#include "blackgui/components/logcomponent.h" +#include "blackgui/components/statusmessageform.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/views/statusmessageview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/icons.h" #include "ui_logcomponent.h" -#include "../stylesheetutility.h" + +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackGui; diff --git a/src/blackgui/components/logcomponent.h b/src/blackgui/components/logcomponent.h index acdfe8630..2f93478a3 100644 --- a/src/blackgui/components/logcomponent.h +++ b/src/blackgui/components/logcomponent.h @@ -13,16 +13,26 @@ #define BLACKGUI_LOGCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackmisc/statusmessagelist.h" #include "blackgui/menus/menudelegate.h" -#include +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" + #include +#include +#include #include +#include + +class QAction; +class QPoint; +class QWidget; namespace Ui { class CLogComponent; } namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Components { //! Text edit for our log component diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 65d22b983..d4f17cb20 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -7,19 +7,43 @@ * contained in the LICENSE file. */ -#include "logincomponent.h" -#include "ui_logincomponent.h" -#include "blackgui/uppercasevalidator.h" -#include "blackgui/guiapplication.h" +#include "blackcore/contextaudio.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextownaircraft.h" -#include "blackcore/contextaudio.h" #include "blackcore/contextsimulator.h" +#include "blackcore/data/globalsetup.h" #include "blackcore/network.h" #include "blackcore/simulator.h" -#include "blackmisc/logmessage.h" +#include "blackgui/components/logincomponent.h" +#include "blackgui/components/serverform.h" +#include "blackgui/components/serverlistselector.h" +#include "blackgui/guiapplication.h" +#include "blackgui/loginmodebuttons.h" +#include "blackgui/ticklabel.h" +#include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airporticaocode.h" #include "blackmisc/buildconfig.h" +#include "blackmisc/icons.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/statusmessage.h" +#include "ui_logincomponent.h" + +#include +#include #include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index ad9237a09..3fcdc4452 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -12,15 +12,31 @@ #ifndef BLACKGUI_LOGINCOMPONENT_H #define BLACKGUI_LOGINCOMPONENT_H -#include "blackgui/blackguiexport.h" -#include "blackcore/data/globalsetup.h" #include "blackcore/settings/network.h" -#include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/network/server.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/network/entityflags.h" -#include -#include +#include "blackmisc/network/server.h" +#include "blackmisc/network/user.h" +#include "blackmisc/settingscache.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include +#include +#include +#include + +class QTimer; +class QWidget; + +namespace BlackMisc +{ + namespace Simulation + { + class CAircraftModel; + class CSimulatedAircraft; + } +} namespace Ui { class CLoginComponent; } namespace BlackGui diff --git a/src/blackgui/components/maininfoareacomponent.cpp b/src/blackgui/components/maininfoareacomponent.cpp index b8bc12254..6b4c7e31d 100644 --- a/src/blackgui/components/maininfoareacomponent.cpp +++ b/src/blackgui/components/maininfoareacomponent.cpp @@ -7,12 +7,13 @@ * contained in the LICENSE file. */ -#include "maininfoareacomponent.h" -#include "ui_maininfoareacomponent.h" -#include "allmaininfoareacomponents.h" -#include "../stylesheetutility.h" -#include "../guiutility.h" +#include "blackgui/components/logcomponent.h" +#include "blackgui/components/maininfoareacomponent.h" +#include "blackgui/components/settingscomponent.h" #include "blackmisc/icons.h" +#include "ui_maininfoareacomponent.h" + +#include using namespace BlackMisc; using namespace BlackGui; diff --git a/src/blackgui/components/maininfoareacomponent.h b/src/blackgui/components/maininfoareacomponent.h index a164befd8..397c3206e 100644 --- a/src/blackgui/components/maininfoareacomponent.h +++ b/src/blackgui/components/maininfoareacomponent.h @@ -13,27 +13,32 @@ #define BLACKGUI_MAININFOAREACOMPONENT_H #include "blackgui/blackguiexport.h" -#include "../infoarea.h" -#include -#include +#include "blackgui/infoarea.h" + +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CMainInfoAreaComponent; } + namespace BlackGui { namespace Components { + class CAircraftComponent; + class CAtcStationComponent; // forward declaration to break compile dependency from all components class CCockpitComponent; - class CAtcStationComponent; - class CAircraftComponent; - class CMappingComponent; - class CUserComponent; class CFlightPlanComponent; - class CSettingsComponent; class CLogComponent; + class CMappingComponent; + class CSettingsComponent; class CSimulatorComponent; class CTextMessageComponent; + class CUserComponent; //! Main info area diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index fd7111999..49d404bee 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -7,12 +7,19 @@ * contained in the LICENSE file. */ -#include "mainkeypadareacomponent.h" -#include "ui_mainkeypadareacomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextaudio.h" #include "blackcore/contextnetwork.h" #include "blackcore/contextownaircraft.h" +#include "blackcore/corefacade.h" +#include "blackgui/components/mainkeypadareacomponent.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "ui_mainkeypadareacomponent.h" + +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index 2a0f531a4..c45e199f1 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -12,17 +12,23 @@ #ifndef BLACKGUI_MAINKEYPADAREACOMPONENT_H #define BLACKGUI_MAINKEYPADAREACOMPONENT_H -#include "blackgui/blackguiexport.h" -#include "maininfoareacomponent.h" #include "blackcore/network.h" +#include "blackgui/blackguiexport.h" +#include "blackgui/components/maininfoareacomponent.h" #include "blackmisc/identifier.h" #include -#include -#include #include +#include +#include +#include +class QPushButton; +class QWidget; + +namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } } namespace Ui { class CMainKeypadAreaComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index 83852dc8f..3628c688f 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -7,20 +7,40 @@ * contained in the LICENSE file. */ -#include "blackgui/views/aircraftmodelview.h" -#include "blackgui/filters/aircraftmodelfilterdialog.h" -#include "blackgui/models/aircraftmodellistmodel.h" -#include "blackgui/guiutility.h" -#include "blackgui/guiapplication.h" -#include "blackcore/contextsimulator.h" #include "blackcore/contextnetwork.h" +#include "blackcore/contextsimulator.h" #include "blackcore/network.h" -#include "blackmisc/propertyindexlist.h" +#include "blackgui/components/mappingcomponent.h" +#include "blackgui/components/updatetimer.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/models/simulatedaircraftlistmodel.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/checkboxdelegate.h" +#include "blackgui/views/simulatedaircraftview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/icons.h" #include "blackmisc/logmessage.h" #include "blackmisc/pixmap.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/statusmessage.h" #include "mappingcomponent.h" #include "ui_mappingcomponent.h" + +#include +#include +#include +#include +#include +#include #include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index c69bd8068..b51a8f529 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -12,24 +12,39 @@ #ifndef BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H #define BLACKGUI_COMPONENTS_MAPPINGCOMPONENT_H +#include "blackcore/network.h" #include "blackgui/blackguiexport.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" -#include "blackgui/components/updatetimer.h" -#include "blackgui/views/checkboxdelegate.h" -#include "blackcore/network.h" #include "blackmisc/identifier.h" -#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/simulation/aircraftmodellist.h" -#include -#include -#include +#include "blackmisc/variant.h" +#include +#include +#include +#include +#include + +class QCompleter; +class QModelIndex; +class QWidget; + +namespace BlackMisc +{ + namespace Aviation { class CCallsign; } + namespace Simulation { class CSimulatedAircraft; } +} namespace Ui { class CMappingComponent; } namespace BlackGui { + namespace Views { class CCheckBoxDelegate; } + namespace Components { + class CUpdateTimer; + //! Mappings, models etc. class BLACKGUI_EXPORT CMappingComponent : public QFrame, diff --git a/src/blackgui/components/modelmatchercomponent.cpp b/src/blackgui/components/modelmatchercomponent.cpp index b6dd4e295..eb1d3541c 100644 --- a/src/blackgui/components/modelmatchercomponent.cpp +++ b/src/blackgui/components/modelmatchercomponent.cpp @@ -7,12 +7,36 @@ * contained in the LICENSE file. */ -#include "modelmatchercomponent.h" -#include "guiapplication.h" -#include "guiutility.h" -#include "uppercasevalidator.h" +#include "blackcore/webdataservices.h" +#include "blackgui/components/aircraftcombinedtypeselector.h" +#include "blackgui/components/dbaircrafticaoselectorcomponent.h" +#include "blackgui/components/dbairlineicaoselectorcomponent.h" +#include "blackgui/components/dbliveryselectorcomponent.h" +#include "blackgui/components/modelmatchercomponent.h" +#include "blackgui/components/simulatorselector.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/models/statusmessagelistmodel.h" +#include "blackgui/uppercasevalidator.h" +#include "blackgui/views/statusmessageview.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/network/user.h" +#include "blackmisc/statusmessagelist.h" #include "ui_modelmatchercomponent.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/modelmatchercomponent.h b/src/blackgui/components/modelmatchercomponent.h index 3a938b09d..36b4932cc 100644 --- a/src/blackgui/components/modelmatchercomponent.h +++ b/src/blackgui/components/modelmatchercomponent.h @@ -12,15 +12,20 @@ #ifndef BLACKGUI_COMPONENT_MODELMATCHERCOMPONENT_H #define BLACKGUI_COMPONENT_MODELMATCHERCOMPONENT_H -#include "blackgui/blackguiexport.h" #include "blackcore/aircraftmatcher.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/network/entityflags.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodelsetloader.h" #include "blackmisc/simulation/simulatedaircraft.h" -#include "blackmisc/network/entityflags.h" +#include "blackmisc/simulation/simulatorinfo.h" #include +#include #include +class QWidget; + namespace Ui { class CModelMatcherComponent; } namespace BlackGui diff --git a/src/blackgui/components/modelmodeselector.cpp b/src/blackgui/components/modelmodeselector.cpp index 82a097b76..e7739f948 100644 --- a/src/blackgui/components/modelmodeselector.cpp +++ b/src/blackgui/components/modelmodeselector.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "modelmodeselector.h" +#include "blackgui/components/modelmodeselector.h" #include "ui_modelmodeselector.h" +#include + using namespace BlackMisc::Simulation; namespace BlackGui diff --git a/src/blackgui/components/modelmodeselector.h b/src/blackgui/components/modelmodeselector.h index aae07d911..12201ca01 100644 --- a/src/blackgui/components/modelmodeselector.h +++ b/src/blackgui/components/modelmodeselector.h @@ -12,11 +12,15 @@ #ifndef BLACKGUI_COMPONENTS_MODELMODESELECTOR_H #define BLACKGUI_COMPONENTS_MODELMODESELECTOR_H -#include "blackguiexport.h" +#include "blackgui/blackguiexport.h" #include "blackmisc/simulation/aircraftmodel.h" + #include +#include #include +class QWidget; + namespace Ui { class CModelModeSelector; } namespace BlackGui diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp index c0323c199..072918490 100644 --- a/src/blackgui/components/navigatordialog.cpp +++ b/src/blackgui/components/navigatordialog.cpp @@ -7,14 +7,28 @@ * contained in the LICENSE file. */ -#include "navigatordialog.h" -#include "ui_navigatordialog.h" -#include "blackgui/guiutility.h" +#include "blackgui/components/navigatordialog.h" #include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" #include "blackgui/stylesheetutility.h" -#include -#include +#include "blackmisc/icons.h" +#include "ui_navigatordialog.h" + #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; using namespace BlackMisc; diff --git a/src/blackgui/components/navigatordialog.h b/src/blackgui/components/navigatordialog.h index bd4188416..e2d9cdc94 100644 --- a/src/blackgui/components/navigatordialog.h +++ b/src/blackgui/components/navigatordialog.h @@ -14,10 +14,16 @@ #include "blackgui/blackguiexport.h" #include "blackgui/enableforframelesswindow.h" -#include "blackmisc/icons.h" + #include +#include #include -#include + +class QEvent; +class QMenu; +class QMouseEvent; +class QPoint; +class QWidget; namespace Ui { class CNavigatorDialog; } diff --git a/src/blackgui/components/registercomponent.cpp b/src/blackgui/components/registercomponent.cpp index 3eb59053f..14fb18ffd 100644 --- a/src/blackgui/components/registercomponent.cpp +++ b/src/blackgui/components/registercomponent.cpp @@ -7,10 +7,14 @@ * contained in the LICENSE file. */ -#include "registercomponent.h" -#include "ui_registercomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextapplication.h" +#include "blackgui/components/registercomponent.h" +#include "blackgui/components/updatetimer.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/identifierview.h" +#include "ui_registercomponent.h" + +#include using namespace BlackCore; diff --git a/src/blackgui/components/registercomponent.h b/src/blackgui/components/registercomponent.h index 4fb310442..56b0c4d09 100644 --- a/src/blackgui/components/registercomponent.h +++ b/src/blackgui/components/registercomponent.h @@ -10,8 +10,13 @@ #ifndef BLACKGUI_COMPONENTS_REGISTERCOMPONENT_H #define BLACKGUI_COMPONENTS_REGISTERCOMPONENT_H -#include "blackgui/components/updatetimer.h" +#include "blackgui/blackguiexport.h" + #include +#include +#include + +class QWidget; namespace Ui { class CRegisterComponent; } @@ -19,6 +24,8 @@ namespace BlackGui { namespace Components { + class CUpdateTimer; + //! Register components in the GUI class BLACKGUI_EXPORT CRegisterComponent : public QFrame diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/blackgui/components/remoteaircraftselector.cpp index 7912de890..a02c721e6 100644 --- a/src/blackgui/components/remoteaircraftselector.cpp +++ b/src/blackgui/components/remoteaircraftselector.cpp @@ -7,10 +7,19 @@ * contained in the LICENSE file. */ -#include "remoteaircraftselector.h" -#include "ui_remoteaircraftselector.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextnetwork.h" +#include "blackgui/components/remoteaircraftselector.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/sequence.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "ui_remoteaircraftselector.h" + +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/remoteaircraftselector.h b/src/blackgui/components/remoteaircraftselector.h index b68ec5b06..392a8f7ba 100644 --- a/src/blackgui/components/remoteaircraftselector.h +++ b/src/blackgui/components/remoteaircraftselector.h @@ -16,10 +16,14 @@ #include "blackmisc/aviation/callsign.h" #include "blackmisc/simulation/simulatedaircraftlist.h" - #include +#include #include +class QShowEvent; +class QWidget; + +namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } } namespace Ui { class CRemoteAircraftSelector; } namespace BlackGui diff --git a/src/blackgui/components/selcalcodeselector.cpp b/src/blackgui/components/selcalcodeselector.cpp index c1d8e79a9..1e4b6eace 100644 --- a/src/blackgui/components/selcalcodeselector.cpp +++ b/src/blackgui/components/selcalcodeselector.cpp @@ -7,10 +7,14 @@ * contained in the LICENSE file. */ -#include "selcalcodeselector.h" -#include "ui_selcalcodeselector.h" +#include "blackgui/components/selcalcodeselector.h" +#include "blackgui/ticklabel.h" #include "blackmisc/aviation/selcal.h" -#include "blackmisc/icons.h" +#include "ui_selcalcodeselector.h" + +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/selcalcodeselector.h b/src/blackgui/components/selcalcodeselector.h index 43db717c9..805437710 100644 --- a/src/blackgui/components/selcalcodeselector.h +++ b/src/blackgui/components/selcalcodeselector.h @@ -14,10 +14,15 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/aviation/selcal.h" -#include -#include +#include +#include +#include +#include + +class QWidget; namespace Ui { class CSelcalCodeSelector; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/serverform.cpp b/src/blackgui/components/serverform.cpp index 9658d4daf..ff8948e04 100644 --- a/src/blackgui/components/serverform.cpp +++ b/src/blackgui/components/serverform.cpp @@ -7,9 +7,14 @@ * contained in the LICENSE file. */ -#include "serverform.h" +#include "blackgui/components/serverform.h" +#include "blackmisc/network/user.h" #include "ui_serverform.h" +#include +#include +#include + using namespace BlackMisc::Network; namespace BlackGui diff --git a/src/blackgui/components/serverform.h b/src/blackgui/components/serverform.h index 07d7d3a3d..c633bea44 100644 --- a/src/blackgui/components/serverform.h +++ b/src/blackgui/components/serverform.h @@ -15,8 +15,13 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/network/server.h" #include "blackmisc/statusmessagelist.h" + #include +#include #include +#include + +class QWidget; namespace Ui { class CNetworkServerForm; } diff --git a/src/blackgui/components/serverlistselector.cpp b/src/blackgui/components/serverlistselector.cpp index bbffae078..601746b64 100644 --- a/src/blackgui/components/serverlistselector.cpp +++ b/src/blackgui/components/serverlistselector.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "serverlistselector.h" +#include "blackgui/components/serverlistselector.h" +#include "blackmisc/sequence.h" + +#include using namespace BlackMisc::Network; diff --git a/src/blackgui/components/serverlistselector.h b/src/blackgui/components/serverlistselector.h index 3a1d75471..82b5940a6 100644 --- a/src/blackgui/components/serverlistselector.h +++ b/src/blackgui/components/serverlistselector.h @@ -13,10 +13,14 @@ #define BLACKGUI_COMPONENTS_SERVERLISTSELECTOR_H #include "blackgui/blackguiexport.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/serverlist.h" + #include +#include #include -#include "blackmisc/network/serverlist.h" +class QWidget; namespace BlackGui { diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 124b543cd..dd637d41f 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -7,17 +7,23 @@ * contained in the LICENSE file. */ -#include "settingscomponent.h" -#include "ui_settingscomponent.h" -#include "blackgui/models/atcstationlistmodel.h" -#include "blackgui/stylesheetutility.h" +#include "blackgui/components/audiosetupcomponent.h" +#include "blackgui/components/settingscomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/contextnetwork.h" -#include "blackcore/contextaudio.h" -#include "blackmisc/dbusserver.h" -#include "blackmisc/input/keyboardkeylist.h" +#include "blackgui/stylesheetutility.h" #include "blackmisc/logmessage.h" +#include "ui_settingscomponent.h" + #include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; @@ -26,7 +32,6 @@ using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; using namespace BlackMisc::Audio; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Geo; using namespace BlackMisc::Input; namespace BlackGui diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index 63188ca7f..273b5ed3b 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -13,11 +13,13 @@ #define BLACKGUI_COMPONENTS_SETTINGSCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackmisc/network/server.h" -#include -#include -#include + +#include +#include #include +#include + +class QWidget; namespace Ui { class CSettingsComponent; } diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp index 762aa7e16..2ee0c4442 100644 --- a/src/blackgui/components/settingshotkeycomponent.cpp +++ b/src/blackgui/components/settingshotkeycomponent.cpp @@ -7,12 +7,27 @@ * contained in the LICENSE file. */ -#include "settingshotkeycomponent.h" -#include "ui_settingshotkeycomponent.h" -#include "blackgui/components/hotkeydialog.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextapplication.h" +#include "blackgui/components/hotkeydialog.h" +#include "blackgui/components/settingshotkeycomponent.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/identifier.h" +#include "blackmisc/identifierlist.h" +#include "blackmisc/input/hotkeycombination.h" +#include "ui_settingshotkeycomponent.h" + +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Input; diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/blackgui/components/settingshotkeycomponent.h index d763c6ddb..c3ccbc116 100644 --- a/src/blackgui/components/settingshotkeycomponent.h +++ b/src/blackgui/components/settingshotkeycomponent.h @@ -12,14 +12,21 @@ #ifndef BLACKGUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H #define BLACKGUI_COMPONENTS_SETTINGSHOTKEYCOMPONENT_H -#include "blackgui/models/actionhotkeylistmodel.h" -#include "blackcore/settings/application.h" #include "blackcore/actionbind.h" -#include +#include "blackcore/settings/application.h" +#include "blackgui/blackguiexport.h" +#include "blackgui/models/actionhotkeylistmodel.h" +#include "blackmisc/input/actionhotkey.h" +#include "blackmisc/input/actionhotkeylist.h" +#include "blackmisc/settingscache.h" -namespace Ui { - class CSettingsHotkeyComponent; -} +#include +#include +#include + +class QWidget; + +namespace Ui { class CSettingsHotkeyComponent; } namespace BlackGui { diff --git a/src/blackgui/components/settingsnetworkcomponent.cpp b/src/blackgui/components/settingsnetworkcomponent.cpp index efc78d997..405045919 100644 --- a/src/blackgui/components/settingsnetworkcomponent.cpp +++ b/src/blackgui/components/settingsnetworkcomponent.cpp @@ -7,10 +7,12 @@ * contained in the LICENSE file. */ -#include "settingsnetworkcomponent.h" -#include "ui_settingsnetworkcomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextnetwork.h" +#include "blackgui/components/settingsnetworkcomponent.h" +#include "blackgui/guiapplication.h" +#include "ui_settingsnetworkcomponent.h" + +#include using namespace BlackCore; diff --git a/src/blackgui/components/settingsnetworkcomponent.h b/src/blackgui/components/settingsnetworkcomponent.h index d87dc55d2..bc7715ece 100644 --- a/src/blackgui/components/settingsnetworkcomponent.h +++ b/src/blackgui/components/settingsnetworkcomponent.h @@ -13,7 +13,12 @@ #define BLACKGUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H #include "blackgui/blackguiexport.h" + #include +#include +#include + +class QWidget; namespace Ui { class CSettingsNetworkComponent; } diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index ea87cc823..9b562abbb 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -7,15 +7,23 @@ * contained in the LICENSE file. */ -#include "settingsnetworkserverscomponent.h" -#include "ui_settingsnetworkserverscomponent.h" -#include "blackgui/guiapplication.h" -#include "blackcore/contextnetwork.h" -#include "blackcore/setupreader.h" #include "blackcore/contextapplication.h" -#include "blackmisc/logmessage.h" +#include "blackcore/data/globalsetup.h" +#include "blackgui/components/serverform.h" +#include "blackgui/components/settingsnetworkserverscomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/serverview.h" #include "blackmisc/buildconfig.h" -#include +#include "blackmisc/logmessage.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" +#include "ui_settingsnetworkserverscomponent.h" + +#include +#include +#include using namespace BlackCore; using namespace BlackCore::Data; diff --git a/src/blackgui/components/settingsnetworkserverscomponent.h b/src/blackgui/components/settingsnetworkserverscomponent.h index 00ac26865..13ffc2791 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.h +++ b/src/blackgui/components/settingsnetworkserverscomponent.h @@ -12,12 +12,17 @@ #ifndef BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H #define BLACKGUI_COMPONENTS_SETTINGSNETWORKSERVERSCOMPONENT_H -#include "blackgui/blackguiexport.h" -#include "blackcore/data/globalsetup.h" #include "blackcore/settings/network.h" +#include "blackgui/blackguiexport.h" +#include "blackmisc/settingscache.h" + #include +#include #include +class QModelIndex; +class QWidget; + namespace Ui { class CSettingsNetworkServersComponent; } namespace BlackGui diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index 587175d8c..eaaf94dbc 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -1,18 +1,33 @@ -#include "settingssimulatorcomponent.h" -#include "ui_settingssimulatorcomponent.h" #include "blackcore/contextapplication.h" +#include "blackcore/contextsimulator.h" +#include "blackcore/pluginmanagersimulator.h" +#include "blackgui/components/settingssimulatorcomponent.h" #include "blackgui/guiapplication.h" +#include "blackgui/led.h" +#include "blackgui/pluginconfig.h" #include "blackgui/pluginconfigwindow.h" #include "blackgui/plugindetailswindow.h" -#include "blackcore/contextsimulator.h" -#include "blackcore/contextnetwork.h" -#include "blackgui/pluginconfig.h" -#include "blackmisc/simulation/simulatorplugininfolist.h" -#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackgui/pluginselector.h" +#include "blackmisc/iterator.h" #include "blackmisc/logmessage.h" -#include "blackmisc/variant.h" -#include -#include +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/simulation/simulatorplugininfo.h" +#include "blackmisc/simulation/simulatorplugininfolist.h" +#include "blackmisc/statusmessage.h" +#include "ui_settingssimulatorcomponent.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h index cc007f35a..9d68b757c 100644 --- a/src/blackgui/components/settingssimulatorcomponent.h +++ b/src/blackgui/components/settingssimulatorcomponent.h @@ -10,12 +10,20 @@ #ifndef BLACKGUI_SETTINGSSIMULATORCOMPONENT_H #define BLACKGUI_SETTINGSSIMULATORCOMPONENT_H -#include "blackcore/pluginmanagersimulator.h" #include "blackcore/settings/application.h" #include "blackgui/blackguiexport.h" +#include "blackmisc/settingscache.h" #include "blackmisc/simulation/simulatorplugininfolist.h" -#include +#include +#include +#include +#include + +class QWidget; + +namespace BlackCore { class CPluginManagerSimulator; } +namespace BlackMisc { namespace Simulation { class CSimulatorPluginInfo; } } namespace Ui { class CSettingsSimulatorComponent; } namespace BlackGui diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 5f3faa2a0..afff2c90f 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -7,13 +7,25 @@ * contained in the LICENSE file. */ -#include "simulatorcomponent.h" -#include "ui_simulatorcomponent.h" -#include "blackgui/guiapplication.h" -#include "blackcore/contextsimulator.h" #include "blackcore/contextownaircraft.h" +#include "blackcore/contextsimulator.h" #include "blackcore/simulator.h" +#include "blackgui/components/simulatorcomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/namevariantpairview.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/heading.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" #include "blackmisc/iconlist.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/simulatorplugininfo.h" +#include "ui_simulatorcomponent.h" using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/simulatorcomponent.h b/src/blackgui/components/simulatorcomponent.h index 112d0b94d..673e58194 100644 --- a/src/blackgui/components/simulatorcomponent.h +++ b/src/blackgui/components/simulatorcomponent.h @@ -13,14 +13,21 @@ #define BLACKGUI_SIMULATORCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackmisc/icon.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" +#include "blackmisc/icons.h" -#include +#include #include +#include +#include +#include +class QWidget; + +namespace BlackMisc { class CIcon; } namespace Ui { class CSimulatorComponent; } + namespace BlackGui { namespace Components diff --git a/src/blackgui/components/simulatorselector.cpp b/src/blackgui/components/simulatorselector.cpp index b968a62d8..10300038a 100644 --- a/src/blackgui/components/simulatorselector.cpp +++ b/src/blackgui/components/simulatorselector.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "simulatorselector.h" +#include "blackgui/components/simulatorselector.h" +#include "blackmisc/compare.h" #include "ui_simulatorselector.h" +#include +#include +#include +#include + using namespace BlackMisc::Simulation; namespace BlackGui diff --git a/src/blackgui/components/simulatorselector.h b/src/blackgui/components/simulatorselector.h index 6b4a1070e..4fab3799f 100644 --- a/src/blackgui/components/simulatorselector.h +++ b/src/blackgui/components/simulatorselector.h @@ -12,8 +12,12 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/simulation/simulatorinfo.h" -#include + #include +#include +#include + +class QWidget; namespace Ui { class CSimulatorSelector; } diff --git a/src/blackgui/components/statusmessageform.cpp b/src/blackgui/components/statusmessageform.cpp index e61d14125..f8172245d 100644 --- a/src/blackgui/components/statusmessageform.cpp +++ b/src/blackgui/components/statusmessageform.cpp @@ -7,9 +7,14 @@ * contained in the LICENSE file. */ -#include "statusmessageform.h" +#include "blackgui/components/statusmessageform.h" +#include "blackmisc/logcategorylist.h" #include "ui_statusmessageform.h" + #include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/components/statusmessageform.h b/src/blackgui/components/statusmessageform.h index 638445c4a..da6d83ef8 100644 --- a/src/blackgui/components/statusmessageform.h +++ b/src/blackgui/components/statusmessageform.h @@ -14,7 +14,13 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/variant.h" + #include +#include +#include + +class QWidget; namespace Ui { class CStatusMessageForm; } diff --git a/src/blackgui/components/statusmessageformsmall.cpp b/src/blackgui/components/statusmessageformsmall.cpp index 3bc95fbd6..9c8f86aaa 100644 --- a/src/blackgui/components/statusmessageformsmall.cpp +++ b/src/blackgui/components/statusmessageformsmall.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "statusmessageformsmall.h" +#include "blackgui/components/statusmessageformsmall.h" #include "ui_statusmessageformsmall.h" + #include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/components/statusmessageformsmall.h b/src/blackgui/components/statusmessageformsmall.h index 8ebc541c3..8d31eac2f 100644 --- a/src/blackgui/components/statusmessageformsmall.h +++ b/src/blackgui/components/statusmessageformsmall.h @@ -14,7 +14,13 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/variant.h" + #include +#include +#include + +class QWidget; namespace Ui { class CStatusMessageFormSmall; } diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index e27571314..195808ff5 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -7,18 +7,40 @@ * contained in the LICENSE file. */ -#include "textmessagecomponent.h" -#include "ui_textmessagecomponent.h" -#include "blackgui/guiapplication.h" +#include "blackcore/application.h" #include "blackcore/contextaudio.h" -#include "blackmisc/network/user.h" +#include "blackcore/contextnetwork.h" +#include "blackcore/contextownaircraft.h" +#include "blackcore/corefacade.h" +#include "blackgui/components/textmessagecomponent.h" +#include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/guiapplication.h" +#include "blackgui/textmessagetextedit.h" +#include "blackgui/views/textmessageview.h" +#include "blackgui/views/viewbase.h" #include "blackmisc/audio/notificationsounds.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/compare.h" +#include "blackmisc/iterator.h" #include "blackmisc/logmessage.h" -#include "blackmisc/simplecommandparser.h" -#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/network/user.h" +#include "blackmisc/pq/constants.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/sequence.h" +#include "ui_textmessagecomponent.h" +#include +#include #include -#include +#include +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h index 3ee242462..949099925 100644 --- a/src/blackgui/components/textmessagecomponent.h +++ b/src/blackgui/components/textmessagecomponent.h @@ -14,19 +14,29 @@ #include "blackgui/blackguiexport.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" -#include "blackgui/textmessagetextedit.h" #include "blackmisc/identifier.h" -#include "blackmisc/network/textmessage.h" #include "blackmisc/network/textmessagelist.h" -#include "blackcore/contextnetwork.h" -#include "blackcore/contextownaircraft.h" -#include -#include -#include +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/variant.h" +#include +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation { class CCallsign; } + namespace Network { class CTextMessage; } +} namespace Ui { class CTextMessageComponent; } + namespace BlackGui { + class CDockWidgetInfoArea; + namespace Components { //! Text message widget diff --git a/src/blackgui/components/transpondercodespinbox.cpp b/src/blackgui/components/transpondercodespinbox.cpp index 59e3a7369..0bf808c41 100644 --- a/src/blackgui/components/transpondercodespinbox.cpp +++ b/src/blackgui/components/transpondercodespinbox.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "transpondercodespinbox.h" +#include "blackgui/components/transpondercodespinbox.h" + +#include namespace BlackGui { diff --git a/src/blackgui/components/transpondercodespinbox.h b/src/blackgui/components/transpondercodespinbox.h index fc2a6c143..e48c594a8 100644 --- a/src/blackgui/components/transpondercodespinbox.h +++ b/src/blackgui/components/transpondercodespinbox.h @@ -13,7 +13,12 @@ #define BLACKGUI_COMPONENTS_TRANSPONDERCODESPINBOX_H #include "blackgui/blackguiexport.h" + +#include #include +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/components/transpondermodeselector.cpp b/src/blackgui/components/transpondermodeselector.cpp index 1c716539f..90b77e22b 100644 --- a/src/blackgui/components/transpondermodeselector.cpp +++ b/src/blackgui/components/transpondermodeselector.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "transpondermodeselector.h" +#include "blackgui/components/transpondermodeselector.h" + +#include using namespace BlackMisc::Aviation; diff --git a/src/blackgui/components/transpondermodeselector.h b/src/blackgui/components/transpondermodeselector.h index 84e7fdf4e..ee1e77567 100644 --- a/src/blackgui/components/transpondermodeselector.h +++ b/src/blackgui/components/transpondermodeselector.h @@ -14,10 +14,14 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/aviation/transponder.h" -#include -#include -#include +#include +#include +#include +#include + +class QStringList; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/components/updatetimer.cpp b/src/blackgui/components/updatetimer.cpp index 9616f605b..d458c2729 100644 --- a/src/blackgui/components/updatetimer.cpp +++ b/src/blackgui/components/updatetimer.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "updatetimer.h" +#include "blackgui/components/updatetimer.h" namespace BlackGui { diff --git a/src/blackgui/components/updatetimer.h b/src/blackgui/components/updatetimer.h index 1f947870e..9b5d651e7 100644 --- a/src/blackgui/components/updatetimer.h +++ b/src/blackgui/components/updatetimer.h @@ -13,8 +13,12 @@ #define BLACKGUI_UPDATETIMER_H #include "blackgui/blackguiexport.h" -#include + #include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index a4fbb20fc..6362cb487 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -7,13 +7,17 @@ * contained in the LICENSE file. */ -#include "usercomponent.h" -#include "ui_usercomponent.h" -#include "blackgui/guiutility.h" -#include "blackgui/guiapplication.h" -#include "blackmisc/network/userlist.h" #include "blackcore/contextnetwork.h" #include "blackcore/network.h" +#include "blackgui/components/usercomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/views/clientview.h" +#include "blackgui/views/userview.h" +#include "ui_usercomponent.h" + +#include +#include using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/blackgui/components/usercomponent.h b/src/blackgui/components/usercomponent.h index 2555f989a..c1bb45d90 100644 --- a/src/blackgui/components/usercomponent.h +++ b/src/blackgui/components/usercomponent.h @@ -12,13 +12,17 @@ #ifndef BLACKGUI_USERCOMPONENT_H #define BLACKGUI_USERCOMPONENT_H +#include "blackcore/network.h" #include "blackgui/blackguiexport.h" #include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/updatetimer.h" -#include "blackcore/network.h" -#include -#include + +#include #include +#include +#include + +class QWidget; namespace Ui { class CUserComponent; } diff --git a/src/blackgui/components/voiceroomscomponent.cpp b/src/blackgui/components/voiceroomscomponent.cpp index a1ec98cef..cfa4e1f44 100644 --- a/src/blackgui/components/voiceroomscomponent.cpp +++ b/src/blackgui/components/voiceroomscomponent.cpp @@ -7,12 +7,21 @@ * contained in the LICENSE file. */ -#include "voiceroomscomponent.h" -#include "ui_voiceroomscomponent.h" -#include "blackgui/guiapplication.h" #include "blackcore/contextaudio.h" #include "blackcore/contextownaircraft.h" +#include "blackgui/components/voiceroomscomponent.h" +#include "blackgui/guiapplication.h" +#include "blackgui/views/userview.h" #include "blackmisc/audio/notificationsounds.h" +#include "blackmisc/audio/voiceroom.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/sequence.h" +#include "ui_voiceroomscomponent.h" + +#include +#include +#include +#include using namespace BlackCore; using namespace BlackMisc::Audio; diff --git a/src/blackgui/components/voiceroomscomponent.h b/src/blackgui/components/voiceroomscomponent.h index 902e09355..2c3f62514 100644 --- a/src/blackgui/components/voiceroomscomponent.h +++ b/src/blackgui/components/voiceroomscomponent.h @@ -14,9 +14,13 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/audio/voiceroomlist.h" + #include +#include #include +class QWidget; + namespace Ui { class CVoiceRoomsComponent; } namespace BlackGui diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp index 98c3cf7b4..3ddc63bc2 100644 --- a/src/blackgui/dockwidget.cpp +++ b/src/blackgui/dockwidget.cpp @@ -7,16 +7,28 @@ * contained in the LICENSE file. */ -#include "dockwidget.h" -#include "blackmisc/icons.h" -#include "blackmisc/logmessage.h" -#include "blackgui/stylesheetutility.h" +#include "blackgui/dockwidget.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" +#include "blackgui/stylesheetutility.h" +#include "blackmisc/icons.h" +#include "blackmisc/logmessage.h" + #include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/dockwidget.h b/src/blackgui/dockwidget.h index 64e9d4307..64967fb16 100644 --- a/src/blackgui/dockwidget.h +++ b/src/blackgui/dockwidget.h @@ -12,15 +12,24 @@ #ifndef BLACKGUI_DOCKWIDGET_H #define BLACKGUI_DOCKWIDGET_H -#include "blackguiexport.h" -#include "managedstatusbar.h" -#include "enableforframelesswindow.h" +#include "blackgui/blackguiexport.h" +#include "blackgui/enableforframelesswindow.h" +#include "blackgui/managedstatusbar.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" #include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +class QCloseEvent; +class QMenu; +class QMouseEvent; +class QPaintEvent; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/dockwidgetinfoarea.cpp b/src/blackgui/dockwidgetinfoarea.cpp index a312fc03e..d05b45a17 100644 --- a/src/blackgui/dockwidgetinfoarea.cpp +++ b/src/blackgui/dockwidgetinfoarea.cpp @@ -8,9 +8,13 @@ */ #include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/infoarea.h" -#include "components/enablefordockwidgetinfoarea.h" -#include "blackmisc/icons.h" + +#include +#include +#include +#include using namespace BlackGui::Components; diff --git a/src/blackgui/dockwidgetinfoarea.h b/src/blackgui/dockwidgetinfoarea.h index e02e00eb9..e8ce89a78 100644 --- a/src/blackgui/dockwidgetinfoarea.h +++ b/src/blackgui/dockwidgetinfoarea.h @@ -15,6 +15,12 @@ #include "blackgui/blackguiexport.h" #include "blackgui/dockwidget.h" +#include +#include + +class QMenu; +class QWidget; + namespace BlackGui { //! Forward declarations diff --git a/src/blackgui/dockwidgetinfobar.cpp b/src/blackgui/dockwidgetinfobar.cpp index 1a273516d..cd1454f6e 100644 --- a/src/blackgui/dockwidgetinfobar.cpp +++ b/src/blackgui/dockwidgetinfobar.cpp @@ -7,14 +7,13 @@ * contained in the LICENSE file. */ -#include "guiutility.h" -#include "dockwidgetinfobar.h" -#include "components/maininfoareacomponent.h" -#include "guiapplication.h" -#include "stylesheetutility.h" +#include "blackgui/dockwidgetinfobar.h" +#include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" #include "blackmisc/icons.h" -#include +#include +#include using namespace BlackMisc; using namespace BlackGui::Components; diff --git a/src/blackgui/dockwidgetinfobar.h b/src/blackgui/dockwidgetinfobar.h index 112ed5f50..f3ac5d531 100644 --- a/src/blackgui/dockwidgetinfobar.h +++ b/src/blackgui/dockwidgetinfobar.h @@ -15,6 +15,11 @@ #include "blackgui/blackguiexport.h" #include "blackgui/dockwidget.h" +#include + +class QMenu; +class QWidget; + namespace BlackGui { diff --git a/src/blackgui/dropbase.cpp b/src/blackgui/dropbase.cpp index ccf93adbf..08bea1ce2 100644 --- a/src/blackgui/dropbase.cpp +++ b/src/blackgui/dropbase.cpp @@ -7,8 +7,11 @@ * contained in the LICENSE file. */ -#include "dropbase.h" -#include "guiutility.h" +#include "blackgui/dropbase.h" +#include "blackgui/guiutility.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/dropbase.h b/src/blackgui/dropbase.h index 38c79bc69..abcf43f72 100644 --- a/src/blackgui/dropbase.h +++ b/src/blackgui/dropbase.h @@ -12,8 +12,10 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/variant.h" -#include -#include + +#include + +class QMimeData; namespace BlackGui { diff --git a/src/blackgui/dropsite.cpp b/src/blackgui/dropsite.cpp index f15e2d124..f44c320c2 100644 --- a/src/blackgui/dropsite.cpp +++ b/src/blackgui/dropsite.cpp @@ -7,9 +7,19 @@ * contained in the LICENSE file. */ -#include "dropsite.h" -#include "guiapplication.h" +#include "blackgui/dropsite.h" +#include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" + #include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/dropsite.h b/src/blackgui/dropsite.h index 5aadabc70..5512f943f 100644 --- a/src/blackgui/dropsite.h +++ b/src/blackgui/dropsite.h @@ -11,10 +11,20 @@ #define BLACKGUI_DROPSITE_H #include "blackgui/blackguiexport.h" -#include "blackmisc/variant.h" #include "blackgui/dropbase.h" +#include "blackmisc/variant.h" + #include -#include +#include +#include +#include + +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QDropEvent; +class QPaintEvent; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp index 94444162b..0bd37afe9 100644 --- a/src/blackgui/editors/aircrafticaoform.cpp +++ b/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 +#include +#include +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackGui::Components; diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/blackgui/editors/aircrafticaoform.h index 0176e3a69..e740c4c68 100644 --- a/src/blackgui/editors/aircrafticaoform.h +++ b/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 #include +class QWidget; + namespace Ui { class CAircraftIcaoForm; } namespace BlackGui diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/blackgui/editors/airlineicaoform.cpp index 212ec05cd..941a033b2 100644 --- a/src/blackgui/editors/airlineicaoform.cpp +++ b/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 +#include +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackGui::Components; diff --git a/src/blackgui/editors/airlineicaoform.h b/src/blackgui/editors/airlineicaoform.h index 6472d4b5e..447662900 100644 --- a/src/blackgui/editors/airlineicaoform.h +++ b/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 #include +class QWidget; + namespace Ui { class CAirlineIcaoForm; } namespace BlackGui diff --git a/src/blackgui/editors/distributorform.cpp b/src/blackgui/editors/distributorform.cpp index 50960830b..ff47dc569 100644 --- a/src/blackgui/editors/distributorform.cpp +++ b/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 +#include + using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackGui::Components; diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h index 2e2a107b5..a4b09e640 100644 --- a/src/blackgui/editors/distributorform.h +++ b/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 #include +class QWidget; namespace Ui { class CDistributorForm; } namespace BlackGui diff --git a/src/blackgui/editors/form.cpp b/src/blackgui/editors/form.cpp index 97106a700..ae633fe30 100644 --- a/src/blackgui/editors/form.cpp +++ b/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 { diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h index c7fdceb8b..4fa2ad381 100644 --- a/src/blackgui/editors/form.h +++ b/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 +#include + +class QWidget; + +namespace BlackMisc { namespace Network { class CAuthenticatedUser; } } namespace BlackGui { diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp index db1ce755f..778abc8dc 100644 --- a/src/blackgui/editors/liveryform.cpp +++ b/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 +#include +#include + using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackGui; diff --git a/src/blackgui/editors/liveryform.h b/src/blackgui/editors/liveryform.h index c0f7537f7..de2990912 100644 --- a/src/blackgui/editors/liveryform.h +++ b/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 +#include + +class QWidget; namespace Ui { class CLiveryForm; } diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp index 664fcbbc5..7be7cfade 100644 --- a/src/blackgui/editors/modelmappingform.cpp +++ b/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 +#include + using namespace BlackMisc; using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h index 0e202b60f..6ad614e31 100644 --- a/src/blackgui/editors/modelmappingform.h +++ b/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 #include +class QWidget; + namespace Ui { class CModelMappingForm; } namespace BlackGui diff --git a/src/blackgui/editors/modelmappingmodifyform.cpp b/src/blackgui/editors/modelmappingmodifyform.cpp index ff4affabf..c33f25d6b 100644 --- a/src/blackgui/editors/modelmappingmodifyform.cpp +++ b/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 +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/editors/modelmappingmodifyform.h b/src/blackgui/editors/modelmappingmodifyform.h index 7293dd387..68567dd17 100644 --- a/src/blackgui/editors/modelmappingmodifyform.h +++ b/src/blackgui/editors/modelmappingmodifyform.h @@ -14,12 +14,15 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/propertyindexvariantmap.h" -#include "blackmisc/simulation/aircraftmodel.h" -#include -#include -#include -#include +#include +#include +#include + +class QCheckBox; +class QWidget; + +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace Ui { class CModelMappingModifyForm; } namespace BlackGui diff --git a/src/blackgui/editors/ownmodelsetform.cpp b/src/blackgui/editors/ownmodelsetform.cpp index feb29ef6f..20a2803fb 100644 --- a/src/blackgui/editors/ownmodelsetform.cpp +++ b/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 +#include using namespace BlackMisc::Simulation; using namespace BlackGui::Models; diff --git a/src/blackgui/editors/ownmodelsetform.h b/src/blackgui/editors/ownmodelsetform.h index 4fb58bb18..f37db9aed 100644 --- a/src/blackgui/editors/ownmodelsetform.h +++ b/src/blackgui/editors/ownmodelsetform.h @@ -13,9 +13,13 @@ #define BLACKGUI_EDITORS_OWNMODELSETFORM_H #include "blackmisc/simulation/distributorlist.h" + #include +#include #include +class QWidget; + namespace Ui { class COwnModelSetForm; } namespace BlackGui diff --git a/src/blackgui/editors/validationindicator.cpp b/src/blackgui/editors/validationindicator.cpp index 7d2f53dc5..9897dc7da 100644 --- a/src/blackgui/editors/validationindicator.cpp +++ b/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 +#include "ui_validationindicator.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/editors/validationindicator.h b/src/blackgui/editors/validationindicator.h index a75318649..872f94b8e 100644 --- a/src/blackgui/editors/validationindicator.h +++ b/src/blackgui/editors/validationindicator.h @@ -14,10 +14,16 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/statusmessagelist.h" + #include +#include #include +#include #include +class QPaintEvent; +class QWidget; + namespace Ui { class CValidationIndicator; } namespace BlackGui diff --git a/src/blackgui/enableforframelesswindow.cpp b/src/blackgui/enableforframelesswindow.cpp index c04adc689..89999a8f2 100644 --- a/src/blackgui/enableforframelesswindow.cpp +++ b/src/blackgui/enableforframelesswindow.cpp @@ -7,13 +7,25 @@ * contained in the LICENSE file. */ -#include "enableforframelesswindow.h" +#include "blackgui/enableforframelesswindow.h" #include "blackmisc/icons.h" #include "blackmisc/stringutils.h" #include "blackmisc/worker.h" -#include + +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/enableforframelesswindow.h b/src/blackgui/enableforframelesswindow.h index 90a34f510..ea0b26bb2 100644 --- a/src/blackgui/enableforframelesswindow.h +++ b/src/blackgui/enableforframelesswindow.h @@ -13,13 +13,20 @@ #define BLACKGUI_ENABLEFORFRAMLESSWINDOW_H #include "blackgui/blackguiexport.h" -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +class QEvent; +class QHBoxLayout; +class QMenuBar; +class QMouseEvent; +class QPushButton; +class QSizeGrip; +class QStatusBar; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/enableforviewbasedindicator.cpp b/src/blackgui/enableforviewbasedindicator.cpp index 1da989786..aaa343b58 100644 --- a/src/blackgui/enableforviewbasedindicator.cpp +++ b/src/blackgui/enableforviewbasedindicator.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "enableforviewbasedindicator.h" +#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/views/viewbase.h" +#include + using namespace BlackMisc; using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp index 7bc048dab..947a921b5 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.cpp +++ b/src/blackgui/filters/aircrafticaofilterbar.cpp @@ -7,10 +7,18 @@ * contained in the LICENSE file. */ -#include "aircrafticaofilterbar.h" +#include "blackgui/components/aircraftcombinedtypeselector.h" +#include "blackgui/filters/aircrafticaofilterbar.h" +#include "blackgui/filters/filterbarbuttons.h" +#include "blackgui/models/aircrafticaofilter.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" #include "ui_aircrafticaofilterbar.h" +#include +#include + using namespace BlackMisc::Aviation; using namespace BlackGui; using namespace BlackGui::Models; diff --git a/src/blackgui/filters/aircrafticaofilterbar.h b/src/blackgui/filters/aircrafticaofilterbar.h index 77a8966d2..d3bef8b7f 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.h +++ b/src/blackgui/filters/aircrafticaofilterbar.h @@ -12,11 +12,24 @@ #ifndef BLACKGUI_FILTERS_AIRCRAFTICAOFILTERBAR_H #define BLACKGUI_FILTERS_AIRCRAFTICAOFILTERBAR_H -#include "blackguiexport.h" +#include "blackgui/blackguiexport.h" #include "blackgui/filters/filterwidget.h" -#include "blackgui/models/aircrafticaofilter.h" -#include +#include "blackgui/models/modelfilter.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CAircraftIcaoCode; + class CAircraftIcaoCodeList; + } +} namespace Ui { class CAircraftIcaoFilterBar; } namespace BlackGui diff --git a/src/blackgui/filters/aircraftmodelfilterbar.cpp b/src/blackgui/filters/aircraftmodelfilterbar.cpp index 9fb009356..8ea60dc0b 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.cpp +++ b/src/blackgui/filters/aircraftmodelfilterbar.cpp @@ -7,10 +7,19 @@ * contained in the LICENSE file. */ -#include "aircraftmodelfilterbar.h" -#include "ui_aircraftmodelfilterbar.h" +#include "blackgui/components/dbdistributorselectorcomponent.h" +#include "blackgui/components/simulatorselector.h" +#include "blackgui/filters/aircraftmodelfilterbar.h" +#include "blackgui/filters/filterbarbuttons.h" +#include "blackgui/models/aircraftmodelfilter.h" #include "blackgui/uppercasevalidator.h" #include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "ui_aircraftmodelfilterbar.h" + +#include +#include +#include using namespace BlackMisc::Simulation; using namespace BlackGui; diff --git a/src/blackgui/filters/aircraftmodelfilterbar.h b/src/blackgui/filters/aircraftmodelfilterbar.h index 046e4b3f0..76839005a 100644 --- a/src/blackgui/filters/aircraftmodelfilterbar.h +++ b/src/blackgui/filters/aircraftmodelfilterbar.h @@ -12,11 +12,19 @@ #ifndef BLACKGUI_FILTERS_FILTERBARAIRCRAFTMODEL_H #define BLACKGUI_FILTERS_FILTERBARAIRCRAFTMODEL_H -#include "blackguiexport.h" -#include "blackgui/models/aircraftmodelfilter.h" +#include "blackgui/blackguiexport.h" #include "blackgui/filters/filterwidget.h" -#include +#include "blackgui/models/modelfilter.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc { namespace Simulation { class CAircraftModelList; } } namespace Ui { class CAircraftModelFilterBar; } namespace BlackGui diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.cpp b/src/blackgui/filters/aircraftmodelfilterdialog.cpp index 504e39849..b78954636 100644 --- a/src/blackgui/filters/aircraftmodelfilterdialog.cpp +++ b/src/blackgui/filters/aircraftmodelfilterdialog.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "aircraftmodelfilterdialog.h" +#include "blackgui/filters/aircraftmodelfilterbar.h" +#include "blackgui/filters/aircraftmodelfilterdialog.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "ui_aircraftmodelfilterdialog.h" using namespace BlackGui::Models; diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.h b/src/blackgui/filters/aircraftmodelfilterdialog.h index a5d96f8d0..e4a0b3086 100644 --- a/src/blackgui/filters/aircraftmodelfilterdialog.h +++ b/src/blackgui/filters/aircraftmodelfilterdialog.h @@ -12,12 +12,17 @@ #ifndef BLACKGUI_FILTERS_AIRCRAFTMODELFILTERFORM_H #define BLACKGUI_FILTERS_AIRCRAFTMODELFILTERFORM_H -#include "filterdialog.h" #include "blackgui/blackguiexport.h" -#include "blackgui/models/aircraftmodelfilter.h" -#include -#include +#include "blackgui/filters/filterdialog.h" +#include "blackgui/models/modelfilter.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc { namespace Simulation { class CAircraftModelList; } } namespace Ui { class CAircraftModelFilterDialog; } namespace BlackGui diff --git a/src/blackgui/filters/airlineicaofilterbar.cpp b/src/blackgui/filters/airlineicaofilterbar.cpp index 2b44ef520..8c5c0ac87 100644 --- a/src/blackgui/filters/airlineicaofilterbar.cpp +++ b/src/blackgui/filters/airlineicaofilterbar.cpp @@ -7,9 +7,18 @@ * contained in the LICENSE file. */ -#include "airlineicaofilterbar.h" -#include "ui_airlineicaofilterbar.h" +#include "blackgui/components/dbcountryselectorcomponent.h" +#include "blackgui/filters/airlineicaofilterbar.h" +#include "blackgui/filters/filterbarbuttons.h" +#include "blackgui/models/airlineicaofilter.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/country.h" +#include "ui_airlineicaofilterbar.h" + +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/filters/airlineicaofilterbar.h b/src/blackgui/filters/airlineicaofilterbar.h index e74517aa8..f54ef5a93 100644 --- a/src/blackgui/filters/airlineicaofilterbar.h +++ b/src/blackgui/filters/airlineicaofilterbar.h @@ -12,12 +12,22 @@ #ifndef BLACKGUI_FILTERS_AIRLINEICAOFILTERBAR_H #define BLACKGUI_FILTERS_AIRLINEICAOFILTERBAR_H -#include "blackguiexport.h" +#include "blackgui/blackguiexport.h" #include "blackgui/filters/filterwidget.h" -#include "blackgui/models/airlineicaofilter.h" -#include -#include +#include "blackgui/models/modelfilter.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + class CCountry; + namespace Aviation { class CAirlineIcaoCodeList; } +} namespace Ui { class CAirlineIcaoFilterBar; } namespace BlackGui diff --git a/src/blackgui/filters/countryfilterbar.cpp b/src/blackgui/filters/countryfilterbar.cpp index 4ad57c006..f8630fd38 100644 --- a/src/blackgui/filters/countryfilterbar.cpp +++ b/src/blackgui/filters/countryfilterbar.cpp @@ -7,9 +7,14 @@ * contained in the LICENSE file. */ -#include "countryfilterbar.h" -#include "ui_countryfilterbar.h" +#include "blackgui/filters/countryfilterbar.h" +#include "blackgui/filters/filterbarbuttons.h" +#include "blackgui/models/countryfilter.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/countrylist.h" +#include "ui_countryfilterbar.h" + +#include using namespace BlackGui; using namespace BlackGui::Models; diff --git a/src/blackgui/filters/countryfilterbar.h b/src/blackgui/filters/countryfilterbar.h index 354dbf288..21821613c 100644 --- a/src/blackgui/filters/countryfilterbar.h +++ b/src/blackgui/filters/countryfilterbar.h @@ -12,11 +12,17 @@ #ifndef BLACKGUI_FILTERS_COUNTRYFILTERBAR_H #define BLACKGUI_FILTERS_COUNTRYFILTERBAR_H -#include "blackguiexport.h" +#include "blackgui/blackguiexport.h" #include "blackgui/filters/filterwidget.h" -#include "blackgui/models/countryfilter.h" -#include +#include "blackgui/models/modelfilter.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc { class CCountryList; } namespace Ui { class CCountryFilterBar; } namespace BlackGui diff --git a/src/blackgui/filters/filterbarbuttons.cpp b/src/blackgui/filters/filterbarbuttons.cpp index 29c51e76b..90e7a8c5e 100644 --- a/src/blackgui/filters/filterbarbuttons.cpp +++ b/src/blackgui/filters/filterbarbuttons.cpp @@ -7,9 +7,13 @@ * contained in the LICENSE file. */ -#include "filterbarbuttons.h" +#include "blackgui/filters/filterbarbuttons.h" #include "ui_filterbarbuttons.h" +#include +#include +#include + namespace BlackGui { namespace Filters diff --git a/src/blackgui/filters/filterbarbuttons.h b/src/blackgui/filters/filterbarbuttons.h index 4e7b2e757..4a5f839b8 100644 --- a/src/blackgui/filters/filterbarbuttons.h +++ b/src/blackgui/filters/filterbarbuttons.h @@ -13,9 +13,14 @@ #define BLACKGUI_FILTERS_FILTERBARBUTTONS_H #include "blackgui/blackguiexport.h" + #include +#include +#include #include +class QWidget; + namespace Ui { class CFilterBarButtons; } namespace BlackGui diff --git a/src/blackgui/filters/filterdialog.cpp b/src/blackgui/filters/filterdialog.cpp index 175842d2f..b45c31275 100644 --- a/src/blackgui/filters/filterdialog.cpp +++ b/src/blackgui/filters/filterdialog.cpp @@ -7,8 +7,12 @@ * contained in the LICENSE file. */ -#include "filterdialog.h" +#include "blackgui/filters/filterdialog.h" #include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" + +#include +#include namespace BlackGui { diff --git a/src/blackgui/filters/filterdialog.h b/src/blackgui/filters/filterdialog.h index 0d923f1b5..aaebf5cbb 100644 --- a/src/blackgui/filters/filterdialog.h +++ b/src/blackgui/filters/filterdialog.h @@ -13,7 +13,11 @@ #define BLACKGUI_FILTERS_FILTERDIALOG_H #include "blackgui/blackguiexport.h" + #include +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/filters/filterwidget.cpp b/src/blackgui/filters/filterwidget.cpp index 5c0a66adb..235699a08 100644 --- a/src/blackgui/filters/filterwidget.cpp +++ b/src/blackgui/filters/filterwidget.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "filterwidget.h" -#include "blackgui/stylesheetutility.h" +#include "blackgui/filters/filterwidget.h" #include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" + +#include +#include namespace BlackGui { diff --git a/src/blackgui/filters/filterwidget.h b/src/blackgui/filters/filterwidget.h index 486f60364..2a63c8cbe 100644 --- a/src/blackgui/filters/filterwidget.h +++ b/src/blackgui/filters/filterwidget.h @@ -14,7 +14,11 @@ #include "blackgui/blackguiexport.h" #include "blackgui/filters/filterbarbuttons.h" + #include +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/filters/liveryfilterbar.cpp b/src/blackgui/filters/liveryfilterbar.cpp index f39ea9aa4..6ef3fecf8 100644 --- a/src/blackgui/filters/liveryfilterbar.cpp +++ b/src/blackgui/filters/liveryfilterbar.cpp @@ -7,9 +7,19 @@ * contained in the LICENSE file. */ -#include "liveryfilterbar.h" -#include "ui_liveryfilterbar.h" +#include "blackgui/components/colorselector.h" +#include "blackgui/filters/filterbarbuttons.h" +#include "blackgui/filters/liveryfilterbar.h" +#include "blackgui/models/liveryfilter.h" #include "blackgui/uppercasevalidator.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "ui_liveryfilterbar.h" + +#include +#include +#include +#include using namespace BlackMisc::Aviation; using namespace BlackGui::Models; diff --git a/src/blackgui/filters/liveryfilterbar.h b/src/blackgui/filters/liveryfilterbar.h index f50a4b0bb..78266109b 100644 --- a/src/blackgui/filters/liveryfilterbar.h +++ b/src/blackgui/filters/liveryfilterbar.h @@ -12,11 +12,25 @@ #ifndef BLACKGUI_FILTERS_LIVERYFILTERBAR_H #define BLACKGUI_FILTERS_LIVERYFILTERBAR_H -#include "blackguiexport.h" +#include "blackgui/blackguiexport.h" #include "blackgui/filters/filterwidget.h" -#include "blackgui/models/liveryfilter.h" -#include +#include "blackgui/models/modelfilter.h" +#include "blackmisc/rgbcolor.h" +#include +#include +#include + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CLivery; + class CLiveryList; + } +} namespace Ui { class CLiveryFilterBar; } namespace BlackGui diff --git a/src/blackgui/foreignwindows.cpp b/src/blackgui/foreignwindows.cpp index cb249f80a..2dd1180f4 100644 --- a/src/blackgui/foreignwindows.cpp +++ b/src/blackgui/foreignwindows.cpp @@ -7,10 +7,12 @@ * contained in the LICENSE file. */ -#include "foreignwindows.h" +#include "blackgui/foreignwindows.h" +#include "blackgui/windowfinder.h" + #include #include -#include +#include namespace BlackGui { diff --git a/src/blackgui/foreignwindows.h b/src/blackgui/foreignwindows.h index c5c08e35a..5c569adcb 100644 --- a/src/blackgui/foreignwindows.h +++ b/src/blackgui/foreignwindows.h @@ -13,14 +13,16 @@ #define BLACKGUI_FOREIGNWINDOWS_H #include "blackgui/blackguiexport.h" -#include "blackmisc/simulation/simulatorplugininfo.h" -#include "windowfinder.h" -#include -#include + #include +class QWidget; +class QWindow; + namespace BlackGui { + class IWindowFinder; + //! Foreign windows class BLACKGUI_EXPORT CForeignWindows { diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index b04d14598..055767d49 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -7,20 +7,40 @@ * contained in the LICENSE file. */ -#include "guiapplication.h" -#include "guiutility.h" -#include "stylesheetutility.h" -#include "registermetadata.h" -#include "blackmisc/logmessage.h" +#include "blackcore/data/globalsetup.h" +#include "blackcore/data/updateinfo.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/registermetadata.h" #include "blackmisc/buildconfig.h" -#include "blackmisc/verify.h" +#include "blackmisc/datacache.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/logmessage.h" #include "blackmisc/metadatautils.h" +#include "blackmisc/registermetadata.h" #include "blackmisc/settingscache.h" +#include "blackmisc/verify.h" + +#include #include -#include +#include +#include #include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 96cf630e2..c6e488a6a 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -13,13 +13,25 @@ #define BLACKGUI_GUIAPPLICATION_H #include "blackcore/application.h" -#include "blackgui/mainwindowaccess.h" -#include "blackgui/enableforframelesswindow.h" -#include "blackgui/stylesheetutility.h" #include "blackgui/blackguiexport.h" -#include -#include +#include "blackgui/enableforframelesswindow.h" +#include "blackgui/mainwindowaccess.h" +#include "blackgui/stylesheetutility.h" +#include "blackmisc/icons.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include #include +#include +#include + +class QMenu; +class QSplashScreen; +class QWidget; + +namespace BlackMisc { class CLogCategoryList; } namespace BlackGui { diff --git a/src/blackgui/guiutility.cpp b/src/blackgui/guiutility.cpp index 3b7b9d3f2..d3c9a19d2 100644 --- a/src/blackgui/guiutility.cpp +++ b/src/blackgui/guiutility.cpp @@ -7,25 +7,31 @@ * contained in the LICENSE file. */ -#include "guiutility.h" -#include "overlaymessagesframe.h" -#include "blackcore/corefacade.h" -#include "blackcore/cookiemanager.h" -#include "blackmisc/filelogger.h" -#include "blackmisc/logmessage.h" +#include "blackgui/enableforframelesswindow.h" +#include "blackgui/guiutility.h" +#include "blackgui/overlaymessagesframe.h" #include "blackmisc/verify.h" -#include + #include -#include -#include -#include -#include -#include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -using namespace BlackCore; using namespace BlackMisc; namespace BlackGui diff --git a/src/blackgui/guiutility.h b/src/blackgui/guiutility.h index 354afee70..6ade83289 100644 --- a/src/blackgui/guiutility.h +++ b/src/blackgui/guiutility.h @@ -13,15 +13,24 @@ #define BLACKGUI_GUIUTILITY_H #include "blackgui/blackguiexport.h" -#include "blackmisc/icon.h" -#include "enableforframelesswindow.h" +#include "blackmisc/variant.h" + +#include +#include +#include #include -#include -#include -#include + +class QCheckBox; +class QComboBox; +class QLayout; +class QMimeData; +class QTabWidget; +class QWidget; namespace BlackGui { + class CEnableForFramelessWindow; + class COverlayMessagesFrame; //! GUI utilities diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index 90feaad14..9c4f1b745 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -7,19 +7,32 @@ * contained in the LICENSE file. */ -#include "infoarea.h" -#include "stylesheetutility.h" -#include "guiapplication.h" -#include "guiutility.h" +#include "blackgui/dockwidget.h" +#include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/infoarea.h" +#include "blackgui/stylesheetutility.h" #include "blackmisc/icons.h" #include "blackmisc/logmessage.h" -#include -#include -#include -#include -#include + #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/infoarea.h b/src/blackgui/infoarea.h index a132da7e0..21c54654e 100644 --- a/src/blackgui/infoarea.h +++ b/src/blackgui/infoarea.h @@ -13,15 +13,34 @@ #define BLACKGUI_INFOAREA_H #include "blackgui/blackguiexport.h" -#include "dockwidgetinfoarea.h" -#include "enableforframelesswindow.h" -#include -#include -#include +#include "blackgui/enableforframelesswindow.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" + +#include #include +#include +#include +#include +#include +#include +#include + +class QAction; +class QCloseEvent; +class QKeyEvent; +class QMenu; +class QPaintEvent; +class QPixmap; +class QPoint; +class QTabBar; +class QWidget; namespace BlackGui { + class CDockWidget; + class CDockWidgetInfoArea; + //! Info area, hosting dockable widgets //! \sa CDockWidgetInfoArea class BLACKGUI_EXPORT CInfoArea : public QMainWindow, CEnableForFramelessWindow diff --git a/src/blackgui/labelandicon.cpp b/src/blackgui/labelandicon.cpp index da4700031..19f23ad0d 100644 --- a/src/blackgui/labelandicon.cpp +++ b/src/blackgui/labelandicon.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "labelandicon.h" +#include "blackgui/labelandicon.h" #include "ui_labelandicon.h" +#include + namespace BlackGui { CLabelAndIcon::CLabelAndIcon(QWidget *parent) : diff --git a/src/blackgui/labelandicon.h b/src/blackgui/labelandicon.h index 4c5f0af67..a80b0b02c 100644 --- a/src/blackgui/labelandicon.h +++ b/src/blackgui/labelandicon.h @@ -11,8 +11,14 @@ #define BLACKGUI_LABELANDICON_H #include "blackgui/blackguiexport.h" + #include +#include #include +#include + +class QPixmap; +class QWidget; namespace Ui { class CLabelAndIcon; } diff --git a/src/blackgui/led.cpp b/src/blackgui/led.cpp index 274bc4264..e3510df38 100644 --- a/src/blackgui/led.cpp +++ b/src/blackgui/led.cpp @@ -9,15 +9,19 @@ * Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com */ -#include "led.h" +#include "blackgui/led.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/led.h b/src/blackgui/led.h index 7ea914fee..20de9737f 100644 --- a/src/blackgui/led.h +++ b/src/blackgui/led.h @@ -15,11 +15,19 @@ #define BLACKGUI_LED_H #include "blackgui/blackguiexport.h" -#include -#include -#include -#include + +#include +#include +#include +#include +#include #include +#include + +class QMouseEvent; +class QPaintEvent; +class QStringList; +class QSvgRenderer; namespace BlackGui { diff --git a/src/blackgui/levelmeter.cpp b/src/blackgui/levelmeter.cpp index ad0d08393..bf1b4beb3 100644 --- a/src/blackgui/levelmeter.cpp +++ b/src/blackgui/levelmeter.cpp @@ -9,12 +9,15 @@ * Class based on qt example: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) */ -#include "levelmeter.h" +#include "blackgui/levelmeter.h" + #include #include +#include +#include #include -#include - +#include +#include namespace BlackGui { diff --git a/src/blackgui/levelmeter.h b/src/blackgui/levelmeter.h index 34efbd6fe..1ea463034 100644 --- a/src/blackgui/levelmeter.h +++ b/src/blackgui/levelmeter.h @@ -15,9 +15,15 @@ #define BLACKGUI_LEVELMETER_H #include "blackgui/blackguiexport.h" + +#include +#include #include #include +class QPaintEvent; +class QTimer; + namespace BlackGui { diff --git a/src/blackgui/loadindicator.cpp b/src/blackgui/loadindicator.cpp index eb4cc7c5d..a72d452c9 100644 --- a/src/blackgui/loadindicator.cpp +++ b/src/blackgui/loadindicator.cpp @@ -9,15 +9,13 @@ * Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com */ -#include "loadindicator.h" +#include "blackgui/loadindicator.h" #include +#include +#include +#include #include -#include -#include -#include -#include -#include namespace BlackGui { diff --git a/src/blackgui/loadindicator.h b/src/blackgui/loadindicator.h index 99b92e4d6..4fec7f4d8 100644 --- a/src/blackgui/loadindicator.h +++ b/src/blackgui/loadindicator.h @@ -15,8 +15,16 @@ #define BLACKGUI_LOADINDICATOR_H #include "blackgui/blackguiexport.h" + +#include +#include +#include #include -#include +#include + +class QPaintEvent; +class QPainter; +class QTimerEvent; namespace BlackGui { diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index 208be8938..c0d694e20 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "loginmodebuttons.h" +#include "blackgui/loginmodebuttons.h" #include "ui_loginmodebuttons.h" +#include + using namespace BlackCore; namespace BlackGui diff --git a/src/blackgui/loginmodebuttons.h b/src/blackgui/loginmodebuttons.h index f125624c5..faac07678 100644 --- a/src/blackgui/loginmodebuttons.h +++ b/src/blackgui/loginmodebuttons.h @@ -12,11 +12,14 @@ #ifndef BLACKGUI_LOGINMODEBUTTONS_H #define BLACKGUI_LOGINMODEBUTTONS_H -#include "blackgui/blackguiexport.h" #include "blackcore/network.h" +#include "blackgui/blackguiexport.h" + #include +#include #include +class QWidget; namespace Ui { class CLoginModeButtons; } diff --git a/src/blackgui/mainwindowaccess.cpp b/src/blackgui/mainwindowaccess.cpp index b8e7f8a4d..5d8e99ab4 100644 --- a/src/blackgui/mainwindowaccess.cpp +++ b/src/blackgui/mainwindowaccess.cpp @@ -7,10 +7,10 @@ * contained in the LICENSE file. */ -#include "mainwindowaccess.h" -#include "managedstatusbar.h" -#include "overlaymessagesframe.h" -#include "components/logcomponent.h" +#include "blackgui/components/logcomponent.h" +#include "blackgui/mainwindowaccess.h" +#include "blackgui/managedstatusbar.h" +#include "blackgui/overlaymessagesframe.h" namespace BlackGui { diff --git a/src/blackgui/mainwindowaccess.h b/src/blackgui/mainwindowaccess.h index 8330b21e1..deaa42953 100644 --- a/src/blackgui/mainwindowaccess.h +++ b/src/blackgui/mainwindowaccess.h @@ -12,7 +12,9 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/statusmessage.h" -#include + +#include +#include namespace BlackGui { diff --git a/src/blackgui/managedstatusbar.cpp b/src/blackgui/managedstatusbar.cpp index e78e8e49f..ad423f956 100644 --- a/src/blackgui/managedstatusbar.cpp +++ b/src/blackgui/managedstatusbar.cpp @@ -7,8 +7,18 @@ * contained in the LICENSE file. */ -#include "managedstatusbar.h" -#include +#include "blackgui/managedstatusbar.h" +#include "blackmisc/iterator.h" +#include "blackmisc/sequence.h" + +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/managedstatusbar.h b/src/blackgui/managedstatusbar.h index f3ead616d..9aefd37dd 100644 --- a/src/blackgui/managedstatusbar.h +++ b/src/blackgui/managedstatusbar.h @@ -13,13 +13,14 @@ #define BLACKGUI_MANAGEDSTATUSBAR_H #include "blackgui/blackguiexport.h" -#include "blackmisc/statusmessagelist.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" #include -#include -#include -#include + +class QLabel; +class QStatusBar; +class QTimer; namespace BlackGui { diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp index 05be088e9..47b10a2c7 100644 --- a/src/blackgui/menus/aircraftmodelmenus.cpp +++ b/src/blackgui/menus/aircraftmodelmenus.cpp @@ -12,7 +12,9 @@ #include "blackcore/webdataservices.h" #include "blackmisc/icons.h" #include "blackmisc/logmessage.h" +#include "blackmisc/simulation/aircraftmodelinterfaces.h" #include "blackmisc/simulation/aircraftmodelutils.h" + #include using namespace BlackMisc; diff --git a/src/blackgui/menus/aircraftmodelmenus.h b/src/blackgui/menus/aircraftmodelmenus.h index e96e93b34..4de668cbf 100644 --- a/src/blackgui/menus/aircraftmodelmenus.h +++ b/src/blackgui/menus/aircraftmodelmenus.h @@ -10,14 +10,24 @@ #ifndef BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H #define BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H -#include "menudelegate.h" -#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/menus/menudelegate.h" #include "blackgui/overlaymessagesframe.h" -#include "blackmisc/simulation/aircraftmodelinterfaces.h" -#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" +#include "blackgui/views/aircraftmodelview.h" + #include #include +class QAction; + +namespace BlackMisc +{ + namespace Simulation + { + class IModelsSetable; + class IModelsUpdatable; + } +} + namespace BlackGui { namespace Menus diff --git a/src/blackgui/menus/menuaction.cpp b/src/blackgui/menus/menuaction.cpp index 950e9b73f..0adc86a9a 100644 --- a/src/blackgui/menus/menuaction.cpp +++ b/src/blackgui/menus/menuaction.cpp @@ -7,9 +7,16 @@ * contained in the LICENSE file. */ -#include "menuaction.h" +#include "blackgui/menus/menuaction.h" #include "blackmisc/icons.h" +#include "blackmisc/slot.h" #include "blackmisc/verify.h" + +#include +#include +#include +#include +#include #include using namespace BlackMisc; diff --git a/src/blackgui/menus/menuaction.h b/src/blackgui/menus/menuaction.h index c90bfc6cc..a63021c71 100644 --- a/src/blackgui/menus/menuaction.h +++ b/src/blackgui/menus/menuaction.h @@ -11,10 +11,17 @@ #define BLACKGUI_MENUS_MENUACTION_H #include "blackmisc/slot.h" -#include -#include + #include +#include +#include +#include #include +#include + +class QAction; +class QMenu; +class QObject; namespace BlackGui { diff --git a/src/blackgui/menus/menudelegate.h b/src/blackgui/menus/menudelegate.h index b7938d019..75129e1f1 100644 --- a/src/blackgui/menus/menudelegate.h +++ b/src/blackgui/menus/menudelegate.h @@ -12,9 +12,11 @@ #include "blackmisc/logcategorylist.h" #include "blackgui/menus/menuaction.h" + +#include #include -using namespace BlackMisc; +class QWidget; namespace BlackGui { @@ -41,9 +43,9 @@ namespace BlackGui virtual ~IMenuDelegate() {} //! Log categories - const CLogCategoryList &getLogCategories() + const BlackMisc::CLogCategoryList &getLogCategories() { - static const CLogCategoryList cats({CLogCategory::guiComponent()}); + static const BlackMisc::CLogCategoryList cats({BlackMisc::CLogCategory::guiComponent()}); return cats; } diff --git a/src/blackgui/models/actionhotkeylistmodel.cpp b/src/blackgui/models/actionhotkeylistmodel.cpp index 3b2f21c83..539d0ca96 100644 --- a/src/blackgui/models/actionhotkeylistmodel.cpp +++ b/src/blackgui/models/actionhotkeylistmodel.cpp @@ -7,7 +7,14 @@ * contained in the LICENSE file. */ -#include "actionhotkeylistmodel.h" +#include "blackgui/models/actionhotkeylistmodel.h" +#include "blackmisc/identifier.h" +#include "blackmisc/input/actionhotkey.h" +#include "blackmisc/input/hotkeycombination.h" +#include "blackmisc/sequence.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Input; diff --git a/src/blackgui/models/actionhotkeylistmodel.h b/src/blackgui/models/actionhotkeylistmodel.h index e7712b195..c3ef26e5b 100644 --- a/src/blackgui/models/actionhotkeylistmodel.h +++ b/src/blackgui/models/actionhotkeylistmodel.h @@ -14,7 +14,14 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/input/actionhotkeylist.h" + #include +#include +#include +#include +#include + +class QModelIndex; namespace BlackGui { diff --git a/src/blackgui/models/actionitem.cpp b/src/blackgui/models/actionitem.cpp index 7535cc568..8ed7d7982 100644 --- a/src/blackgui/models/actionitem.cpp +++ b/src/blackgui/models/actionitem.cpp @@ -1,5 +1,7 @@ -#include "actionitem.h" +#include "blackgui/models/actionitem.h" + +#include namespace BlackGui { diff --git a/src/blackgui/models/actionitem.h b/src/blackgui/models/actionitem.h index 0c2fe6d9f..bc94438c2 100644 --- a/src/blackgui/models/actionitem.h +++ b/src/blackgui/models/actionitem.h @@ -12,8 +12,8 @@ #ifndef BLACKGUI_ACTIONITEM_H #define BLACKGUI_ACTIONITEM_H +#include #include -#include namespace BlackGui { diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp index b3d091a49..65979e978 100644 --- a/src/blackgui/models/actionmodel.cpp +++ b/src/blackgui/models/actionmodel.cpp @@ -7,9 +7,13 @@ * contained in the LICENSE file. */ -#include "actionmodel.h" -#include "actionitem.h" #include "blackcore/inputmanager.h" +#include "blackgui/models/actionitem.h" +#include "blackgui/models/actionmodel.h" + +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/models/actionmodel.h b/src/blackgui/models/actionmodel.h index 813ef7b3e..80d040d1e 100644 --- a/src/blackgui/models/actionmodel.h +++ b/src/blackgui/models/actionmodel.h @@ -13,9 +13,13 @@ #define BLACKGUI_ACTIONMODEL_H #include "blackgui/blackguiexport.h" -#include "blackcore/actionbind.h" + #include +#include +#include #include +#include +#include namespace BlackGui { diff --git a/src/blackgui/models/aircrafticaofilter.cpp b/src/blackgui/models/aircrafticaofilter.cpp index b9785c8dd..b5c38d4a1 100644 --- a/src/blackgui/models/aircrafticaofilter.cpp +++ b/src/blackgui/models/aircrafticaofilter.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "aircrafticaofilter.h" +#include "blackgui/models/aircrafticaofilter.h" #include "blackmisc/aviation/aircrafticaocode.h" using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/aircrafticaofilter.h b/src/blackgui/models/aircrafticaofilter.h index 654b313f4..1d590b954 100644 --- a/src/blackgui/models/aircrafticaofilter.h +++ b/src/blackgui/models/aircrafticaofilter.h @@ -16,6 +16,8 @@ #include "blackgui/models/modelfilter.h" #include "blackmisc/aviation/aircrafticaocodelist.h" +#include + namespace BlackGui { namespace Models diff --git a/src/blackgui/models/aircrafticaolistmodel.cpp b/src/blackgui/models/aircrafticaolistmodel.cpp index f484c8ed2..fc5cf74ea 100644 --- a/src/blackgui/models/aircrafticaolistmodel.cpp +++ b/src/blackgui/models/aircrafticaolistmodel.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "aircrafticaolistmodel.h" -#include -#include +#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/datastore.h" +#include "blackmisc/timestampbased.h" + +#include +#include using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/aircrafticaolistmodel.h b/src/blackgui/models/aircrafticaolistmodel.h index 40f699708..ed404e057 100644 --- a/src/blackgui/models/aircrafticaolistmodel.h +++ b/src/blackgui/models/aircrafticaolistmodel.h @@ -13,9 +13,11 @@ #define BLACKGUI_AIRCRAFTICAOLISTMODEL_H #include "blackgui/blackguiexport.h" -#include -#include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackgui/models/listmodeldbobjects.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" + +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/aircraftmodelfilter.cpp b/src/blackgui/models/aircraftmodelfilter.cpp index 3f923e61d..bed947a4b 100644 --- a/src/blackgui/models/aircraftmodelfilter.cpp +++ b/src/blackgui/models/aircraftmodelfilter.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "aircraftmodelfilter.h" +#include "blackgui/models/aircraftmodelfilter.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" #include "blackmisc/simulation/aircraftmodel.h" using namespace BlackMisc::Simulation; diff --git a/src/blackgui/models/aircraftmodelfilter.h b/src/blackgui/models/aircraftmodelfilter.h index 81ff2a069..28d237321 100644 --- a/src/blackgui/models/aircraftmodelfilter.h +++ b/src/blackgui/models/aircraftmodelfilter.h @@ -13,8 +13,13 @@ #define BLACKGUI_AIRCRAFTMODELFILTER_H #include "blackgui/blackguiexport.h" -#include "modelfilter.h" +#include "blackgui/models/modelfilter.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/simulatorinfo.h" + +#include namespace BlackGui { diff --git a/src/blackgui/models/aircraftmodellistmodel.cpp b/src/blackgui/models/aircraftmodellistmodel.cpp index 7eae38a5d..4dafa2487 100644 --- a/src/blackgui/models/aircraftmodellistmodel.cpp +++ b/src/blackgui/models/aircraftmodellistmodel.cpp @@ -7,8 +7,20 @@ * contained in the LICENSE file. */ -#include "aircraftmodellistmodel.h" -#include "blackmisc/icons.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/datastore.h" +#include "blackmisc/orderable.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/timestampbased.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/models/aircraftmodellistmodel.h b/src/blackgui/models/aircraftmodellistmodel.h index 99582500d..7b679c521 100644 --- a/src/blackgui/models/aircraftmodellistmodel.h +++ b/src/blackgui/models/aircraftmodellistmodel.h @@ -15,9 +15,16 @@ #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeldbobjects.h" #include "blackmisc/simulation/aircraftmodellist.h" -#include -#include + #include +#include +#include +#include + +class QModelIndex; +class QObject; + +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackGui { diff --git a/src/blackgui/models/airlineicaofilter.cpp b/src/blackgui/models/airlineicaofilter.cpp index 816805c11..9cae44235 100644 --- a/src/blackgui/models/airlineicaofilter.cpp +++ b/src/blackgui/models/airlineicaofilter.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "airlineicaofilter.h" +#include "blackgui/models/airlineicaofilter.h" #include "blackmisc/aviation/airlineicaocode.h" using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/airlineicaofilter.h b/src/blackgui/models/airlineicaofilter.h index 8370a433c..8dab4e058 100644 --- a/src/blackgui/models/airlineicaofilter.h +++ b/src/blackgui/models/airlineicaofilter.h @@ -16,6 +16,8 @@ #include "blackgui/models/modelfilter.h" #include "blackmisc/aviation/airlineicaocodelist.h" +#include + namespace BlackGui { namespace Models diff --git a/src/blackgui/models/airlineicaolistmodel.cpp b/src/blackgui/models/airlineicaolistmodel.cpp index 29aac4828..31ad8681d 100644 --- a/src/blackgui/models/airlineicaolistmodel.cpp +++ b/src/blackgui/models/airlineicaolistmodel.cpp @@ -7,9 +7,17 @@ * contained in the LICENSE file. */ -#include "airlineicaolistmodel.h" -#include -#include +#include "blackgui/models/airlineicaolistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/country.h" +#include "blackmisc/datastore.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/timestampbased.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/airlineicaolistmodel.h b/src/blackgui/models/airlineicaolistmodel.h index 6ffe507bf..613e8c4c2 100644 --- a/src/blackgui/models/airlineicaolistmodel.h +++ b/src/blackgui/models/airlineicaolistmodel.h @@ -13,10 +13,19 @@ #define BLACKGUI_AIRLINEICAOLISTMODEL_H #include "blackgui/blackguiexport.h" -#include -#include "blackmisc/aviation/airlineicaocodelist.h" #include "blackgui/models/listmodeldbobjects.h" +class QObject; + +namespace BlackMisc +{ + namespace Aviation + { + class CAirlineIcaoCode; + class CAirlineIcaoCodeList; + } +} + namespace BlackGui { namespace Models diff --git a/src/blackgui/models/airportlistmodel.cpp b/src/blackgui/models/airportlistmodel.cpp index 960821c5f..de21318d6 100644 --- a/src/blackgui/models/airportlistmodel.cpp +++ b/src/blackgui/models/airportlistmodel.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "airportlistmodel.h" -#include -#include +#include "blackgui/models/airportlistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/units.h" + +#include +#include using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackgui/models/airportlistmodel.h b/src/blackgui/models/airportlistmodel.h index b3f3072ed..e25515ba7 100644 --- a/src/blackgui/models/airportlistmodel.h +++ b/src/blackgui/models/airportlistmodel.h @@ -13,9 +13,11 @@ #define BLACKGUI_AIRPORTLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/aviation/airportlist.h" #include "blackgui/models/listmodelbase.h" -#include +#include "blackmisc/aviation/airport.h" +#include "blackmisc/aviation/airportlist.h" + +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index f1075e1d2..06d92de8e 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -7,9 +7,29 @@ * contained in the LICENSE file. */ -#include "atcstationlistmodel.h" +#include "blackgui/models/atcstationlistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" #include "blackmisc/audio/voiceroom.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/compare.h" +#include "blackmisc/icon.h" #include "blackmisc/network/user.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Audio; diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/blackgui/models/atcstationlistmodel.h index 92230207e..abad7c31c 100644 --- a/src/blackgui/models/atcstationlistmodel.h +++ b/src/blackgui/models/atcstationlistmodel.h @@ -13,10 +13,13 @@ #define BLACKGUI_ATCLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/aviation/atcstationlist.h" #include "blackgui/models/listmodelbase.h" -#include -#include +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" + +#include + +class QStandardItemModel; namespace BlackGui { diff --git a/src/blackgui/models/clientlistmodel.cpp b/src/blackgui/models/clientlistmodel.cpp index ec3921f68..a5eb3390c 100644 --- a/src/blackgui/models/clientlistmodel.cpp +++ b/src/blackgui/models/clientlistmodel.cpp @@ -7,10 +7,17 @@ * contained in the LICENSE file. */ -#include "clientlistmodel.h" -#include "blackmisc/icons.h" -#include -#include +#include "blackgui/models/clientlistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackmisc/compare.h" +#include "blackmisc/network/user.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/aircraftmodel.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/models/clientlistmodel.h b/src/blackgui/models/clientlistmodel.h index 6be7a2196..60b8589f2 100644 --- a/src/blackgui/models/clientlistmodel.h +++ b/src/blackgui/models/clientlistmodel.h @@ -13,9 +13,14 @@ #define BLACKGUI_CLIENTLISTMODEL_H #include "blackgui/blackguiexport.h" -#include -#include "blackmisc/network/clientlist.h" #include "blackgui/models/listmodelbase.h" +#include "blackmisc/network/client.h" +#include "blackmisc/network/clientlist.h" + +#include + +class QModelIndex; +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp index 02bb9b1d7..ec953470c 100644 --- a/src/blackgui/models/columnformatters.cpp +++ b/src/blackgui/models/columnformatters.cpp @@ -7,13 +7,20 @@ * contained in the LICENSE file. */ -#include "columnformatters.h" -#include "blackmisc/geo/latitude.h" +#include "blackgui/models/columnformatters.h" #include "blackmisc/aviation/altitude.h" -#include "blackmisc/rgbcolor.h" -#include "blackmisc/variant.h" +#include "blackmisc/aviation/comsystem.h" #include "blackmisc/iconlist.h" #include "blackmisc/icons.h" +#include "blackmisc/rgbcolor.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h index 470e0026b..1de2b044e 100644 --- a/src/blackgui/models/columnformatters.h +++ b/src/blackgui/models/columnformatters.h @@ -14,12 +14,21 @@ #include "blackgui/blackguiexport.h" #include "blackgui/led.h" -#include "blackmisc/pq/pq.h" -#include "blackmisc/aviation/comsystem.h" #include "blackmisc/icon.h" -#include -#include -#include +#include "blackmisc/icons.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/models/columns.cpp b/src/blackgui/models/columns.cpp index 7fdf0f759..e6fee7609 100644 --- a/src/blackgui/models/columns.cpp +++ b/src/blackgui/models/columns.cpp @@ -7,8 +7,12 @@ * contained in the LICENSE file. */ -#include "columns.h" +#include "blackgui/models/columns.h" +#include "blackmisc/compare.h" + +#include #include +#include using namespace BlackMisc; diff --git a/src/blackgui/models/columns.h b/src/blackgui/models/columns.h index 4241efdce..62fc11fcf 100644 --- a/src/blackgui/models/columns.h +++ b/src/blackgui/models/columns.h @@ -13,13 +13,17 @@ #define BLACKGUI_COLUMNS_H #include "blackgui/blackguiexport.h" -#include "blackmisc/collection.h" +#include "blackgui/models/columnformatters.h" #include "blackmisc/propertyindex.h" -#include "columnformatters.h" -#include +#include "blackmisc/variant.h" + +#include #include -#include -#include +#include +#include +#include + +class QModelIndex; namespace BlackGui { diff --git a/src/blackgui/models/countryfilter.cpp b/src/blackgui/models/countryfilter.cpp index c5df745d2..b16e79bdb 100644 --- a/src/blackgui/models/countryfilter.cpp +++ b/src/blackgui/models/countryfilter.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "countryfilter.h" +#include "blackgui/models/countryfilter.h" #include "blackmisc/country.h" using namespace BlackMisc; diff --git a/src/blackgui/models/countryfilter.h b/src/blackgui/models/countryfilter.h index 9d72723fc..1ec78c62b 100644 --- a/src/blackgui/models/countryfilter.h +++ b/src/blackgui/models/countryfilter.h @@ -16,6 +16,8 @@ #include "blackgui/models/modelfilter.h" #include "blackmisc/countrylist.h" +#include + namespace BlackGui { namespace Models diff --git a/src/blackgui/models/countrylistmodel.cpp b/src/blackgui/models/countrylistmodel.cpp index 58685b804..b30d1834b 100644 --- a/src/blackgui/models/countrylistmodel.cpp +++ b/src/blackgui/models/countrylistmodel.cpp @@ -7,8 +7,14 @@ * contained in the LICENSE file. */ -#include "countrylistmodel.h" -#include +#include "blackgui/models/columns.h" +#include "blackgui/models/countrylistmodel.h" +#include "blackmisc/country.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/timestampbased.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/models/countrylistmodel.h b/src/blackgui/models/countrylistmodel.h index ce40bb1f2..9091cbfa2 100644 --- a/src/blackgui/models/countrylistmodel.h +++ b/src/blackgui/models/countrylistmodel.h @@ -13,9 +13,17 @@ #define BLACKGUI_COUNTRYLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/countrylist.h" #include "blackgui/models/listmodeldbobjects.h" -#include + +#include + +class QObject; + +namespace BlackMisc +{ + class CCountry; + class CCountryList; +} namespace BlackGui { diff --git a/src/blackgui/models/distributorlistmodel.cpp b/src/blackgui/models/distributorlistmodel.cpp index bdb7c2ac2..f9b8acc4b 100644 --- a/src/blackgui/models/distributorlistmodel.cpp +++ b/src/blackgui/models/distributorlistmodel.cpp @@ -7,9 +7,17 @@ * contained in the LICENSE file. */ -#include "distributorlistmodel.h" -#include -#include +#include "blackgui/models/columns.h" +#include "blackgui/models/distributorlistmodel.h" +#include "blackmisc/datastore.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/timestampbased.h" + +#include +#include +#include using namespace BlackMisc::Simulation; diff --git a/src/blackgui/models/distributorlistmodel.h b/src/blackgui/models/distributorlistmodel.h index d9477770c..ab8504129 100644 --- a/src/blackgui/models/distributorlistmodel.h +++ b/src/blackgui/models/distributorlistmodel.h @@ -13,9 +13,14 @@ #define BLACKGUI_DISTRIBUTORLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/simulation/distributorlist.h" #include "blackgui/models/listmodeldbobjects.h" -#include +#include "blackmisc/simulation/distributorlist.h" + +#include + +class QObject; + +namespace BlackMisc { namespace Simulation { class CDistributor; } } namespace BlackGui { diff --git a/src/blackgui/models/identifierlistmodel.cpp b/src/blackgui/models/identifierlistmodel.cpp index 082bfea76..566e76cdc 100644 --- a/src/blackgui/models/identifierlistmodel.cpp +++ b/src/blackgui/models/identifierlistmodel.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "identifierlistmodel.h" -#include -#include +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/identifierlistmodel.h" +#include "blackmisc/timestampbased.h" + +#include using namespace BlackMisc; diff --git a/src/blackgui/models/identifierlistmodel.h b/src/blackgui/models/identifierlistmodel.h index 12b03030c..e0e0d6561 100644 --- a/src/blackgui/models/identifierlistmodel.h +++ b/src/blackgui/models/identifierlistmodel.h @@ -13,9 +13,11 @@ #define BLACKGUI_IDENTIFIERLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/identifierlist.h" #include "blackgui/models/listmodelbase.h" -#include +#include "blackmisc/identifier.h" +#include "blackmisc/identifierlist.h" + +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index f99b490a8..6b8560d08 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -10,16 +10,54 @@ // Drag and drop docu: // http://doc.qt.io/qt-5/model-view-programming.html#using-drag-and-drop-with-item-views -#include "listmodelbase.h" -#include "allmodelcontainers.h" #include "blackgui/guiutility.h" -#include "blackmisc/verify.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/listmodelbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/airport.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/compare.h" +#include "blackmisc/country.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/identifier.h" +#include "blackmisc/identifierlist.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/network/client.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/predicates.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/sequence.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" #include "blackmisc/variant.h" -#include "blackmisc/json.h" -#include "blackmisc/logmessage.h" -#include "blackmisc/comparefunctions.h" -#include +#include "blackmisc/verify.h" +#include "blackmisc/worker.h" + +#include #include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/listmodelbase.h b/src/blackgui/models/listmodelbase.h index e7b902da1..4aa1800eb 100644 --- a/src/blackgui/models/listmodelbase.h +++ b/src/blackgui/models/listmodelbase.h @@ -13,17 +13,31 @@ #define BLACKGUI_LISTMODELBASE_H #include "blackgui/blackguiexport.h" +#include "blackgui/dropbase.h" #include "blackgui/models/columns.h" #include "blackgui/models/modelfilter.h" -#include "blackgui/dropbase.h" -#include "blackmisc/worker.h" #include "blackmisc/digestsignal.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include #include -#include #include +class QMimeData; +class QModelIndex; + +namespace BlackMisc { class CWorker; } + namespace BlackGui { namespace Models diff --git a/src/blackgui/models/listmodeldbobjects.cpp b/src/blackgui/models/listmodeldbobjects.cpp index 7a509d6fd..4beaa2696 100644 --- a/src/blackgui/models/listmodeldbobjects.cpp +++ b/src/blackgui/models/listmodeldbobjects.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "listmodeldbobjects.h" -#include "allmodelcontainers.h" -#include "blackmisc/datastoreobjectlist.h" +#include "blackgui/models/listmodeldbobjects.h" +#include "blackmisc/orderable.h" + +#include +#include #include using namespace BlackMisc; diff --git a/src/blackgui/models/listmodeldbobjects.h b/src/blackgui/models/listmodeldbobjects.h index e17b57070..b58cbf92d 100644 --- a/src/blackgui/models/listmodeldbobjects.h +++ b/src/blackgui/models/listmodeldbobjects.h @@ -12,8 +12,28 @@ #ifndef BLACKGUI_LISTMODELDBOBJECTS_H #define BLACKGUI_LISTMODELDBOBJECTS_H -#include "listmodelbase.h" -#include "blackgui/blackguiexport.h" +#include "blackgui/models/listmodelbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/country.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" + +#include +#include +#include +#include +#include + +class QModelIndex; +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/liveryfilter.cpp b/src/blackgui/models/liveryfilter.cpp index c0358f294..8aaca7f94 100644 --- a/src/blackgui/models/liveryfilter.cpp +++ b/src/blackgui/models/liveryfilter.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "liveryfilter.h" -#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackgui/models/liveryfilter.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/liveryfilter.h b/src/blackgui/models/liveryfilter.h index de750d09b..82f73969b 100644 --- a/src/blackgui/models/liveryfilter.h +++ b/src/blackgui/models/liveryfilter.h @@ -15,6 +15,9 @@ #include "blackgui/blackguiexport.h" #include "blackgui/models/modelfilter.h" #include "blackmisc/aviation/liverylist.h" +#include "blackmisc/rgbcolor.h" + +#include namespace BlackGui { diff --git a/src/blackgui/models/liverylistmodel.cpp b/src/blackgui/models/liverylistmodel.cpp index cc77a5965..33267ea18 100644 --- a/src/blackgui/models/liverylistmodel.cpp +++ b/src/blackgui/models/liverylistmodel.cpp @@ -7,10 +7,17 @@ * contained in the LICENSE file. */ -#include "liverylistmodel.h" -#include "blackmisc/rgbcolor.h" -#include -#include +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/liverylistmodel.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/country.h" +#include "blackmisc/datastore.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/timestampbased.h" + +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/liverylistmodel.h b/src/blackgui/models/liverylistmodel.h index 68003efbb..878cb0b5f 100644 --- a/src/blackgui/models/liverylistmodel.h +++ b/src/blackgui/models/liverylistmodel.h @@ -13,9 +13,18 @@ #define BLACKGUI_LIVERYLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/aviation/liverylist.h" #include "blackgui/models/listmodeldbobjects.h" -#include + +class QObject; + +namespace BlackMisc +{ + namespace Aviation + { + class CLivery; + class CLiveryList; + } +} namespace BlackGui { diff --git a/src/blackgui/models/modelfilter.cpp b/src/blackgui/models/modelfilter.cpp index bd811a19e..b78f97f1b 100644 --- a/src/blackgui/models/modelfilter.cpp +++ b/src/blackgui/models/modelfilter.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "modelfilter.h" -#include "blackgui/models/allmodels.h" +#include "blackgui/models/modelfilter.h" + +#include namespace BlackGui { diff --git a/src/blackgui/models/modelfilter.h b/src/blackgui/models/modelfilter.h index 8a90bc7d3..8f1e5631d 100644 --- a/src/blackgui/models/modelfilter.h +++ b/src/blackgui/models/modelfilter.h @@ -12,8 +12,25 @@ #ifndef BLACKGUI_LISTMODELFILTER_H #define BLACKGUI_LISTMODELFILTER_H -#include "blackgui/blackguiexport.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/identifierlist.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/statusmessagelist.h" + #include +#include #include namespace BlackGui diff --git a/src/blackgui/models/namevariantpairlistmodel.cpp b/src/blackgui/models/namevariantpairlistmodel.cpp index 1e63aebce..f00eca28a 100644 --- a/src/blackgui/models/namevariantpairlistmodel.cpp +++ b/src/blackgui/models/namevariantpairlistmodel.cpp @@ -7,7 +7,16 @@ * contained in the LICENSE file. */ -#include "namevariantpairlistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/namevariantpairlistmodel.h" +#include "blackmisc/compare.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/propertyindexvariantmap.h" + +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/models/namevariantpairlistmodel.h b/src/blackgui/models/namevariantpairlistmodel.h index f7dd7ad08..72c46baac 100644 --- a/src/blackgui/models/namevariantpairlistmodel.h +++ b/src/blackgui/models/namevariantpairlistmodel.h @@ -13,10 +13,19 @@ #define BLACKGUI_NAMEVARIANTLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/namevariantpairlist.h" #include "blackgui/models/listmodelbase.h" -#include -#include +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/variant.h" + +#include + +class QObject; + +namespace BlackMisc +{ + class CIcon; + class CNameVariantPair; +} namespace BlackGui { diff --git a/src/blackgui/models/serverlistmodel.cpp b/src/blackgui/models/serverlistmodel.cpp index 8a5b8bcd8..2687faa96 100644 --- a/src/blackgui/models/serverlistmodel.cpp +++ b/src/blackgui/models/serverlistmodel.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "serverlistmodel.h" -#include -#include +#include "blackgui/models/columns.h" +#include "blackgui/models/serverlistmodel.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/user.h" + +#include using namespace BlackMisc::Network; diff --git a/src/blackgui/models/serverlistmodel.h b/src/blackgui/models/serverlistmodel.h index fdb042cec..0e0fb87e2 100644 --- a/src/blackgui/models/serverlistmodel.h +++ b/src/blackgui/models/serverlistmodel.h @@ -13,9 +13,12 @@ #define BLACKGUI_SERVERLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/network/serverlist.h" #include "blackgui/models/listmodelbase.h" -#include +#include "blackmisc/network/serverlist.h" + +class QObject; + +namespace BlackMisc { namespace Network { class CServer; } } namespace BlackGui { diff --git a/src/blackgui/models/simulatedaircraftlistmodel.cpp b/src/blackgui/models/simulatedaircraftlistmodel.cpp index 483dae35f..908ac5ec1 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.cpp +++ b/src/blackgui/models/simulatedaircraftlistmodel.cpp @@ -7,9 +7,21 @@ * contained in the LICENSE file. */ -#include "simulatedaircraftlistmodel.h" -#include "blackmisc/network/user.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/simulatedaircraftlistmodel.h" #include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/modulator.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/network/user.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/simulatedaircraft.h" + +#include +#include +#include using namespace BlackMisc::Simulation; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/simulatedaircraftlistmodel.h b/src/blackgui/models/simulatedaircraftlistmodel.h index 2b2fd0d9d..e84d0d0c1 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.h +++ b/src/blackgui/models/simulatedaircraftlistmodel.h @@ -13,10 +13,12 @@ #define BLACKGUI_SIMULATEDAIRCRAFTLISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackgui/models/listmodelbase.h" -#include -#include +#include "blackmisc/simulation/simulatedaircraftlist.h" + +class QObject; + +namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } } namespace BlackGui { diff --git a/src/blackgui/models/statusmessagelistmodel.cpp b/src/blackgui/models/statusmessagelistmodel.cpp index 69175f457..a4d9579c0 100644 --- a/src/blackgui/models/statusmessagelistmodel.cpp +++ b/src/blackgui/models/statusmessagelistmodel.cpp @@ -7,11 +7,14 @@ * contained in the LICENSE file. */ -#include "statusmessagelistmodel.h" -#include "blackmisc/icon.h" -#include -#include -#include +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/statusmessagelistmodel.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/timestampbased.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/models/statusmessagelistmodel.h b/src/blackgui/models/statusmessagelistmodel.h index eb2bd438e..da36bbe12 100644 --- a/src/blackgui/models/statusmessagelistmodel.h +++ b/src/blackgui/models/statusmessagelistmodel.h @@ -13,10 +13,11 @@ #define BLACKGUI_STATUSMESSAGELISTMODEL_H #include "blackgui/blackguiexport.h" -#include -#include -#include "blackmisc/statusmessagelist.h" #include "blackgui/models/listmodelbase.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" + +class QObject; namespace BlackGui { diff --git a/src/blackgui/models/textmessagelistmodel.cpp b/src/blackgui/models/textmessagelistmodel.cpp index 26d27f9df..b454c242e 100644 --- a/src/blackgui/models/textmessagelistmodel.cpp +++ b/src/blackgui/models/textmessagelistmodel.cpp @@ -7,7 +7,17 @@ * contained in the LICENSE file. */ -#include "textmessagelistmodel.h" +#include "blackgui/models/columnformatters.h" +#include "blackgui/models/columns.h" +#include "blackgui/models/textmessagelistmodel.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/timestampbased.h" + +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; diff --git a/src/blackgui/models/textmessagelistmodel.h b/src/blackgui/models/textmessagelistmodel.h index b5de60242..944fa36e1 100644 --- a/src/blackgui/models/textmessagelistmodel.h +++ b/src/blackgui/models/textmessagelistmodel.h @@ -13,11 +13,12 @@ #define BLACKGUI_TEXTMESSAGELISTMODEL_H #include "blackgui/blackguiexport.h" -#include "blackmisc/network/textmessagelist.h" #include "blackgui/models/listmodelbase.h" -#include -#include -#include +#include "blackmisc/network/textmessagelist.h" + +class QObject; + +namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackGui { diff --git a/src/blackgui/models/userlistmodel.cpp b/src/blackgui/models/userlistmodel.cpp index f04b33527..139758f9e 100644 --- a/src/blackgui/models/userlistmodel.cpp +++ b/src/blackgui/models/userlistmodel.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "userlistmodel.h" -#include -#include +#include "blackgui/models/columns.h" +#include "blackgui/models/userlistmodel.h" +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/propertyindexvariantmap.h" + +#include +#include +#include using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/models/userlistmodel.h b/src/blackgui/models/userlistmodel.h index aeeabddf0..69829a60f 100644 --- a/src/blackgui/models/userlistmodel.h +++ b/src/blackgui/models/userlistmodel.h @@ -13,9 +13,11 @@ #define BLACKGUI_USERLISTMODEL_H #include "blackgui/blackguiexport.h" -#include -#include "blackmisc/network/userlist.h" #include "blackgui/models/listmodelbase.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/userlist.h" + +class QObject; namespace BlackGui { diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index 0e533b43c..00af5abd6 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -8,9 +8,29 @@ */ #include "blackgui/overlaymessages.h" +#include "blackgui/components/statusmessageform.h" +#include "blackgui/components/statusmessageformsmall.h" #include "blackgui/guiapplication.h" +#include "blackgui/models/statusmessagelistmodel.h" +#include "blackgui/stylesheetutility.h" +#include "blackgui/views/statusmessageview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/network/textmessage.h" #include "ui_overlaymessages.h" + #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/overlaymessages.h b/src/blackgui/overlaymessages.h index 9905f4b89..f70e52110 100644 --- a/src/blackgui/overlaymessages.h +++ b/src/blackgui/overlaymessages.h @@ -13,16 +13,25 @@ #define BLACKGUI_OVERLAYMESSAGES_H #include "blackgui/blackguiexport.h" -#include "blackmisc/network/textmessage.h" -#include "blackmisc/statusmessagelist.h" #include "blackmisc/pixmap.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" #include "blackmisc/variant.h" + #include -#include -#include #include +#include +#include +#include +#include #include +class QKeyEvent; +class QPaintEvent; +class QPixmap; +class QWidget; + +namespace BlackMisc { namespace Network { class CTextMessage; } } namespace Ui { class COverlayMessages; } namespace BlackGui diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp index 10b06c3ad..474871e82 100644 --- a/src/blackgui/overlaymessagesframe.cpp +++ b/src/blackgui/overlaymessagesframe.cpp @@ -8,9 +8,15 @@ */ #include "blackgui/overlaymessagesframe.h" +#include "blackgui/overlaymessages.h" #include "blackgui/stylesheetutility.h" -#include +#include "blackmisc/network/textmessage.h" + #include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h index 9a3c8c30f..2a178acfa 100644 --- a/src/blackgui/overlaymessagesframe.h +++ b/src/blackgui/overlaymessagesframe.h @@ -13,11 +13,28 @@ #define BLACKGUI_OVERLAYMESSAGES_FRAME_H #include "blackgui/blackguiexport.h" -#include "blackgui/overlaymessages.h" +#include "blackmisc/pixmap.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/variant.h" + #include +#include +#include +#include +#include +#include + +class QKeyEvent; +class QPaintEvent; +class QWidget; + +namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackGui { + class COverlayMessages; + /*! * Display status messages (nested in another widget) */ diff --git a/src/blackgui/pluginconfig.h b/src/blackgui/pluginconfig.h index 40482af54..cfdeaf8bd 100644 --- a/src/blackgui/pluginconfig.h +++ b/src/blackgui/pluginconfig.h @@ -13,8 +13,8 @@ #define BLACKGUI_PLUGINCONFIG_H #include "blackgui/blackguiexport.h" -#include -#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/pluginconfigwindow.cpp b/src/blackgui/pluginconfigwindow.cpp index c974f4214..820d86c71 100644 --- a/src/blackgui/pluginconfigwindow.cpp +++ b/src/blackgui/pluginconfigwindow.cpp @@ -1,7 +1,10 @@ -#include "pluginconfigwindow.h" -#include +#include "blackgui/pluginconfigwindow.h" + #include +#include #include +#include +#include namespace BlackGui { diff --git a/src/blackgui/pluginconfigwindow.h b/src/blackgui/pluginconfigwindow.h index a90bb195c..8399e6ff0 100644 --- a/src/blackgui/pluginconfigwindow.h +++ b/src/blackgui/pluginconfigwindow.h @@ -13,8 +13,12 @@ #define BLACKGUI_PLUGINCONFIGWINDOW_H #include "blackgui/blackguiexport.h" + +#include #include +class QShowEvent; + namespace BlackGui { /** diff --git a/src/blackgui/plugindetailswindow.cpp b/src/blackgui/plugindetailswindow.cpp index eaee17bf3..227fb8742 100644 --- a/src/blackgui/plugindetailswindow.cpp +++ b/src/blackgui/plugindetailswindow.cpp @@ -7,10 +7,17 @@ * contained in the LICENSE file. */ -#include "plugindetailswindow.h" +#include "blackgui/plugindetailswindow.h" #include "ui_plugindetailswindow.h" +#include #include +#include +#include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/plugindetailswindow.h b/src/blackgui/plugindetailswindow.h index 3165102ed..4e2e1a601 100644 --- a/src/blackgui/plugindetailswindow.h +++ b/src/blackgui/plugindetailswindow.h @@ -14,8 +14,13 @@ #include "blackgui/blackguiexport.h" +#include +#include +#include #include +class QShowEvent; + namespace Ui { class CPluginDetailsWindow; } namespace BlackGui diff --git a/src/blackgui/pluginselector.cpp b/src/blackgui/pluginselector.cpp index 8978c0881..bcf96da91 100644 --- a/src/blackgui/pluginselector.cpp +++ b/src/blackgui/pluginselector.cpp @@ -7,13 +7,17 @@ * contained in the LICENSE file. */ -#include "pluginselector.h" +#include "blackgui/pluginselector.h" #include #include -#include +#include #include +#include +#include #include +#include +#include namespace BlackGui { diff --git a/src/blackgui/pluginselector.h b/src/blackgui/pluginselector.h index c53a35a9c..14a5704e8 100644 --- a/src/blackgui/pluginselector.h +++ b/src/blackgui/pluginselector.h @@ -14,8 +14,11 @@ #include "blackgui/blackguiexport.h" +#include +#include #include -#include + +class QSignalMapper; namespace BlackGui { diff --git a/src/blackgui/registermetadata.cpp b/src/blackgui/registermetadata.cpp index fc0ac7f50..543623130 100644 --- a/src/blackgui/registermetadata.cpp +++ b/src/blackgui/registermetadata.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "registermetadata.h" -#include "components/registermetadatacomponents.h" +#include "blackgui/registermetadata.h" +#include "blackgui/components/registermetadatacomponents.h" namespace BlackGui { diff --git a/src/blackgui/shortcut.cpp b/src/blackgui/shortcut.cpp index 2b92abdc3..a4ba40ab2 100644 --- a/src/blackgui/shortcut.cpp +++ b/src/blackgui/shortcut.cpp @@ -9,7 +9,10 @@ * Class based on qLed: Copyright (C) 2010 by P. Sereno, http://www.sereno-online.com */ -#include "shortcut.h" +#include "blackgui/shortcut.h" + +#include +#include namespace BlackGui { diff --git a/src/blackgui/shortcut.h b/src/blackgui/shortcut.h index 804e3c6a4..2a5a9076f 100644 --- a/src/blackgui/shortcut.h +++ b/src/blackgui/shortcut.h @@ -15,7 +15,8 @@ #define BLACKGUI_SHORTCUT_H #include "blackgui/blackguiexport.h" -#include + +class QKeySequence; namespace BlackGui { diff --git a/src/blackgui/showhidebar.cpp b/src/blackgui/showhidebar.cpp index e369448ce..38276f095 100644 --- a/src/blackgui/showhidebar.cpp +++ b/src/blackgui/showhidebar.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "showhidebar.h" +#include "blackgui/showhidebar.h" #include "ui_showhidebar.h" +#include + namespace BlackGui { diff --git a/src/blackgui/showhidebar.h b/src/blackgui/showhidebar.h index 352142b85..b10c61dbc 100644 --- a/src/blackgui/showhidebar.h +++ b/src/blackgui/showhidebar.h @@ -13,7 +13,12 @@ #define BLACKGUI_SHOWHIDEBAR_H #include "blackgui/blackguiexport.h" + #include +#include +#include + +class QWidget; namespace Ui { class CShowHideBar; } diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 639272224..e9c656e2c 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -7,16 +7,25 @@ * contained in the LICENSE file. */ -#include "stylesheetutility.h" +#include "blackgui/stylesheetutility.h" #include "blackmisc/fileutils.h" +#include "blackmisc/restricted.h" + +#include #include #include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackgui/stylesheetutility.h b/src/blackgui/stylesheetutility.h index bbfd0ef87..e15e2bfff 100644 --- a/src/blackgui/stylesheetutility.h +++ b/src/blackgui/stylesheetutility.h @@ -14,14 +14,18 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/restricted.h" + +#include #include #include -#include -#include -#include #include #include -#include +#include +#include +#include + +class QFont; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/systemtraywindow.cpp b/src/blackgui/systemtraywindow.cpp index 004106a59..5801343cc 100644 --- a/src/blackgui/systemtraywindow.cpp +++ b/src/blackgui/systemtraywindow.cpp @@ -7,16 +7,17 @@ * contained in the LICENSE file. */ -#include "systemtraywindow.h" -#include "blackmisc/icons.h" -#include -#include -#include -#include -#include -#include +#include "blackgui/systemtraywindow.h" -using namespace BlackMisc; +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackGui { diff --git a/src/blackgui/systemtraywindow.h b/src/blackgui/systemtraywindow.h index 4fb095104..543465013 100644 --- a/src/blackgui/systemtraywindow.h +++ b/src/blackgui/systemtraywindow.h @@ -13,10 +13,20 @@ #define BLACKGUI_ENABLEFORSYSTEMTRAY_H #include "blackgui/blackguiexport.h" + +#include +#include +#include #include +#include +#include #include -#include -#include + +class QAction; +class QCloseEvent; +class QEvent; +class QMenu; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/textmessagetextedit.cpp b/src/blackgui/textmessagetextedit.cpp index 05f4a66a2..9cb96b1b6 100644 --- a/src/blackgui/textmessagetextedit.cpp +++ b/src/blackgui/textmessagetextedit.cpp @@ -7,11 +7,22 @@ * contained in the LICENSE file. */ -#include "textmessagetextedit.h" +#include "blackgui/guiapplication.h" +#include "blackgui/stylesheetutility.h" +#include "blackgui/textmessagetextedit.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/icon.h" #include "blackmisc/iconlist.h" -#include "stylesheetutility.h" -#include "guiapplication.h" +#include "blackmisc/icons.h" +#include "blackmisc/network/textmessage.h" + +#include #include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/textmessagetextedit.h b/src/blackgui/textmessagetextedit.h index dbaea8e56..35bd18eb3 100644 --- a/src/blackgui/textmessagetextedit.h +++ b/src/blackgui/textmessagetextedit.h @@ -14,8 +14,17 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/network/textmessagelist.h" + +#include +#include #include -#include + +class QAction; +class QPoint; +class QTextDocument; +class QWidget; + +namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackGui { diff --git a/src/blackgui/ticklabel.cpp b/src/blackgui/ticklabel.cpp index 4c852ed04..c0dc992ff 100644 --- a/src/blackgui/ticklabel.cpp +++ b/src/blackgui/ticklabel.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "ticklabel.h" +#include "blackgui/ticklabel.h" #include "blackmisc/icons.h" using namespace BlackMisc; diff --git a/src/blackgui/ticklabel.h b/src/blackgui/ticklabel.h index 7aae5a649..f58581b22 100644 --- a/src/blackgui/ticklabel.h +++ b/src/blackgui/ticklabel.h @@ -14,8 +14,13 @@ #include "blackgui/blackguiexport.h" #include "blackmisc/icons.h" + #include +#include #include +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/uppercasevalidator.cpp b/src/blackgui/uppercasevalidator.cpp index 7b2c6643f..7642fa32c 100644 --- a/src/blackgui/uppercasevalidator.cpp +++ b/src/blackgui/uppercasevalidator.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "uppercasevalidator.h" +#include "blackgui/uppercasevalidator.h" + +#include +#include namespace BlackGui { diff --git a/src/blackgui/uppercasevalidator.h b/src/blackgui/uppercasevalidator.h index c81d2c245..574a5999d 100644 --- a/src/blackgui/uppercasevalidator.h +++ b/src/blackgui/uppercasevalidator.h @@ -13,8 +13,12 @@ #define BLACKGUI_UPPERCASEVALIDATOR_H #include "blackgui/blackguiexport.h" + #include +class QObject; +class QString; + namespace BlackGui { //! Forces uppercase diff --git a/src/blackgui/views/aircrafticaoview.cpp b/src/blackgui/views/aircrafticaoview.cpp index 2fe51511d..67cafee68 100644 --- a/src/blackgui/views/aircrafticaoview.cpp +++ b/src/blackgui/views/aircrafticaoview.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "aircrafticaoview.h" -#include +#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/views/aircrafticaoview.h" +#include "blackgui/views/viewbase.h" using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/aircrafticaoview.h b/src/blackgui/views/aircrafticaoview.h index 8621c780b..1708f9dbc 100644 --- a/src/blackgui/views/aircrafticaoview.h +++ b/src/blackgui/views/aircrafticaoview.h @@ -13,8 +13,19 @@ #define BLACKGUI_AIRCRAFTICAOVIEW_H #include "blackgui/blackguiexport.h" -#include "viewdbobjects.h" -#include "../models/aircrafticaolistmodel.h" +#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/views/viewdbobjects.h" + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CAircraftIcaoCode; + class CAircraftIcaoCodeList; + } +} namespace BlackGui { diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp index a1d9f0ac8..3ca2ef02f 100644 --- a/src/blackgui/views/aircraftmodelview.cpp +++ b/src/blackgui/views/aircraftmodelview.cpp @@ -7,20 +7,32 @@ * contained in the LICENSE file. */ -#include "aircraftmodelview.h" -#include "blackmisc/aviation/aircrafticaocodelist.h" -#include "blackmisc/aviation/airlineicaocodelist.h" -#include "blackmisc/aviation/liverylist.h" -#include "blackmisc/simulation/distributorlist.h" -#include "blackmisc/simulation/simulatorinfolist.h" -#include "blackgui/shortcut.h" +#include "blackgui/filters/aircraftmodelfilterdialog.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackgui/filters/aircraftmodelfilterdialog.h" -#include +#include "blackgui/menus/menuaction.h" +#include "blackgui/shortcut.h" +#include "blackgui/views/aircraftmodelview.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/icons.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfolist.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/variant.h" + +#include +#include +#include #include -#include -#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/views/aircraftmodelview.h b/src/blackgui/views/aircraftmodelview.h index 81e2b9a83..5a4a34fe6 100644 --- a/src/blackgui/views/aircraftmodelview.h +++ b/src/blackgui/views/aircraftmodelview.h @@ -13,12 +13,40 @@ #define BLACKGUI_AIRCRAFTMODELVIEW_H #include "blackgui/blackguiexport.h" -#include "blackgui/filters/aircraftmodelfilterdialog.h" #include "blackgui/models/aircraftmodellistmodel.h" -#include "viewdbobjects.h" +#include "blackgui/views/viewdbobjects.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include +#include +#include +#include + +class QDropEvent; +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CAircraftIcaoCode; + class CLivery; + } +} +namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackGui { + namespace Filters { class CAircraftModelFilterDialog; } + namespace Menus { class CMenuActions; } + namespace Views { //! Aircraft view diff --git a/src/blackgui/views/airlineicaoview.cpp b/src/blackgui/views/airlineicaoview.cpp index 649595b0e..4da58ab14 100644 --- a/src/blackgui/views/airlineicaoview.cpp +++ b/src/blackgui/views/airlineicaoview.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "airlineicaoview.h" -#include +#include "blackgui/models/airlineicaolistmodel.h" +#include "blackgui/views/airlineicaoview.h" +#include "blackgui/views/viewbase.h" using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/airlineicaoview.h b/src/blackgui/views/airlineicaoview.h index 0276491c0..dc8370185 100644 --- a/src/blackgui/views/airlineicaoview.h +++ b/src/blackgui/views/airlineicaoview.h @@ -13,8 +13,19 @@ #define BLACKGUI_AIRLINEICAOVIEW_H #include "blackgui/blackguiexport.h" -#include "viewdbobjects.h" -#include "../models/airlineicaolistmodel.h" +#include "blackgui/models/airlineicaolistmodel.h" +#include "blackgui/views/viewdbobjects.h" + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CAirlineIcaoCode; + class CAirlineIcaoCodeList; + } +} namespace BlackGui { diff --git a/src/blackgui/views/airportview.cpp b/src/blackgui/views/airportview.cpp index 3fefff6e0..40a09485f 100644 --- a/src/blackgui/views/airportview.cpp +++ b/src/blackgui/views/airportview.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "airportview.h" -#include +#include "blackgui/models/airportlistmodel.h" +#include "blackgui/views/airportview.h" using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/airportview.h b/src/blackgui/views/airportview.h index 10fb287c1..fe1c2ead7 100644 --- a/src/blackgui/views/airportview.h +++ b/src/blackgui/views/airportview.h @@ -13,8 +13,13 @@ #define BLACKGUI_AIRPORTVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/airportlistmodel.h" +#include "blackgui/models/airportlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/airportlist.h" + +class QWidget; + +namespace BlackMisc { namespace Aviation { class CAirport; } } namespace BlackGui { diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp index 328da196b..0105a95be 100644 --- a/src/blackgui/views/atcstationview.cpp +++ b/src/blackgui/views/atcstationview.cpp @@ -7,11 +7,16 @@ * contained in the LICENSE file. */ -#include "atcstationview.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/models/atcstationlistmodel.h" +#include "blackgui/views/atcstationview.h" #include "blackmisc/aviation/atcstationlist.h" -#include "blackmisc/testing.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/buildconfig.h" -#include +#include "blackmisc/icons.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h index 1df43d8d9..1d300e433 100644 --- a/src/blackgui/views/atcstationview.h +++ b/src/blackgui/views/atcstationview.h @@ -7,17 +7,31 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKGUI_ATCSTATIONVIEW_H #define BLACKGUI_ATCSTATIONVIEW_H -//! \file - #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/atcstationlistmodel.h" +#include "blackgui/models/atcstationlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/pq/frequency.h" + +#include +#include + +class QAction; +class QWidget; + +namespace BlackMisc { namespace Aviation { class CCallsign; } } namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Views { //! ATC stations view diff --git a/src/blackgui/views/checkboxdelegate.cpp b/src/blackgui/views/checkboxdelegate.cpp index aa7cc7fe3..3db075596 100644 --- a/src/blackgui/views/checkboxdelegate.cpp +++ b/src/blackgui/views/checkboxdelegate.cpp @@ -7,8 +7,16 @@ * contained in the LICENSE file. */ -#include "checkboxdelegate.h" -#include "../stylesheetutility.h" +#include "blackgui/stylesheetutility.h" +#include "blackgui/views/checkboxdelegate.h" + +#include +#include +#include +#include +#include +#include +#include using namespace BlackGui; diff --git a/src/blackgui/views/checkboxdelegate.h b/src/blackgui/views/checkboxdelegate.h index d0c516132..7c5071bfa 100644 --- a/src/blackgui/views/checkboxdelegate.h +++ b/src/blackgui/views/checkboxdelegate.h @@ -13,8 +13,16 @@ #define BLACKGUI_CCOLUMNCHECKBOXDELEGATE_H #include "blackgui/blackguiexport.h" + #include -#include +#include +#include +#include + +class QAbstractItemModel; +class QModelIndex; +class QStyleOptionViewItem; +class QWidget; namespace BlackGui { diff --git a/src/blackgui/views/clientview.cpp b/src/blackgui/views/clientview.cpp index 094ff0f08..97ca0eeaf 100644 --- a/src/blackgui/views/clientview.cpp +++ b/src/blackgui/views/clientview.cpp @@ -7,9 +7,8 @@ * contained in the LICENSE file. */ -#include "clientview.h" -#include -#include +#include "blackgui/models/clientlistmodel.h" +#include "blackgui/views/clientview.h" using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/clientview.h b/src/blackgui/views/clientview.h index ef0b77ce5..116d398a7 100644 --- a/src/blackgui/views/clientview.h +++ b/src/blackgui/views/clientview.h @@ -7,14 +7,19 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKGUI_CLIENTVIEW_H #define BLACKGUI_CLIENTVIEW_H -//! \file - #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/clientlistmodel.h" +#include "blackgui/models/clientlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/network/clientlist.h" + +class QWidget; + +namespace BlackMisc { namespace Network { class CClient; } } namespace BlackGui { diff --git a/src/blackgui/views/countryview.cpp b/src/blackgui/views/countryview.cpp index 59a5b26b9..7f2bab9f5 100644 --- a/src/blackgui/views/countryview.cpp +++ b/src/blackgui/views/countryview.cpp @@ -7,8 +7,7 @@ * contained in the LICENSE file. */ -#include "countryview.h" -#include +#include "blackgui/views/countryview.h" using namespace BlackGui::Models; diff --git a/src/blackgui/views/countryview.h b/src/blackgui/views/countryview.h index d5ec6a87f..7121f4fb6 100644 --- a/src/blackgui/views/countryview.h +++ b/src/blackgui/views/countryview.h @@ -12,9 +12,14 @@ #ifndef BLACKGUI_COUNTRYVIEW_H #define BLACKGUI_COUNTRYVIEW_H -#include "viewbase.h" #include "blackgui/blackguiexport.h" #include "blackgui/models/countrylistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/countrylist.h" + +class QWidget; + +namespace BlackMisc { class CCountry; } namespace BlackGui { diff --git a/src/blackgui/views/distributorview.cpp b/src/blackgui/views/distributorview.cpp index ecda4ede7..d34b82a6e 100644 --- a/src/blackgui/views/distributorview.cpp +++ b/src/blackgui/views/distributorview.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "distributorview.h" -#include +#include "blackgui/models/distributorlistmodel.h" +#include "blackgui/views/distributorview.h" +#include "blackgui/views/viewbase.h" using namespace BlackGui::Models; diff --git a/src/blackgui/views/distributorview.h b/src/blackgui/views/distributorview.h index e3f0e1bb6..b18624c0f 100644 --- a/src/blackgui/views/distributorview.h +++ b/src/blackgui/views/distributorview.h @@ -13,8 +13,20 @@ #define BLACKGUI_DISTRIBUTORVIEW_H #include "blackgui/blackguiexport.h" -#include "viewdbobjects.h" -#include "../models/distributorlistmodel.h" +#include "blackgui/models/distributorlistmodel.h" +#include "blackgui/views/viewdbobjects.h" + +class QString; +class QWidget; + +namespace BlackMisc +{ + namespace Simulation + { + class CDistributor; + class CDistributorList; + } +} namespace BlackGui { diff --git a/src/blackgui/views/identifierview.cpp b/src/blackgui/views/identifierview.cpp index 17ac11419..9361c313d 100644 --- a/src/blackgui/views/identifierview.cpp +++ b/src/blackgui/views/identifierview.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "identifierview.h" -#include +#include "blackgui/models/identifierlistmodel.h" +#include "blackgui/views/identifierview.h" using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/identifierview.h b/src/blackgui/views/identifierview.h index 35df04272..84f5ef50e 100644 --- a/src/blackgui/views/identifierview.h +++ b/src/blackgui/views/identifierview.h @@ -13,8 +13,13 @@ #define BLACKGUI_IDENTIFIERVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/identifierlistmodel.h" +#include "blackgui/models/identifierlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/identifierlist.h" + +class QWidget; + +namespace BlackMisc { class CIdentifier; } namespace BlackGui { diff --git a/src/blackgui/views/liveryview.cpp b/src/blackgui/views/liveryview.cpp index cd411947d..baf570e3c 100644 --- a/src/blackgui/views/liveryview.cpp +++ b/src/blackgui/views/liveryview.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "liveryview.h" -#include +#include "blackgui/views/liveryview.h" +#include "blackgui/views/viewbase.h" using namespace BlackGui::Models; diff --git a/src/blackgui/views/liveryview.h b/src/blackgui/views/liveryview.h index e4382e59b..ef2946fee 100644 --- a/src/blackgui/views/liveryview.h +++ b/src/blackgui/views/liveryview.h @@ -12,9 +12,20 @@ #ifndef BLACKGUI_LIVERYVIEW_H #define BLACKGUI_LIVERYVIEW_H -#include "viewdbobjects.h" #include "blackgui/blackguiexport.h" #include "blackgui/models/liverylistmodel.h" +#include "blackgui/views/viewdbobjects.h" + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation + { + class CLivery; + class CLiveryList; + } +} namespace BlackGui { diff --git a/src/blackgui/views/namevariantpairview.cpp b/src/blackgui/views/namevariantpairview.cpp index 430644770..302c2eaed 100644 --- a/src/blackgui/views/namevariantpairview.cpp +++ b/src/blackgui/views/namevariantpairview.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "namevariantpairview.h" -#include +#include "blackgui/models/namevariantpairlistmodel.h" +#include "blackgui/views/namevariantpairview.h" + +#include using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/namevariantpairview.h b/src/blackgui/views/namevariantpairview.h index 236865770..be5ca9dbe 100644 --- a/src/blackgui/views/namevariantpairview.h +++ b/src/blackgui/views/namevariantpairview.h @@ -13,8 +13,17 @@ #define BLACKGUI_NAMEVARIANTPAIRVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/namevariantpairlistmodel.h" +#include "blackgui/models/namevariantpairlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/icon.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/variant.h" + +#include + +class QWidget; + +namespace BlackMisc { class CNameVariantPair; } namespace BlackGui { diff --git a/src/blackgui/views/serverview.cpp b/src/blackgui/views/serverview.cpp index f4a011f48..188bee590 100644 --- a/src/blackgui/views/serverview.cpp +++ b/src/blackgui/views/serverview.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "serverview.h" -#include +#include "blackgui/models/serverlistmodel.h" +#include "blackgui/views/serverview.h" + using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/serverview.h b/src/blackgui/views/serverview.h index 781f4b43f..a7dc617b2 100644 --- a/src/blackgui/views/serverview.h +++ b/src/blackgui/views/serverview.h @@ -13,8 +13,13 @@ #define BLACKGUI_SERVERVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/serverlistmodel.h" +#include "blackgui/models/serverlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/network/serverlist.h" + +class QWidget; + +namespace BlackMisc { namespace Network { class CServer; } } namespace BlackGui { diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp index c021032fc..a6d33b4b2 100644 --- a/src/blackgui/views/simulatedaircraftview.cpp +++ b/src/blackgui/views/simulatedaircraftview.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "simulatedaircraftview.h" +#include "blackgui/models/simulatedaircraftlistmodel.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/views/simulatedaircraftview.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/buildconfig.h" -#include +#include "blackmisc/icons.h" +#include "blackmisc/simulation/simulatedaircraft.h" + +#include using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/views/simulatedaircraftview.h b/src/blackgui/views/simulatedaircraftview.h index ba2dad97c..d2489e3f4 100644 --- a/src/blackgui/views/simulatedaircraftview.h +++ b/src/blackgui/views/simulatedaircraftview.h @@ -13,12 +13,24 @@ #define BLACKGUI_SIMULATEDAIRCRAFTVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/simulatedaircraftlistmodel.h" -#include +#include "blackgui/models/simulatedaircraftlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" + +#include + +class QWidget; + +namespace BlackMisc +{ + namespace Aviation { class CCallsign; } + namespace Simulation { class CSimulatedAircraft; } +} namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Views { //! Aircraft view diff --git a/src/blackgui/views/statusmessageview.cpp b/src/blackgui/views/statusmessageview.cpp index 1a5847049..4a27568de 100644 --- a/src/blackgui/views/statusmessageview.cpp +++ b/src/blackgui/views/statusmessageview.cpp @@ -7,9 +7,10 @@ * contained in the LICENSE file. */ -#include "statusmessageview.h" -#include -#include +#include "blackgui/models/statusmessagelistmodel.h" +#include "blackgui/views/statusmessageview.h" + +#include using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/statusmessageview.h b/src/blackgui/views/statusmessageview.h index 83572ad35..3d44681e6 100644 --- a/src/blackgui/views/statusmessageview.h +++ b/src/blackgui/views/statusmessageview.h @@ -7,14 +7,20 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKGUI_STATUSMESSAGEVIEW_H #define BLACKGUI_STATUSMESSAGEVIEW_H -//! \file - #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/statusmessagelistmodel.h" +#include "blackgui/models/statusmessagelistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" + +#include + +class QWidget; namespace BlackGui { diff --git a/src/blackgui/views/textmessageview.cpp b/src/blackgui/views/textmessageview.cpp index 6f2d7c014..a25b8bd84 100644 --- a/src/blackgui/views/textmessageview.cpp +++ b/src/blackgui/views/textmessageview.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "textmessageview.h" -#include +#include "blackgui/models/textmessagelistmodel.h" +#include "blackgui/views/textmessageview.h" + +#include using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/textmessageview.h b/src/blackgui/views/textmessageview.h index 52d973eab..6b1483815 100644 --- a/src/blackgui/views/textmessageview.h +++ b/src/blackgui/views/textmessageview.h @@ -13,8 +13,13 @@ #define BLACKGUI_TEXTMESSAGEVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/textmessagelistmodel.h" +#include "blackgui/models/textmessagelistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/network/textmessagelist.h" + +class QWidget; + +namespace BlackMisc { namespace Network { class CTextMessage; } } namespace BlackGui { diff --git a/src/blackgui/views/userview.cpp b/src/blackgui/views/userview.cpp index 871bbfef9..c7dd4a082 100644 --- a/src/blackgui/views/userview.cpp +++ b/src/blackgui/views/userview.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "userview.h" -#include +#include "blackgui/models/userlistmodel.h" +#include "blackgui/views/userview.h" + +#include using namespace BlackMisc; using namespace BlackGui::Models; diff --git a/src/blackgui/views/userview.h b/src/blackgui/views/userview.h index 86148f918..3a7bff5e6 100644 --- a/src/blackgui/views/userview.h +++ b/src/blackgui/views/userview.h @@ -13,8 +13,12 @@ #define BLACKGUI_USERVIEW_H #include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include "../models/userlistmodel.h" +#include "blackgui/models/userlistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/network/userlist.h" + +class QWidget; +namespace BlackMisc { namespace Network { class CUser; } } namespace BlackGui { diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 0059374ec..c0594e92f 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -7,28 +7,75 @@ * contained in the LICENSE file. */ -#include "viewbase.h" -#include "blackmisc/fileutils.h" -#include "blackmisc/buildconfig.h" +#include "blackgui/dockwidgetinfoarea.h" +#include "blackgui/filters/filterdialog.h" +#include "blackgui/filters/filterwidget.h" +#include "blackgui/guiapplication.h" +#include "blackgui/guiutility.h" +#include "blackgui/loadindicator.h" #include "blackgui/models/allmodels.h" #include "blackgui/menus/menuaction.h" -#include "blackgui/stylesheetutility.h" -#include "blackgui/guiutility.h" -#include "blackgui/guiapplication.h" +#include "blackgui/menus/menudelegate.h" #include "blackgui/shortcut.h" -#include "blackcore/registermetadata.h" -#include -#include -#include +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/airport.h" +#include "blackmisc/aviation/airportlist.h" +#include "blackmisc/aviation/atcstation.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/buildconfig.h" +#include "blackmisc/country.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/fileutils.h" +#include "blackmisc/icons.h" +#include "blackmisc/identifier.h" +#include "blackmisc/identifierlist.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/network/client.h" +#include "blackmisc/network/clientlist.h" +#include "blackmisc/network/server.h" +#include "blackmisc/network/serverlist.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/network/textmessagelist.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/userlist.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/propertyindexlist.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/worker.h" + #include -#include #include -#include -#include -#include -#include +#include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace BlackMisc; diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 309bb68d7..8af56c7c1 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -12,29 +12,58 @@ #ifndef BLACKGUI_VIEWBASE_H #define BLACKGUI_VIEWBASE_H -#include "blackgui/components/enablefordockwidgetinfoarea.h" -#include "blackgui/filters/filterdialog.h" -#include "blackgui/filters/filterwidget.h" -#include "blackgui/models/modelfilter.h" -#include "blackgui/menus/menudelegate.h" -#include "blackgui/menus/menuaction.h" -#include "blackgui/loadindicator.h" #include "blackgui/blackguiexport.h" -#include "blackmisc/icons.h" -#include "blackmisc/worker.h" -#include "blackmisc/variant.h" +#include "blackgui/components/enablefordockwidgetinfoarea.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/models/modelfilter.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/namevariantpairlist.h" #include "blackmisc/propertyindex.h" -#include -#include +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/variant.h" + +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class QDragEnterEvent; +class QDragLeaveEvent; +class QDragMoveEvent; +class QFont; +class QItemSelectionModel; +class QMimeData; +class QModelIndex; +class QPaintEvent; +class QPoint; +class QShowEvent; +class QWidget; + +namespace BlackMisc { class CWorker; } namespace BlackGui { + class CDockWidgetInfoArea; + class CLoadIndicator; + + namespace Filters + { + class CFilterDialog; + class CFilterWidget; + } + + namespace Menus { class IMenuDelegate; } + namespace Views { //! Non templated base class, allows Q_OBJECT and signals / slots to be used diff --git a/src/blackgui/views/viewdbobjects.cpp b/src/blackgui/views/viewdbobjects.cpp index 33567eceb..83d0450bf 100644 --- a/src/blackgui/views/viewdbobjects.cpp +++ b/src/blackgui/views/viewdbobjects.cpp @@ -7,12 +7,14 @@ * contained in the LICENSE file. */ -#include "viewdbobjects.h" -#include "blackgui/models/allmodels.h" +#include "blackgui/menus/menuaction.h" +#include "blackgui/views/viewdbobjects.h" +#include "blackmisc/icons.h" + #include -#include -#include #include +#include +#include using namespace BlackMisc; using namespace BlackGui; diff --git a/src/blackgui/views/viewdbobjects.h b/src/blackgui/views/viewdbobjects.h index 82cfe3ccd..a28b02779 100644 --- a/src/blackgui/views/viewdbobjects.h +++ b/src/blackgui/views/viewdbobjects.h @@ -12,12 +12,35 @@ #ifndef BLACKGUI_VIEWDBOBJECTS_H #define BLACKGUI_VIEWDBOBJECTS_H -#include "blackgui/blackguiexport.h" -#include "viewbase.h" -#include +#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/models/airlineicaolistmodel.h" +#include "blackgui/models/countrylistmodel.h" +#include "blackgui/models/distributorlistmodel.h" +#include "blackgui/models/liverylistmodel.h" +#include "blackgui/views/viewbase.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" + +#include +#include +#include +#include + +class QAction; +class QIntValidator; +class QLineEdit; +class QWidget; namespace BlackGui { + namespace Menus { class CMenuActions; } + namespace Views { //! Base class for views with DB objects diff --git a/src/blackgui/win/windowfinderwindows.cpp b/src/blackgui/win/windowfinderwindows.cpp index 464d54864..05834e60b 100644 --- a/src/blackgui/win/windowfinderwindows.cpp +++ b/src/blackgui/win/windowfinderwindows.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "windowfinderwindows.h" +#include "blackgui/win/windowfinderwindows.h" #include #include diff --git a/src/blackgui/win/windowfinderwindows.h b/src/blackgui/win/windowfinderwindows.h index 9fcaeb69f..eb9ce7151 100644 --- a/src/blackgui/win/windowfinderwindows.h +++ b/src/blackgui/win/windowfinderwindows.h @@ -13,7 +13,7 @@ #define BLACKGUI_WINDOWFINDERWINDOWS_H #include "blackgui/blackguiexport.h" -#include "../windowfinder.h" +#include "blackgui/windowfinder.h" namespace BlackGui { diff --git a/src/blackgui/windowfinder.cpp b/src/blackgui/windowfinder.cpp index f18d65c78..391b7c485 100644 --- a/src/blackgui/windowfinder.cpp +++ b/src/blackgui/windowfinder.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "windowfinder.h" +#include "blackgui/windowfinder.h" + +#include #if defined(Q_OS_WIN) #include "win/windowfinderwindows.h" diff --git a/src/blackmisc/simulation/simulatorplugininfolist.h b/src/blackmisc/simulation/simulatorplugininfolist.h index 92559f869..70a14a056 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.h +++ b/src/blackmisc/simulation/simulatorplugininfolist.h @@ -15,6 +15,7 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" +#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/variant.h" #include