From 3d7a39ed0003777ac05619e5db80d3db001bbe4a Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 11 May 2016 18:35:12 +0200 Subject: [PATCH] Fix BlackMisc header includes * Include only what is used * Use forward declaration when possible * Sorted includes refs #630 --- samples/blackmiscdbus/main.cpp | 1 + src/blackcore/application.cpp | 2 + src/blackcore/databasereader.h | 1 + src/blackcore/setupreader.h | 1 + src/blackcore/vatsimbookingreader.h | 1 + src/blackcore/vatsimdatafilereader.cpp | 2 + src/blackcore/vatsimdatafilereader.h | 1 + src/blackcore/vatsimmetarreader.cpp | 2 + src/blackcore/vatsimmetarreader.h | 1 + src/blackcore/vatsimstatusfilereader.cpp | 2 + src/blackcore/vatsimstatusfilereader.h | 1 + src/blackmisc/atomicfile.cpp | 7 ++- src/blackmisc/atomicfile.h | 7 ++- src/blackmisc/audio/audiodeviceinfo.cpp | 5 +- src/blackmisc/audio/audiodeviceinfo.h | 3 + src/blackmisc/audio/audiodeviceinfolist.cpp | 9 ++- src/blackmisc/audio/audiodeviceinfolist.h | 10 ++-- src/blackmisc/audio/audioutils.cpp | 2 + src/blackmisc/audio/registermetadataaudio.cpp | 2 + src/blackmisc/audio/registermetadataaudio.h | 4 +- .../audio/settings/settingsaudio.cpp | 6 +- src/blackmisc/audio/settings/settingsaudio.h | 12 ++-- src/blackmisc/audio/voiceroom.cpp | 6 +- src/blackmisc/audio/voiceroom.h | 14 +++-- src/blackmisc/audio/voiceroomlist.cpp | 7 ++- src/blackmisc/audio/voiceroomlist.h | 12 ++-- src/blackmisc/aviation/aircraftengine.cpp | 5 +- src/blackmisc/aviation/aircraftengine.h | 4 ++ src/blackmisc/aviation/aircraftenginelist.cpp | 7 ++- src/blackmisc/aviation/aircraftenginelist.h | 9 ++- src/blackmisc/aviation/aircrafticaocode.cpp | 20 +++++-- src/blackmisc/aviation/aircrafticaocode.h | 12 +++- .../aviation/aircrafticaocodelist.cpp | 7 ++- src/blackmisc/aviation/aircrafticaocodelist.h | 11 +++- src/blackmisc/aviation/aircraftlights.cpp | 4 +- src/blackmisc/aviation/aircraftlights.h | 7 ++- src/blackmisc/aviation/aircraftparts.cpp | 6 +- src/blackmisc/aviation/aircraftparts.h | 16 +++-- src/blackmisc/aviation/aircraftpartslist.cpp | 5 +- src/blackmisc/aviation/aircraftpartslist.h | 11 +++- src/blackmisc/aviation/aircraftsituation.cpp | 4 ++ src/blackmisc/aviation/aircraftsituation.h | 21 +++++-- .../aviation/aircraftsituationlist.cpp | 5 +- .../aviation/aircraftsituationlist.h | 10 +++- src/blackmisc/aviation/airlineicaocode.cpp | 18 ++++-- src/blackmisc/aviation/airlineicaocode.h | 9 ++- .../aviation/airlineicaocodelist.cpp | 7 ++- src/blackmisc/aviation/airlineicaocodelist.h | 11 +++- src/blackmisc/aviation/airport.cpp | 5 ++ src/blackmisc/aviation/airport.h | 13 ++++- src/blackmisc/aviation/airporticaocode.cpp | 5 ++ src/blackmisc/aviation/airporticaocode.h | 7 +++ src/blackmisc/aviation/airportlist.cpp | 7 ++- src/blackmisc/aviation/airportlist.h | 12 ++-- src/blackmisc/aviation/altitude.cpp | 7 ++- src/blackmisc/aviation/altitude.h | 14 ++++- src/blackmisc/aviation/atcstation.cpp | 10 +++- src/blackmisc/aviation/atcstation.h | 21 +++++-- src/blackmisc/aviation/atcstationlist.cpp | 10 ++++ src/blackmisc/aviation/atcstationlist.h | 14 +++-- src/blackmisc/aviation/callsign.cpp | 9 ++- src/blackmisc/aviation/callsign.h | 13 ++++- src/blackmisc/aviation/callsignobjectlist.cpp | 7 ++- src/blackmisc/aviation/callsignobjectlist.h | 7 +-- src/blackmisc/aviation/callsignset.cpp | 8 ++- src/blackmisc/aviation/callsignset.h | 8 ++- src/blackmisc/aviation/comsystem.cpp | 6 ++ src/blackmisc/aviation/comsystem.h | 17 +++++- src/blackmisc/aviation/flightplan.cpp | 1 + src/blackmisc/aviation/flightplan.h | 16 +++-- src/blackmisc/aviation/heading.cpp | 2 + src/blackmisc/aviation/heading.h | 13 ++++- src/blackmisc/aviation/informationmessage.h | 6 +- src/blackmisc/aviation/livery.cpp | 18 ++++-- src/blackmisc/aviation/livery.h | 15 +++-- src/blackmisc/aviation/liverylist.cpp | 5 ++ src/blackmisc/aviation/liverylist.h | 11 +++- src/blackmisc/aviation/modulator.cpp | 8 ++- src/blackmisc/aviation/modulator.h | 2 - .../aviation/registermetadataaviation.h | 4 +- src/blackmisc/aviation/selcal.cpp | 6 ++ src/blackmisc/aviation/selcal.h | 17 +++++- src/blackmisc/aviation/track.cpp | 2 + src/blackmisc/aviation/track.h | 14 ++++- src/blackmisc/aviation/transponder.cpp | 4 ++ src/blackmisc/aviation/transponder.h | 10 ++++ src/blackmisc/buildconfig.cpp | 10 +++- src/blackmisc/buildconfig.h | 6 +- src/blackmisc/collection.h | 1 + src/blackmisc/comparefunctions.h | 3 +- src/blackmisc/connectionguard.cpp | 2 +- src/blackmisc/connectionguard.h | 2 + src/blackmisc/containerbase.h | 1 + src/blackmisc/country.cpp | 6 +- src/blackmisc/country.h | 15 +++-- src/blackmisc/countrylist.cpp | 7 ++- src/blackmisc/countrylist.h | 12 +++- src/blackmisc/datacache.cpp | 19 ++++-- src/blackmisc/datacache.h | 23 +++++++- src/blackmisc/datastore.cpp | 8 ++- src/blackmisc/datastore.h | 15 +++-- src/blackmisc/datastoreobjectlist.cpp | 4 +- src/blackmisc/datastoreobjectlist.h | 6 +- src/blackmisc/datastoreutility.cpp | 12 +++- src/blackmisc/datastoreutility.h | 14 +++-- src/blackmisc/dbusserver.cpp | 10 +++- src/blackmisc/dbusserver.h | 17 +++--- src/blackmisc/dictionary.cpp | 2 +- src/blackmisc/dictionary.h | 36 +++++++++--- src/blackmisc/digestsignal.cpp | 2 +- src/blackmisc/digestsignal.h | 5 +- src/blackmisc/filedeleter.cpp | 6 +- src/blackmisc/filedeleter.h | 8 ++- src/blackmisc/filelogger.cpp | 15 +++-- src/blackmisc/filelogger.h | 11 ++-- src/blackmisc/fileutils.cpp | 14 ++++- src/blackmisc/fileutils.h | 12 +++- src/blackmisc/geo/coordinategeodetic.cpp | 8 ++- src/blackmisc/geo/coordinategeodetic.h | 8 +++ src/blackmisc/geo/earthangle.cpp | 9 ++- src/blackmisc/geo/geoobjectlist.cpp | 4 +- src/blackmisc/geo/geoobjectlist.h | 6 +- src/blackmisc/geo/registermetadatageo.h | 4 +- src/blackmisc/icon.cpp | 4 ++ src/blackmisc/icon.h | 24 ++++++-- src/blackmisc/iconlist.cpp | 8 ++- src/blackmisc/iconlist.h | 17 ++++-- src/blackmisc/icons.cpp | 12 ++-- src/blackmisc/icons.h | 12 +++- src/blackmisc/identifiable.cpp | 2 +- src/blackmisc/identifiable.h | 13 +++-- src/blackmisc/identifier.cpp | 3 +- src/blackmisc/identifier.h | 14 +++-- src/blackmisc/identifierlist.cpp | 7 ++- src/blackmisc/identifierlist.h | 11 ++-- src/blackmisc/imageutils.cpp | 5 +- src/blackmisc/imageutils.h | 1 + src/blackmisc/input/actionhotkey.cpp | 3 +- src/blackmisc/input/actionhotkey.h | 11 +++- src/blackmisc/input/actionhotkeylist.cpp | 3 + src/blackmisc/input/actionhotkeylist.h | 8 ++- src/blackmisc/input/hotkeycombination.cpp | 8 ++- src/blackmisc/input/hotkeycombination.h | 11 +++- src/blackmisc/input/joystickbutton.cpp | 2 +- src/blackmisc/input/joystickbutton.h | 8 ++- src/blackmisc/input/joystickbuttonlist.cpp | 1 - src/blackmisc/input/joystickbuttonlist.h | 7 ++- src/blackmisc/input/keyboardkey.cpp | 6 ++ src/blackmisc/input/keyboardkey.h | 8 ++- src/blackmisc/input/keyboardkeylist.cpp | 4 +- src/blackmisc/input/keyboardkeylist.h | 8 ++- src/blackmisc/input/registermetadatainput.cpp | 2 + src/blackmisc/input/registermetadatainput.h | 4 +- src/blackmisc/json.cpp | 10 +++- src/blackmisc/json.h | 21 ++++--- src/blackmisc/lockfree.h | 14 ++++- src/blackmisc/logcategory.cpp | 4 +- src/blackmisc/logcategory.h | 12 ++-- src/blackmisc/logcategorylist.cpp | 13 ++++- src/blackmisc/logcategorylist.h | 22 ++++--- src/blackmisc/loghandler.cpp | 15 ++++- src/blackmisc/loghandler.h | 18 ++++-- src/blackmisc/logpattern.cpp | 12 +++- src/blackmisc/logpattern.h | 25 ++++++-- src/blackmisc/math/mathutils.cpp | 3 + src/blackmisc/metadatautils.cpp | 3 + src/blackmisc/metadatautils.h | 7 ++- src/blackmisc/namevariantpair.cpp | 8 ++- src/blackmisc/namevariantpair.h | 13 +++-- src/blackmisc/namevariantpairlist.cpp | 6 +- src/blackmisc/namevariantpairlist.h | 13 +++-- src/blackmisc/network/authenticateduser.cpp | 9 ++- src/blackmisc/network/authenticateduser.h | 11 +++- src/blackmisc/network/client.cpp | 7 ++- src/blackmisc/network/client.h | 10 +++- src/blackmisc/network/clientlist.cpp | 5 +- src/blackmisc/network/clientlist.h | 10 ++-- src/blackmisc/network/entityflags.cpp | 6 +- src/blackmisc/network/entityflags.h | 5 +- src/blackmisc/network/networkutils.cpp | 25 ++++++-- src/blackmisc/network/networkutils.h | 20 +++++-- .../network/registermetadatanetwork.h | 4 +- src/blackmisc/network/role.cpp | 4 +- src/blackmisc/network/role.h | 8 ++- src/blackmisc/network/rolelist.cpp | 5 ++ src/blackmisc/network/rolelist.h | 10 +++- src/blackmisc/network/server.cpp | 7 ++- src/blackmisc/network/server.h | 6 ++ src/blackmisc/network/serverlist.cpp | 4 ++ src/blackmisc/network/serverlist.h | 8 ++- src/blackmisc/network/textmessage.cpp | 9 ++- src/blackmisc/network/textmessage.h | 16 +++-- src/blackmisc/network/textmessagelist.cpp | 9 ++- src/blackmisc/network/textmessagelist.h | 14 +++-- src/blackmisc/network/url.cpp | 5 +- src/blackmisc/network/url.h | 9 ++- src/blackmisc/network/urllist.cpp | 5 +- src/blackmisc/network/urllist.h | 8 ++- src/blackmisc/network/user.cpp | 9 ++- src/blackmisc/network/user.h | 11 +++- src/blackmisc/network/userlist.cpp | 5 +- src/blackmisc/network/userlist.h | 8 +-- src/blackmisc/network/voicecapabilites.cpp | 9 ++- src/blackmisc/orderable.cpp | 5 +- src/blackmisc/orderable.h | 7 ++- src/blackmisc/orderablelist.cpp | 5 +- src/blackmisc/orderablelist.h | 5 +- src/blackmisc/pixmap.cpp | 10 +++- src/blackmisc/pixmap.h | 12 +++- src/blackmisc/pq/angle.cpp | 5 +- src/blackmisc/pq/angle.h | 7 ++- src/blackmisc/pq/measurementunit.cpp | 1 + src/blackmisc/pq/measurementunit.h | 20 ++++--- src/blackmisc/pq/physicalquantity.cpp | 24 +++++++- src/blackmisc/pq/physicalquantity.h | 20 ++++--- src/blackmisc/pq/pqstring.cpp | 16 ++++- src/blackmisc/pq/pqstring.h | 4 ++ src/blackmisc/pq/registermetadatapq.cpp | 14 ++++- src/blackmisc/pq/registermetadatapq.h | 4 +- src/blackmisc/pq/time.cpp | 4 ++ src/blackmisc/pq/time.h | 8 +++ src/blackmisc/pq/units.cpp | 3 + src/blackmisc/pq/units.h | 13 ++++- src/blackmisc/propertyindex.cpp | 6 +- src/blackmisc/propertyindex.h | 20 ++++--- src/blackmisc/propertyindexlist.cpp | 5 +- src/blackmisc/propertyindexlist.h | 12 ++-- src/blackmisc/propertyindexvariantmap.cpp | 8 ++- src/blackmisc/propertyindexvariantmap.h | 23 ++++++-- src/blackmisc/registermetadata.cpp | 58 ++++++++++++------- src/blackmisc/rgbcolor.cpp | 12 +++- src/blackmisc/rgbcolor.h | 12 +++- src/blackmisc/sampleutils.cpp | 5 +- src/blackmisc/sampleutils.h | 7 ++- src/blackmisc/settingscache.cpp | 5 +- src/blackmisc/settingscache.h | 6 ++ src/blackmisc/simplecommandparser.cpp | 6 +- src/blackmisc/simplecommandparser.h | 5 +- src/blackmisc/simulation/aircraftmodel.cpp | 20 +++++-- src/blackmisc/simulation/aircraftmodel.h | 36 +++++++++--- .../simulation/aircraftmodellist.cpp | 14 ++++- src/blackmisc/simulation/aircraftmodellist.h | 25 +++++++- .../simulation/aircraftmodelloader.cpp | 7 ++- .../simulation/aircraftmodelloader.h | 11 +++- .../simulation/aircraftmodelsetloader.cpp | 5 +- .../simulation/aircraftmodelsetloader.h | 8 ++- .../simulation/aircraftmodelutils.cpp | 4 +- .../simulation/airspaceaircraftsnapshot.cpp | 6 +- .../simulation/airspaceaircraftsnapshot.h | 13 ++++- src/blackmisc/simulation/data/modelcaches.cpp | 4 +- src/blackmisc/simulation/data/modelcaches.h | 7 ++- src/blackmisc/simulation/distributor.cpp | 10 +++- src/blackmisc/simulation/distributor.h | 12 +++- src/blackmisc/simulation/distributorlist.cpp | 4 +- src/blackmisc/simulation/distributorlist.h | 11 ++-- .../simulation/distributorlistpreferences.cpp | 3 +- .../simulation/distributorlistpreferences.h | 10 ++++ .../fscommon/aircraftcfgentries.cpp | 8 ++- .../simulation/fscommon/aircraftcfgentries.h | 10 +++- .../fscommon/aircraftcfgentrieslist.cpp | 5 +- .../fscommon/aircraftcfgentrieslist.h | 18 +++--- .../simulation/fscommon/aircraftcfgparser.cpp | 24 ++++++-- .../simulation/fscommon/aircraftcfgparser.h | 15 +++-- .../simulation/fscommon/bcdconversions.cpp | 5 +- .../simulation/fscommon/bcdconversions.h | 7 ++- .../simulation/fscommon/fscommonutil.cpp | 9 ++- .../simulation/fscommon/fscommonutil.h | 3 + .../simulation/fscommon/vpilotmodelrule.cpp | 5 +- .../simulation/fscommon/vpilotmodelrule.h | 11 +++- .../fscommon/vpilotmodelruleset.cpp | 10 +++- .../simulation/fscommon/vpilotmodelruleset.h | 11 +++- .../simulation/fscommon/vpilotrulesreader.cpp | 23 +++++++- .../simulation/fscommon/vpilotrulesreader.h | 10 +++- .../simulation/fsx/fsxsimulatorsetup.cpp | 8 +-- .../simulation/fsx/fsxsimulatorsetup.h | 5 +- .../simulation/fsx/simconnectutilities.cpp | 12 +++- .../simulation/fsx/simconnectutilities.h | 4 +- .../simulation/ownaircraftprovider.cpp | 2 +- .../simulation/ownaircraftprovider.h | 19 ++++++ .../simulation/ownaircraftproviderdummy.cpp | 4 +- .../simulation/ownaircraftproviderdummy.h | 20 +++++++ .../simulation/registermetadatasimulation.cpp | 2 + .../simulation/registermetadatasimulation.h | 4 +- .../simulation/remoteaircraftprovider.cpp | 2 +- .../simulation/remoteaircraftprovider.h | 19 +++++- .../remoteaircraftproviderdummy.cpp | 18 +++++- .../simulation/remoteaircraftproviderdummy.h | 21 +++++++ .../simulation/simulatedaircraft.cpp | 11 +++- src/blackmisc/simulation/simulatedaircraft.h | 46 +++++++++++---- .../simulation/simulatedaircraftlist.cpp | 11 +++- .../simulation/simulatedaircraftlist.h | 24 ++++++-- src/blackmisc/simulation/simulation.h | 2 + src/blackmisc/simulation/simulatorinfo.cpp | 6 +- src/blackmisc/simulation/simulatorinfo.h | 9 +++ .../simulation/simulatorinfolist.cpp | 4 +- src/blackmisc/simulation/simulatorinfolist.h | 7 ++- .../simulation/simulatorplugininfo.cpp | 6 +- .../simulation/simulatorplugininfo.h | 5 ++ .../simulation/simulatorplugininfolist.cpp | 9 ++- .../simulation/simulatorplugininfolist.h | 9 ++- src/blackmisc/simulation/simulatorsetup.cpp | 6 +- src/blackmisc/simulation/simulatorsetup.h | 13 ++++- .../xplane/aircraftmodelloaderxplane.cpp | 30 +++++++--- .../xplane/aircraftmodelloaderxplane.h | 12 +++- .../simulation/xplane/navdatareference.cpp | 2 + .../simulation/xplane/navdatareference.h | 19 +++++- .../simulation/xplane/xplaneutil.cpp | 8 ++- src/blackmisc/stacktrace.cpp | 11 +++- src/blackmisc/statusexception.cpp | 6 +- src/blackmisc/statusexception.h | 8 ++- src/blackmisc/statusmessagelist.cpp | 12 +++- src/blackmisc/statusmessagelist.h | 18 ++++-- src/blackmisc/stringutils.cpp | 4 +- src/blackmisc/stringutils.h | 12 +++- src/blackmisc/testing.cpp | 20 ++++++- src/blackmisc/testing.h | 5 +- src/blackmisc/threadedreader.cpp | 11 +++- src/blackmisc/threadedreader.h | 21 +++---- src/blackmisc/threadutils.cpp | 7 ++- src/blackmisc/threadutils.h | 6 +- src/blackmisc/timestampbased.cpp | 7 ++- src/blackmisc/timestampbased.h | 8 ++- src/blackmisc/timestampobjectlist.cpp | 7 ++- src/blackmisc/timestampobjectlist.h | 8 ++- src/blackmisc/valuecache.cpp | 28 +++++++-- src/blackmisc/valuecache.h | 36 +++++++++++- src/blackmisc/variant.cpp | 22 +++++-- src/blackmisc/variant.h | 28 +++++---- src/blackmisc/variantlist.cpp | 2 +- src/blackmisc/variantlist.h | 10 ++-- src/blackmisc/variantmap.cpp | 2 + src/blackmisc/variantmap.h | 10 +++- src/blackmisc/verify.cpp | 4 +- src/blackmisc/verify.h | 1 - src/blackmisc/weather/cloudlayer.cpp | 3 +- src/blackmisc/weather/cloudlayer.h | 11 +++- src/blackmisc/weather/cloudlayerlist.cpp | 4 +- src/blackmisc/weather/cloudlayerlist.h | 12 +++- src/blackmisc/weather/gridpoint.cpp | 2 + src/blackmisc/weather/gridpoint.h | 12 +++- src/blackmisc/weather/metar.cpp | 7 ++- src/blackmisc/weather/metar.h | 19 ++++-- src/blackmisc/weather/metardecoder.cpp | 22 ++++++- src/blackmisc/weather/metardecoder.h | 6 +- src/blackmisc/weather/metarset.cpp | 4 +- src/blackmisc/weather/metarset.h | 9 ++- src/blackmisc/weather/presentweather.h | 11 +++- src/blackmisc/weather/presentweatherlist.cpp | 2 +- src/blackmisc/weather/presentweatherlist.h | 6 +- .../weather/registermetadataweather.cpp | 4 +- .../weather/registermetadataweather.h | 4 +- src/blackmisc/weather/temperaturelayer.cpp | 3 - src/blackmisc/weather/temperaturelayer.h | 12 +++- .../weather/temperaturelayerlist.cpp | 4 +- src/blackmisc/weather/temperaturelayerlist.h | 13 ++++- src/blackmisc/weather/visibilitylayer.h | 12 +++- src/blackmisc/weather/visibilitylayerlist.cpp | 4 +- src/blackmisc/weather/visibilitylayerlist.h | 12 +++- .../weather/weatherdataplugininfo.cpp | 5 +- src/blackmisc/weather/weatherdataplugininfo.h | 5 ++ .../weather/weatherdataplugininfolist.cpp | 7 ++- .../weather/weatherdataplugininfolist.h | 9 ++- src/blackmisc/weather/weathergrid.cpp | 17 +++++- src/blackmisc/weather/weathergrid.h | 13 ++++- src/blackmisc/weather/weathergridprovider.cpp | 2 +- src/blackmisc/weather/weathergridprovider.h | 8 ++- src/blackmisc/weather/windlayer.cpp | 1 + src/blackmisc/weather/windlayer.h | 12 ++-- src/blackmisc/weather/windlayerlist.cpp | 4 +- src/blackmisc/weather/windlayerlist.h | 12 +++- src/blackmisc/worker.cpp | 3 +- src/blackmisc/worker.h | 22 ++++--- src/blacksound/soundgenerator.h | 1 + src/plugins/simulator/fs9/simulatorfs9.cpp | 1 + src/plugins/simulator/fsx/simulatorfsx.cpp | 1 + 375 files changed, 2750 insertions(+), 779 deletions(-) diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp index 07eac5a17..2ec1aeae0 100644 --- a/samples/blackmiscdbus/main.cpp +++ b/samples/blackmiscdbus/main.cpp @@ -14,6 +14,7 @@ #include "servicetool.h" #include "blackmisc/dbusserver.h" #include +#include #include #include #include diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 9b242825a..45ab68539 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -24,9 +24,11 @@ #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" +#include "blackmisc/loghandler.h" #include #include #include +#include #include using namespace BlackMisc; diff --git a/src/blackcore/databasereader.h b/src/blackcore/databasereader.h index 7e2390896..fe2f29bbb 100644 --- a/src/blackcore/databasereader.h +++ b/src/blackcore/databasereader.h @@ -14,6 +14,7 @@ #include "blackcore/blackcoreexport.h" #include "blackmisc/threadedreader.h" +#include "blackmisc/network/url.h" #include "blackmisc/network/entityflags.h" #include #include diff --git a/src/blackcore/setupreader.h b/src/blackcore/setupreader.h index 0c31ef097..0540b34a0 100644 --- a/src/blackcore/setupreader.h +++ b/src/blackcore/setupreader.h @@ -20,6 +20,7 @@ #include #include #include +#include #include namespace BlackCore diff --git a/src/blackcore/vatsimbookingreader.h b/src/blackcore/vatsimbookingreader.h index 8648c56fc..1d95f78b7 100644 --- a/src/blackcore/vatsimbookingreader.h +++ b/src/blackcore/vatsimbookingreader.h @@ -16,6 +16,7 @@ #include "blackcore/data/globalsetup.h" #include "blackmisc/threadedreader.h" #include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/network/entityflags.h" #include #include diff --git a/src/blackcore/vatsimdatafilereader.cpp b/src/blackcore/vatsimdatafilereader.cpp index 6e7c59c53..3ac88da13 100644 --- a/src/blackcore/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsimdatafilereader.cpp @@ -17,6 +17,8 @@ #include "blackmisc/network/urllist.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/logmessage.h" + +#include #include using namespace BlackMisc; diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index 9443cdb02..b7a656ca9 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -20,6 +20,7 @@ #include "blackmisc/aviation/callsignset.h" #include "blackmisc/network/serverlist.h" #include "blackmisc/network/userlist.h" +#include "blackmisc/network/entityflags.h" #include "blackmisc/network/voicecapabilities.h" #include diff --git a/src/blackcore/vatsimmetarreader.cpp b/src/blackcore/vatsimmetarreader.cpp index fbdb72a2c..c05bffefd 100644 --- a/src/blackcore/vatsimmetarreader.cpp +++ b/src/blackcore/vatsimmetarreader.cpp @@ -12,6 +12,8 @@ #include "blackmisc/network/entityflags.h" #include "blackmisc/sequence.h" #include "blackmisc/logmessage.h" + +#include #include #include #include diff --git a/src/blackcore/vatsimmetarreader.h b/src/blackcore/vatsimmetarreader.h index 999c2a8d1..4832d2d37 100644 --- a/src/blackcore/vatsimmetarreader.h +++ b/src/blackcore/vatsimmetarreader.h @@ -13,6 +13,7 @@ #define BLACKCORE_VATSIMMETARREADER_H #include "blackcoreexport.h" +#include "blackmisc/network/entityflags.h" #include "blackmisc/threadedreader.h" #include "blackmisc/weather/metardecoder.h" #include "blackmisc/weather/metarset.h" diff --git a/src/blackcore/vatsimstatusfilereader.cpp b/src/blackcore/vatsimstatusfilereader.cpp index 8877f4b90..14caa0613 100644 --- a/src/blackcore/vatsimstatusfilereader.cpp +++ b/src/blackcore/vatsimstatusfilereader.cpp @@ -12,6 +12,8 @@ #include "blackmisc/network/urllist.h" #include "blackmisc/logmessage.h" +#include + using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blackcore/vatsimstatusfilereader.h b/src/blackcore/vatsimstatusfilereader.h index a23ed0937..49d5ce7aa 100644 --- a/src/blackcore/vatsimstatusfilereader.h +++ b/src/blackcore/vatsimstatusfilereader.h @@ -16,6 +16,7 @@ #include "blackcore/data/vatsimsetup.h" #include "blackmisc/threadedreader.h" #include "blackmisc/network/urllist.h" +#include "blackmisc/network/entityflags.h" #include #include diff --git a/src/blackmisc/atomicfile.cpp b/src/blackmisc/atomicfile.cpp index 11fe048ed..f42a53e45 100644 --- a/src/blackmisc/atomicfile.cpp +++ b/src/blackmisc/atomicfile.cpp @@ -9,8 +9,13 @@ #include "blackmisc/atomicfile.h" #include "blackmisc/algorithm.h" -#include + #include +#include +#include +#include +#include + #if defined(Q_OS_POSIX) #include #elif defined(Q_OS_WIN32) diff --git a/src/blackmisc/atomicfile.h b/src/blackmisc/atomicfile.h index f99afc710..c83cd3502 100644 --- a/src/blackmisc/atomicfile.h +++ b/src/blackmisc/atomicfile.h @@ -12,9 +12,14 @@ #ifndef BLACKMISC_ATOMICFILE_H #define BLACKMISC_ATOMICFILE_H -#include #include "blackmisc/blackmiscexport.h" +#include +#include +#include +#include +#include + namespace BlackMisc { /*! diff --git a/src/blackmisc/audio/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp index 939ea5eba..2adac61ab 100644 --- a/src/blackmisc/audio/audiodeviceinfo.cpp +++ b/src/blackmisc/audio/audiodeviceinfo.cpp @@ -7,9 +7,10 @@ * contained in the LICENSE file. */ -#include "audiodeviceinfo.h" -#include +#include "blackmisc/audio/audiodeviceinfo.h" + #include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index 91b2d55e7..761457c2c 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -13,7 +13,10 @@ #define BLACKMISC_AUDIO_AUDIODEVICE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" + +#include #include namespace BlackMisc diff --git a/src/blackmisc/audio/audiodeviceinfolist.cpp b/src/blackmisc/audio/audiodeviceinfolist.cpp index 47b48c8a1..b683b8e41 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.cpp +++ b/src/blackmisc/audio/audiodeviceinfolist.cpp @@ -7,8 +7,13 @@ * contained in the LICENSE file. */ -#include "audiodeviceinfolist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/audio/audiodeviceinfolist.h" +#include "blackmisc/iterator.h" +#include "blackmisc/range.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index 407e33bff..349902ae5 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -12,13 +12,13 @@ #ifndef BLACKMISC_AUDIO_AUDIODEVICELIST_H #define BLACKMISC_AUDIO_AUDIODEVICELIST_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/audio/audiodeviceinfo.h" -#include "blackmisc/sequence.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" -#include -#include -#include +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/audioutils.cpp b/src/blackmisc/audio/audioutils.cpp index ac21aee94..36ae64022 100644 --- a/src/blackmisc/audio/audioutils.cpp +++ b/src/blackmisc/audio/audioutils.cpp @@ -9,7 +9,9 @@ #include "audioutils.h" #include "blackmisc/buildconfig.h" + #include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/registermetadataaudio.cpp b/src/blackmisc/audio/registermetadataaudio.cpp index 7b6d68467..cccc53fb6 100644 --- a/src/blackmisc/audio/registermetadataaudio.cpp +++ b/src/blackmisc/audio/registermetadataaudio.cpp @@ -10,6 +10,8 @@ #include "registermetadataaudio.h" #include "audio.h" +#include + namespace BlackMisc { namespace Audio diff --git a/src/blackmisc/audio/registermetadataaudio.h b/src/blackmisc/audio/registermetadataaudio.h index 90fd4716a..cc2200a8d 100644 --- a/src/blackmisc/audio/registermetadataaudio.h +++ b/src/blackmisc/audio/registermetadataaudio.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_AUDIO_REGISTERMETADATAAUDIO_H #define BLACKMISC_AUDIO_REGISTERMETADATAAUDIO_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Audio diff --git a/src/blackmisc/audio/settings/settingsaudio.cpp b/src/blackmisc/audio/settings/settingsaudio.cpp index c5fee18a9..878868a55 100644 --- a/src/blackmisc/audio/settings/settingsaudio.cpp +++ b/src/blackmisc/audio/settings/settingsaudio.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "settingsaudio.h" -#include "logmessage.h" +#include "blackmisc/audio/settings/settingsaudio.h" + +#include +#include using namespace BlackMisc::Audio; diff --git a/src/blackmisc/audio/settings/settingsaudio.h b/src/blackmisc/audio/settings/settingsaudio.h index 0acc19488..ef986ebd0 100644 --- a/src/blackmisc/audio/settings/settingsaudio.h +++ b/src/blackmisc/audio/settings/settingsaudio.h @@ -12,11 +12,15 @@ #ifndef BLACKMISC_AUDIO_SETTINGS_AUDIO_H #define BLACKMISC_AUDIO_SETTINGS_AUDIO_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/statusmessagelist.h" #include "blackmisc/audio/notificationsounds.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp index 2dd1359b3..bd52b5529 100644 --- a/src/blackmisc/audio/voiceroom.cpp +++ b/src/blackmisc/audio/voiceroom.cpp @@ -7,12 +7,12 @@ * contained in the LICENSE file. */ -#include "voiceroom.h" +#include "blackmisc/audio/voiceroom.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" -#include + #include -#include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h index a13dec354..df2bcb467 100644 --- a/src/blackmisc/audio/voiceroom.h +++ b/src/blackmisc/audio/voiceroom.h @@ -9,14 +9,18 @@ //! \file -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" -#include - #ifndef BLACKMISC_AUDIO_VOICEROOM_H #define BLACKMISC_AUDIO_VOICEROOM_H +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include + namespace BlackMisc { namespace Audio diff --git a/src/blackmisc/audio/voiceroomlist.cpp b/src/blackmisc/audio/voiceroomlist.cpp index 97d4e8f52..4490d208b 100644 --- a/src/blackmisc/audio/voiceroomlist.cpp +++ b/src/blackmisc/audio/voiceroomlist.cpp @@ -7,8 +7,11 @@ * contained in the LICENSE file. */ -#include "voiceroomlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/audio/voiceroom.h" +#include "blackmisc/audio/voiceroomlist.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/audio/voiceroomlist.h b/src/blackmisc/audio/voiceroomlist.h index 023e1ceb0..65e17def4 100644 --- a/src/blackmisc/audio/voiceroomlist.h +++ b/src/blackmisc/audio/voiceroomlist.h @@ -12,18 +12,20 @@ #ifndef BLACKMISC_AUDIO_VOICEROOMLIST_H #define BLACKMISC_AUDIO_VOICEROOMLIST_H -#include "voiceroom.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/sequence.h" #include "blackmisc/collection.h" -#include -#include -#include +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "voiceroom.h" + +#include namespace BlackMisc { namespace Audio { + class CVoiceRoom; + //! Value object encapsulating a list of voice rooms. class BLACKMISC_EXPORT CVoiceRoomList : public CSequence, diff --git a/src/blackmisc/aviation/aircraftengine.cpp b/src/blackmisc/aviation/aircraftengine.cpp index 11afb3c8b..0e4816571 100644 --- a/src/blackmisc/aviation/aircraftengine.cpp +++ b/src/blackmisc/aviation/aircraftengine.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "aircraftengine.h" +#include "blackmisc/aviation/aircraftengine.h" #include "blackmisc/stringutils.h" +#include +#include + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index 22c54f4f8..2f08b1c82 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -13,8 +13,12 @@ #define BLACKMISC_AVIATION_AIRCRAFTENGINES_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" +#include +#include + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/aircraftenginelist.cpp b/src/blackmisc/aviation/aircraftenginelist.cpp index 6175ce3c3..e27d5f047 100644 --- a/src/blackmisc/aviation/aircraftenginelist.cpp +++ b/src/blackmisc/aviation/aircraftenginelist.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "aircraftenginelist.h" +#include "blackmisc/aviation/aircraftenginelist.h" +#include "blackmisc/range.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index 25fc363c6..559c88c53 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -12,11 +12,18 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H #define BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H -#include "aircraftengine.h" +#include "blackmisc/aviation/aircraftengine.h" +#include "blackmisc/aviation/aircraftengine.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" +#include "blackmisc/json.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index fa91d8265..436406a11 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -8,14 +8,22 @@ */ #include "blackmisc/aviation/aircrafticaocode.h" -#include "blackmisc/aviation/airlineicaocode.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/variant.h" -#include "blackmisc/datastoreutility.h" #include "blackmisc/comparefunctions.h" -#include -#include +#include "blackmisc/datastoreutility.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/variant.h" + +#include +#include +#include #include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h index 421111937..2eb54a6ac 100644 --- a/src/blackmisc/aviation/aircrafticaocode.h +++ b/src/blackmisc/aviation/aircrafticaocode.h @@ -13,16 +13,22 @@ #define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/datastore.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { namespace Aviation { - class CAirlineIcaoCode; //! Value object for ICAO classification class BLACKMISC_EXPORT CAircraftIcaoCode : diff --git a/src/blackmisc/aviation/aircrafticaocodelist.cpp b/src/blackmisc/aviation/aircrafticaocodelist.cpp index 4f78d593d..fcccbc7c3 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.cpp +++ b/src/blackmisc/aviation/aircrafticaocodelist.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "aircrafticaocodelist.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/range.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h index 6f5e43bed..99f0d2807 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.h +++ b/src/blackmisc/aviation/aircrafticaocodelist.h @@ -13,11 +13,18 @@ #define BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H #include "aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/collection.h" +#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp index 9fee7b5c4..b5465b216 100644 --- a/src/blackmisc/aviation/aircraftlights.cpp +++ b/src/blackmisc/aviation/aircraftlights.cpp @@ -7,9 +7,9 @@ * contained in the LICENSE file. */ -#include "aircraftlights.h" -#include "blackmisc/variant.h" +#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" using namespace BlackMisc; diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h index 522c065ab..763676294 100644 --- a/src/blackmisc/aviation/aircraftlights.h +++ b/src/blackmisc/aviation/aircraftlights.h @@ -13,8 +13,13 @@ #define BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 5b8b44212..5f935d4e1 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -7,9 +7,11 @@ * contained in the LICENSE file. */ -#include "aircraftparts.h" -#include "blackmisc/stringutils.h" +#include "blackmisc/aviation/aircraftparts.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/stringutils.h" + +#include using namespace BlackMisc; diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index 8753bff1b..f41af9485 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -12,12 +12,18 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTS_H #define BLACKMISC_AVIATION_AIRCRAFTPARTS_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/timestampbased.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/aviation/aircraftengine.h" #include "blackmisc/aviation/aircraftenginelist.h" +#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftpartslist.cpp b/src/blackmisc/aviation/aircraftpartslist.cpp index 347699dc5..f89e226b5 100644 --- a/src/blackmisc/aviation/aircraftpartslist.cpp +++ b/src/blackmisc/aviation/aircraftpartslist.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "aircraftpartslist.h" +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/aviation/aircraftpartslist.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index d44695547..6877b762e 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -12,16 +12,21 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H #define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H -#include "blackmisc/blackmiscexport.h" #include "aircraftparts.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include "blackmisc/timestampobjectlist.h" -#include "blackmisc/aviation/callsignobjectlist.h" -#include +#include "blackmisc/variant.h" + +#include namespace BlackMisc { namespace Aviation { + class CAircraftParts; + //! Value object encapsulating a list of aircraft parts. class BLACKMISC_EXPORT CAircraftPartsList : public CSequence, diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 53889ff17..e222db486 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -8,9 +8,13 @@ */ #include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include + using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 457ea888a..721bd5183 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -12,15 +12,26 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H #define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/heading.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/coordinategeodetic.h" -#include "blackmisc/timestampbased.h" -#include "blackmisc/aviation/altitude.h" -#include "blackmisc/aviation/heading.h" -#include "blackmisc/aviation/callsign.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/length.h" #include "blackmisc/pq/speed.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/timestampbased.h" #include "blackmisc/valueobject.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index b9524813c..97d306369 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -8,7 +8,10 @@ */ #include "blackmisc/aviation/aircraftsituationlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/aviation/aircraftsituation.h" +#include "blackmisc/metaclassprivate.h" + +#include using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index ee69e7cd2..712ad1d65 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -12,16 +12,22 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H #define BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/callsignobjectlist.h" -#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/sequence.h" +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { namespace Aviation { + class CAircraftSituation; + //! Value object encapsulating a list of aircraft situations class BLACKMISC_EXPORT CAircraftSituationList : public CSequence, diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index fbd5c7582..4d4b82b74 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -8,14 +8,22 @@ */ #include "blackmisc/aviation/airlineicaocode.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/variant.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/datastoreutility.h" -#include -#include +#include "blackmisc/icons.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include #include -#include "blackmisc/logmessage.h" +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h index c51c06809..f63a3c87c 100644 --- a/src/blackmisc/aviation/airlineicaocode.h +++ b/src/blackmisc/aviation/airlineicaocode.h @@ -15,9 +15,16 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/country.h" #include "blackmisc/datastore.h" -#include "blackmisc/valueobject.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp index 473154597..d6cca2350 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.cpp +++ b/src/blackmisc/aviation/airlineicaocodelist.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "airlineicaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/country.h" +#include "blackmisc/range.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/airlineicaocodelist.h b/src/blackmisc/aviation/airlineicaocodelist.h index a591a8f7b..467afdae1 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.h +++ b/src/blackmisc/aviation/airlineicaocodelist.h @@ -13,11 +13,18 @@ #define BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H #include "airlineicaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/collection.h" +#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp index 3c0603335..e6b7ab15e 100644 --- a/src/blackmisc/aviation/airport.cpp +++ b/src/blackmisc/aviation/airport.cpp @@ -8,9 +8,14 @@ */ #include "blackmisc/aviation/airport.h" +#include "blackmisc/pq/angle.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include +#include +#include + using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h index 920c6a21c..afe18d798 100644 --- a/src/blackmisc/aviation/airport.h +++ b/src/blackmisc/aviation/airport.h @@ -12,10 +12,21 @@ #ifndef BLACKMISC_AVIATION_AIRPORT_H #define BLACKMISC_AVIATION_AIRPORT_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/length.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/airporticaocode.cpp b/src/blackmisc/aviation/airporticaocode.cpp index 9beaefbb4..ccb376946 100644 --- a/src/blackmisc/aviation/airporticaocode.cpp +++ b/src/blackmisc/aviation/airporticaocode.cpp @@ -1,4 +1,9 @@ #include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/compare.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/airporticaocode.h b/src/blackmisc/aviation/airporticaocode.h index 503b1d6fc..9244aea01 100644 --- a/src/blackmisc/aviation/airporticaocode.h +++ b/src/blackmisc/aviation/airporticaocode.h @@ -13,8 +13,15 @@ #define BLACKMISC_AVIATION_AIRPORTICAOCODE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" +#include +#include +#include + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/airportlist.cpp b/src/blackmisc/aviation/airportlist.cpp index 0496c39e7..8cd1734a7 100644 --- a/src/blackmisc/aviation/airportlist.cpp +++ b/src/blackmisc/aviation/airportlist.cpp @@ -8,7 +8,12 @@ */ #include "blackmisc/aviation/airportlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/range.h" + +#include +#include using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 411bab781..ff612be39 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -12,15 +12,15 @@ #ifndef BLACKMISC_AVIATION_AIRPORTLIST_H #define BLACKMISC_AVIATION_AIRPORTLIST_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/airport.h" -#include "blackmisc/geo/geoobjectlist.h" +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" -#include "blackmisc/sequence.h" #include "blackmisc/geo/geoobjectlist.h" -#include -#include -#include +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index 6e182e56b..a8e5e1bce 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -8,8 +8,13 @@ */ #include "blackmisc/aviation/altitude.h" -#include "blackmisc/pq/pqstring.h" #include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" +#include "blackmisc/pq/measurementunit.h" +#include "blackmisc/pq/pqstring.h" + +#include +#include using BlackMisc::PhysicalQuantities::CLength; using BlackMisc::PhysicalQuantities::CLengthUnit; diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index f30599e89..2641a0f1f 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -13,8 +13,20 @@ #define BLACKMISC_AVIATION_ALTITUDE_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/pq/length.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/icon.h" #include "blackmisc/metaclass.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/pqstring.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index 749176844..65780426e 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -8,12 +8,18 @@ */ #include "blackmisc/aviation/atcstation.h" -#include "blackmisc/aviation/comsystem.h" #include "blackmisc/audio/voiceroom.h" -#include "blackmisc/icon.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include +#include + using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; using namespace BlackMisc::Network; diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index e7e8841a7..eedea7330 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -12,19 +12,30 @@ #ifndef BLACKMISC_AVIATION_ATCSTATION_H #define BLACKMISC_AVIATION_ATCSTATION_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/audio/voiceroom.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/informationmessage.h" -#include "blackmisc/aviation/callsign.h" -#include "blackmisc/network/user.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/network/user.h" #include "blackmisc/pq/frequency.h" #include "blackmisc/pq/length.h" #include "blackmisc/pq/time.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + #include -#include -#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 9abd5bf22..9690f0bff 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -8,7 +8,17 @@ */ #include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/compare.h" +#include "blackmisc/iterator.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/network/user.h" #include "blackmisc/predicates.h" +#include "blackmisc/range.h" + +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 2d4001ef5..c0dcb85f8 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -12,21 +12,23 @@ #ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H #define BLACKMISC_AVIATION_ATCSTATIONLIST_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/geo/geoobjectlist.h" -#include "blackmisc/network/userlist.h" #include "blackmisc/aviation/atcstation.h" #include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" +#include "blackmisc/geo/geoobjectlist.h" +#include "blackmisc/network/userlist.h" #include "blackmisc/sequence.h" -#include -#include -#include +#include "blackmisc/variant.h" + +#include namespace BlackMisc { namespace Aviation { + class CComSystem; + //! Value object for a list of ATC stations. class BLACKMISC_EXPORT CAtcStationList : public CSequence, diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp index 1b6f23ab8..aca8f7121 100644 --- a/src/blackmisc/aviation/callsign.cpp +++ b/src/blackmisc/aviation/callsign.cpp @@ -8,10 +8,17 @@ */ #include "blackmisc/aviation/callsign.h" +#include "blackmisc/compare.h" #include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" -#include +#include #include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index 78e9e3e81..2b378b568 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -13,9 +13,18 @@ #define BLACKMISC_AVIATION_CALLSIGN_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include + +class QStringList; namespace BlackMisc { diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp index 4d9dc74e5..b39ece4d6 100644 --- a/src/blackmisc/aviation/callsignobjectlist.cpp +++ b/src/blackmisc/aviation/callsignobjectlist.cpp @@ -8,12 +8,15 @@ */ #include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/predicates.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/aircraftsituationlist.h" -#include "blackmisc/aviation/aircraftpartslist.h" -#include "blackmisc/network/clientlist.h" +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/network/clientlist.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/callsignobjectlist.h b/src/blackmisc/aviation/callsignobjectlist.h index 0d103623f..333ca1f72 100644 --- a/src/blackmisc/aviation/callsignobjectlist.h +++ b/src/blackmisc/aviation/callsignobjectlist.h @@ -12,12 +12,9 @@ #ifndef BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H #define BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H -#include "blackmisc/collection.h" -#include "blackmisc/sequence.h" #include "blackmisc/aviation/callsignset.h" -#include "blackmisc/propertyindexlist.h" #include "blackmisc/propertyindexvariantmap.h" -#include + #include namespace BlackMisc @@ -27,8 +24,6 @@ namespace BlackMisc { class CAircraftSituation; class CAircraftSituationList; - class CAircraftParts; - class CAircraftPartsList; class CAircraft; class CAircraftList; class CAtcStation; diff --git a/src/blackmisc/aviation/callsignset.cpp b/src/blackmisc/aviation/callsignset.cpp index fa6345e1d..e92b064d0 100644 --- a/src/blackmisc/aviation/callsignset.cpp +++ b/src/blackmisc/aviation/callsignset.cpp @@ -8,7 +8,13 @@ */ #include "blackmisc/aviation/callsignset.h" -#include "blackmisc/predicates.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/dbus.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index 0680c74af..217f9f946 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -12,11 +12,15 @@ #ifndef BLACKMISC_AVIATION_CALLSIGNSET_H #define BLACKMISC_AVIATION_CALLSIGNSET_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/callsign.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/sequence.h" -#include + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/comsystem.cpp b/src/blackmisc/aviation/comsystem.cpp index e1608cba2..fbea14dbd 100644 --- a/src/blackmisc/aviation/comsystem.cpp +++ b/src/blackmisc/aviation/comsystem.cpp @@ -8,6 +8,12 @@ */ #include "blackmisc/aviation/comsystem.h" +#include "blackmisc/dbus.h" +#include "blackmisc/math/mathutils.h" + +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Math; diff --git a/src/blackmisc/aviation/comsystem.h b/src/blackmisc/aviation/comsystem.h index 62064258c..e89ba1091 100644 --- a/src/blackmisc/aviation/comsystem.h +++ b/src/blackmisc/aviation/comsystem.h @@ -12,8 +12,23 @@ #ifndef BLACKMISC_AVIATION_COMSYSTEM_H #define BLACKMISC_AVIATION_COMSYSTEM_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/modulator.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/json.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/constants.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index f7d3f667c..3d2419553 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -9,6 +9,7 @@ #include "blackmisc/aviation/flightplan.h" #include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" namespace BlackMisc { diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index f94a3c16b..8caa025d3 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -12,13 +12,21 @@ #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H #define BLACKMISC_AVIATION_FLIGHTPLAN_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/aviation/altitude.h" #include "blackmisc/aviation/airporticaocode.h" -#include "blackmisc/pq/time.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/pq/speed.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/valueobject.h" + #include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/heading.cpp b/src/blackmisc/aviation/heading.cpp index 913cf500e..2b0c44977 100644 --- a/src/blackmisc/aviation/heading.cpp +++ b/src/blackmisc/aviation/heading.cpp @@ -9,6 +9,8 @@ #include "blackmisc/aviation/heading.h" +#include + using BlackMisc::PhysicalQuantities::CAngle; using BlackMisc::PhysicalQuantities::CAngleUnit; diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h index 3f3c8d4e3..c0b648d85 100644 --- a/src/blackmisc/aviation/heading.h +++ b/src/blackmisc/aviation/heading.h @@ -13,8 +13,19 @@ #define BLACKMISC_AVIATION_HEADING_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/pq/angle.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/json.h" #include "blackmisc/metaclass.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h index dc0827eb3..684d505b3 100644 --- a/src/blackmisc/aviation/informationmessage.h +++ b/src/blackmisc/aviation/informationmessage.h @@ -13,9 +13,13 @@ #define BLACKMISC_AVIATION_INFORMATIONMESSAGE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" -#include + #include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 23a800090..47dfad26d 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -8,14 +8,24 @@ */ #include "blackmisc/aviation/livery.h" -#include "blackmisc/datastoreutility.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/variant.h" +#include "blackmisc/compare.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/datastoreutility.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackMisc::Geo; namespace BlackMisc { diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h index 13e4e222e..ba726903d 100644 --- a/src/blackmisc/aviation/livery.h +++ b/src/blackmisc/aviation/livery.h @@ -12,12 +12,19 @@ #ifndef BLACKMISC_AVIATION_LIVERY_H #define BLACKMISC_AVIATION_LIVERY_H -#include "blackmisc/blackmiscexport.h" #include "blackmisc/aviation/airlineicaocode.h" -#include "blackmisc/geo/coordinategeodetic.h" -#include "blackmisc/rgbcolor.h" -#include "blackmisc/propertyindex.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/datastore.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/rgbcolor.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/liverylist.cpp b/src/blackmisc/aviation/liverylist.cpp index e7ae8cb80..23c6c0bb2 100644 --- a/src/blackmisc/aviation/liverylist.cpp +++ b/src/blackmisc/aviation/liverylist.cpp @@ -8,7 +8,12 @@ */ #include "blackmisc/aviation/liverylist.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/predicates.h" +#include "blackmisc/range.h" + +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/aviation/liverylist.h b/src/blackmisc/aviation/liverylist.h index 97402dffe..1c6f06e35 100644 --- a/src/blackmisc/aviation/liverylist.h +++ b/src/blackmisc/aviation/liverylist.h @@ -12,9 +12,16 @@ #ifndef BLACKMISC_AVIATION_LIVERYLIST_H #define BLACKMISC_AVIATION_LIVERYLIST_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/datastoreobjectlist.h" +#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/livery.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/datastoreobjectlist.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include #include namespace BlackMisc diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp index 43b5d42ee..a06dc123a 100644 --- a/src/blackmisc/aviation/modulator.cpp +++ b/src/blackmisc/aviation/modulator.cpp @@ -8,11 +8,15 @@ */ #include "blackmisc/aviation/modulator.h" +#include "blackmisc/math/mathutils.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" #include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/navsystem.h" #include "blackmisc/aviation/adfsystem.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/variant.h" + +#include using BlackMisc::PhysicalQuantities::CFrequency; using BlackMisc::PhysicalQuantities::CFrequencyUnit; diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index 16f65f542..9998ad74b 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -13,8 +13,6 @@ #define BLACKMISC_AVIATION_MODULATORUNIT_H #include "blackmisc/propertyindex.h" -#include "blackmisc/math/mathutils.h" -#include "blackmisc/pq/constants.h" #include "blackmisc/pq/frequency.h" namespace BlackMisc diff --git a/src/blackmisc/aviation/registermetadataaviation.h b/src/blackmisc/aviation/registermetadataaviation.h index d9746d129..6d04aab11 100644 --- a/src/blackmisc/aviation/registermetadataaviation.h +++ b/src/blackmisc/aviation/registermetadataaviation.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_AVIATION_REGISTERMETADATAAVIATION_H #define BLACKMISC_AVIATION_REGISTERMETADATAAVIATION_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/selcal.cpp b/src/blackmisc/aviation/selcal.cpp index f58d200b1..6fe5c8ff2 100644 --- a/src/blackmisc/aviation/selcal.cpp +++ b/src/blackmisc/aviation/selcal.cpp @@ -8,6 +8,12 @@ */ #include "blackmisc/aviation/selcal.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/units.h" + +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h index 508a617c0..041235a50 100644 --- a/src/blackmisc/aviation/selcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -13,9 +13,24 @@ #define BLACKMISC_AVIATION_SELCAL_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/pq/frequency.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" +#include +#include +#include +#include + +class QStringList; + +namespace BlackMisc +{ + namespace PhysicalQuantities + { + class CFrequency; + } +} + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/track.cpp b/src/blackmisc/aviation/track.cpp index bf9d18030..50e121dc0 100644 --- a/src/blackmisc/aviation/track.cpp +++ b/src/blackmisc/aviation/track.cpp @@ -9,6 +9,8 @@ #include "blackmisc/aviation/track.h" +#include + using BlackMisc::PhysicalQuantities::CAngle; using BlackMisc::PhysicalQuantities::CAngleUnit; diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h index e24d14043..6bae2035b 100644 --- a/src/blackmisc/aviation/track.h +++ b/src/blackmisc/aviation/track.h @@ -13,8 +13,20 @@ #define BLACKMISC_AVIATION_TRACK_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/pq/angle.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/json.h" #include "blackmisc/metaclass.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/aviation/transponder.cpp b/src/blackmisc/aviation/transponder.cpp index a65110ab2..ec5823b8c 100644 --- a/src/blackmisc/aviation/transponder.cpp +++ b/src/blackmisc/aviation/transponder.cpp @@ -11,6 +11,10 @@ #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include +#include +#include + namespace BlackMisc { namespace Aviation diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h index 29c001f5f..421d8e185 100644 --- a/src/blackmisc/aviation/transponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -13,7 +13,17 @@ #define BLACKMISC_AVIATION_TRANSPONDER_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/buildconfig.cpp b/src/blackmisc/buildconfig.cpp index b56d4f392..d2fb24629 100644 --- a/src/blackmisc/buildconfig.cpp +++ b/src/blackmisc/buildconfig.cpp @@ -10,14 +10,18 @@ //! \cond PRIVATE #include "buildconfig.h" +#include "blackmisc/buildconfig.h" #include "blackmisc/fileutils.h" #include "blackmisc/stringutils.h" -#include "blackmisc/simulation/simulatorinfo.h" -#include #include -#include +#include +#include +#include +#include #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/buildconfig.h b/src/blackmisc/buildconfig.h index 007fec613..e4841edc2 100644 --- a/src/blackmisc/buildconfig.h +++ b/src/blackmisc/buildconfig.h @@ -13,8 +13,12 @@ #define BLACKMISC_BUILDCONFIG_H #include "blackmisc/blackmiscexport.h" + +#include #include -#include + +class QDateTime; +class QStringList; namespace BlackMisc { diff --git a/src/blackmisc/collection.h b/src/blackmisc/collection.h index b82e15f85..a6cf05678 100644 --- a/src/blackmisc/collection.h +++ b/src/blackmisc/collection.h @@ -15,6 +15,7 @@ #include "iterator.h" #include "containerbase.h" #include "icon.h" + #include #include #include diff --git a/src/blackmisc/comparefunctions.h b/src/blackmisc/comparefunctions.h index 25fe97a4f..e81ac85b8 100644 --- a/src/blackmisc/comparefunctions.h +++ b/src/blackmisc/comparefunctions.h @@ -13,7 +13,8 @@ #define BLACKMISC_COMPAREFUNCTIONS_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/connectionguard.cpp b/src/blackmisc/connectionguard.cpp index 228e3bb56..d7b2e4696 100644 --- a/src/blackmisc/connectionguard.cpp +++ b/src/blackmisc/connectionguard.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "connectionguard.h" +#include "blackmisc/connectionguard.h" namespace BlackMisc { diff --git a/src/blackmisc/connectionguard.h b/src/blackmisc/connectionguard.h index e56950e65..ebf0397dd 100644 --- a/src/blackmisc/connectionguard.h +++ b/src/blackmisc/connectionguard.h @@ -13,7 +13,9 @@ #define BLACKMISC_CONNECTIONGUARD_H #include "blackmisc/blackmiscexport.h" + #include +#include #include namespace BlackMisc diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index 52d0fc149..0eb9b4310 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -17,6 +17,7 @@ #include "json.h" #include "variant.h" #include "dbus.h" + #include #include diff --git a/src/blackmisc/country.cpp b/src/blackmisc/country.cpp index 00d3c0fc1..56e4412f0 100644 --- a/src/blackmisc/country.cpp +++ b/src/blackmisc/country.cpp @@ -8,7 +8,11 @@ */ #include "blackmisc/country.h" -#include +#include "blackmisc/icons.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h index 7c5cc431e..29b8da1a5 100644 --- a/src/blackmisc/country.h +++ b/src/blackmisc/country.h @@ -12,10 +12,17 @@ #ifndef BLACKMISC_COUNTRY_H #define BLACKMISC_COUNTRY_H -#include "blackmiscexport.h" -#include "datastore.h" -#include "valueobject.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/datastore.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/countrylist.cpp b/src/blackmisc/countrylist.cpp index 475775480..93d7ecd52 100644 --- a/src/blackmisc/countrylist.cpp +++ b/src/blackmisc/countrylist.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "countrylist.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/range.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/countrylist.h b/src/blackmisc/countrylist.h index acea89068..56722e053 100644 --- a/src/blackmisc/countrylist.h +++ b/src/blackmisc/countrylist.h @@ -12,12 +12,18 @@ #ifndef BLACKMISC_COUNTRYLIST_H #define BLACKMISC_COUNTRYLIST_H -#include "country.h" #include "blackmisc/blackmiscexport.h" -#include "datastoreobjectlist.h" #include "blackmisc/collection.h" +#include "blackmisc/country.h" +#include "blackmisc/datastoreobjectlist.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp index 1b8e3194c..c306fc7dc 100644 --- a/src/blackmisc/datacache.cpp +++ b/src/blackmisc/datacache.cpp @@ -9,13 +9,24 @@ //! \cond PRIVATE -#include "datacache.h" -#include "blackmisc/logmessage.h" -#include "blackmisc/identifier.h" #include "blackmisc/atomicfile.h" +#include "blackmisc/datacache.h" +#include "blackmisc/identifier.h" +#include "blackmisc/logmessage.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include +#include #include namespace BlackMisc diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h index 812904394..aa5c333e8 100644 --- a/src/blackmisc/datacache.h +++ b/src/blackmisc/datacache.h @@ -13,12 +13,33 @@ #define BLACKMISC_DATACACHE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/identifier.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/valuecache.h" +#include "blackmisc/valuecacheprivate.h" +#include "blackmisc/variant.h" +#include "blackmisc/variantmap.h" #include "blackmisc/worker.h" -#include + +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/datastore.cpp b/src/blackmisc/datastore.cpp index 8e1690c81..18b499280 100644 --- a/src/blackmisc/datastore.cpp +++ b/src/blackmisc/datastore.cpp @@ -8,8 +8,14 @@ */ #include "blackmisc/datastore.h" -#include "blackmisc/datastoreutility.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/datastoreutility.h" +#include "blackmisc/icon.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/datastore.h b/src/blackmisc/datastore.h index 24e10be63..2a0ba8a0a 100644 --- a/src/blackmisc/datastore.h +++ b/src/blackmisc/datastore.h @@ -12,13 +12,20 @@ #ifndef BLACKMISC_DATASTORE_H #define BLACKMISC_DATASTORE_H -#include "blackmiscexport.h" -#include "timestampbased.h" -#include "propertyindex.h" -#include "variant.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { + class CIcon; + /*! * Class from which a derived class can inherit datastore-related functions. */ diff --git a/src/blackmisc/datastoreobjectlist.cpp b/src/blackmisc/datastoreobjectlist.cpp index ab6a2920a..c3b105458 100644 --- a/src/blackmisc/datastoreobjectlist.cpp +++ b/src/blackmisc/datastoreobjectlist.cpp @@ -15,8 +15,10 @@ #include "blackmisc/aviation/airlineicaocodelist.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/distributorlist.h" + +#include +#include #include -#include #include namespace BlackMisc diff --git a/src/blackmisc/datastoreobjectlist.h b/src/blackmisc/datastoreobjectlist.h index 85af716d9..65dd514d4 100644 --- a/src/blackmisc/datastoreobjectlist.h +++ b/src/blackmisc/datastoreobjectlist.h @@ -13,10 +13,10 @@ #define BLACKMISC_DATABASEOBJECTLIST_H #include "blackmisc/timestampobjectlist.h" -#include "blackmisc/collection.h" -#include "blackmisc/sequence.h" + +#include #include -#include +#include namespace BlackMisc { diff --git a/src/blackmisc/datastoreutility.cpp b/src/blackmisc/datastoreutility.cpp index de80ce10b..1e925ac64 100644 --- a/src/blackmisc/datastoreutility.cpp +++ b/src/blackmisc/datastoreutility.cpp @@ -7,11 +7,19 @@ * contained in the LICENSE file. */ -#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/datastoreutility.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" #include "blackmisc/stringutils.h" -#include + +#include #include +#include +#include +#include #include using namespace BlackMisc; diff --git a/src/blackmisc/datastoreutility.h b/src/blackmisc/datastoreutility.h index 3be293322..4de5fa207 100644 --- a/src/blackmisc/datastoreutility.h +++ b/src/blackmisc/datastoreutility.h @@ -13,13 +13,19 @@ #define BLACKMISC_DATASTOREUTILITY_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/statusmessagelist.h" -#include "timestampbased.h" -#include "propertyindex.h" -#include "variant.h" + +#include +#include namespace BlackMisc { + class CStatusMessageList; + + namespace Simulation + { + class CAircraftModelList; + } + /*! * Class with datastore related utilities */ diff --git a/src/blackmisc/dbusserver.cpp b/src/blackmisc/dbusserver.cpp index 219f3a34a..a8b27974a 100644 --- a/src/blackmisc/dbusserver.cpp +++ b/src/blackmisc/dbusserver.cpp @@ -7,11 +7,17 @@ * contained in the LICENSE file. */ -#include "dbusserver.h" +#include "blackmisc/dbusserver.h" #include "blackmisc/logmessage.h" #include "blackmisc/network/networkutils.h" -#include +#include "blackmisc/statusmessage.h" + +#include #include +#include +#include +#include +#include using namespace BlackMisc::Network; diff --git a/src/blackmisc/dbusserver.h b/src/blackmisc/dbusserver.h index 7d2fda4e2..4627ef008 100644 --- a/src/blackmisc/dbusserver.h +++ b/src/blackmisc/dbusserver.h @@ -12,14 +12,17 @@ #ifndef BLACKMISC_DBUSSERVER_H #define BLACKMISC_DBUSSERVER_H -#include "blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include -#include -#include -#include -#include +#include "blackmisc/blackmiscexport.h" + +#include +#include +#include #include +#include +#include +#include + +class QDBusServer; //! Service name of DBus service #define SWIFT_SERVICENAME "org.swift-project" diff --git a/src/blackmisc/dictionary.cpp b/src/blackmisc/dictionary.cpp index 7520b80a6..5155efa3b 100644 --- a/src/blackmisc/dictionary.cpp +++ b/src/blackmisc/dictionary.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "dictionary.h" +#include "blackmisc/dictionary.h" uint BlackMisc::calculateHash(const QList &values, const char *className) { diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index 1408635da..f332cc31c 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -12,20 +12,38 @@ #ifndef BLACKMISC_DICTIONARY_H #define BLACKMISC_DICTIONARY_H -#include "dbus.h" -#include "json.h" -#include "stringutils.h" -#include "iterator.h" -#include "range.h" -#include "containerbase.h" -#include "typetraits.h" -#include "metaclass.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/dbus.h" +#include "blackmisc/inheritancetraits.h" +#include "blackmisc/iterator.h" +#include "blackmisc/json.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/predicates.h" +#include "blackmisc/range.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/typetraits.h" + +#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include namespace BlackMisc { + class CEmpty; + // Needed so that our qHash overload doesn't hide the qHash overloads in the global namespace. // This will be safe as long as no global qHash has the same signature as ours. // Alternative would be to qualify all our invokations of the global qHash as ::qHash. diff --git a/src/blackmisc/digestsignal.cpp b/src/blackmisc/digestsignal.cpp index d90f2824a..74ed28a9e 100644 --- a/src/blackmisc/digestsignal.cpp +++ b/src/blackmisc/digestsignal.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "digestsignal.h" +#include "blackmisc/digestsignal.h" namespace BlackMisc { diff --git a/src/blackmisc/digestsignal.h b/src/blackmisc/digestsignal.h index e854258e8..8f9fa3c8a 100644 --- a/src/blackmisc/digestsignal.h +++ b/src/blackmisc/digestsignal.h @@ -12,9 +12,10 @@ #ifndef BLACKMISC_DIGESTSIGNAL_H #define BLACKMISC_DIGESTSIGNAL_H -#include "blackmiscexport.h" -#include +#include "blackmisc/blackmiscexport.h" + #include +#include namespace BlackMisc { diff --git a/src/blackmisc/filedeleter.cpp b/src/blackmisc/filedeleter.cpp index 0f1df62e6..496f2d877 100644 --- a/src/blackmisc/filedeleter.cpp +++ b/src/blackmisc/filedeleter.cpp @@ -7,8 +7,12 @@ * contained in the LICENSE file. */ -#include "filedeleter.h" +#include "blackmisc/filedeleter.h" + #include +#include + +class QTimerEvent; namespace BlackMisc { diff --git a/src/blackmisc/filedeleter.h b/src/blackmisc/filedeleter.h index 46e16bf8f..ddef4dbf0 100644 --- a/src/blackmisc/filedeleter.h +++ b/src/blackmisc/filedeleter.h @@ -12,9 +12,13 @@ #ifndef BLACKMISC_CFILEDELETER_H #define BLACKMISC_CFILEDELETER_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" + #include -#include +#include +#include + +class QTimerEvent; namespace BlackMisc { diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index abfe5ed2f..191bf1f7e 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -7,12 +7,19 @@ * contained in the LICENSE file. */ -#include "filelogger.h" +#include "blackmisc/filelogger.h" +#include "blackmisc/loghandler.h" + +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include namespace BlackMisc { diff --git a/src/blackmisc/filelogger.h b/src/blackmisc/filelogger.h index 6ff041297..202b8a89c 100644 --- a/src/blackmisc/filelogger.h +++ b/src/blackmisc/filelogger.h @@ -7,15 +7,18 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_FILELOGGER_H #define BLACKMISC_FILELOGGER_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/logpattern.h" +#include "blackmisc/statusmessage.h" -#include "blackmiscexport.h" -#include "loghandler.h" -#include "statusmessage.h" #include +#include +#include #include namespace BlackMisc diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp index bb3c8a6c3..cd7160d8a 100644 --- a/src/blackmisc/fileutils.cpp +++ b/src/blackmisc/fileutils.cpp @@ -7,11 +7,19 @@ * contained in the LICENSE file. */ +#include "blackmisc/buildconfig.h" +#include "blackmisc/fileutils.h" #include "blackmisc/worker.h" -#include "fileutils.h" -#include "buildconfig.h" -#include + #include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/fileutils.h b/src/blackmisc/fileutils.h index 39f97b502..4fe6c60cc 100644 --- a/src/blackmisc/fileutils.h +++ b/src/blackmisc/fileutils.h @@ -12,12 +12,18 @@ #ifndef BLACKMISC_CFILEUTILS_H #define BLACKMISC_CFILEUTILS_H -#include "blackmiscexport.h" -#include -#include +#include "blackmisc/blackmiscexport.h" + #include +#include +#include +#include +#include +#include #include +class QDateTime; + namespace BlackMisc { /*! diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 83e3f5df9..bd6624642 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -9,9 +9,13 @@ #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/propertyindex.h" -#include "blackmisc/math/mathutils.h" #include "blackmisc/variant.h" -#include + +#include +#include +#include + + using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Math; diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 77cc02514..bdba1cd1e 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -15,8 +15,16 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/geo/latitude.h" #include "blackmisc/geo/longitude.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/angle.h" #include "blackmisc/pq/length.h" +#include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include #include #include diff --git a/src/blackmisc/geo/earthangle.cpp b/src/blackmisc/geo/earthangle.cpp index 77db1be18..00f05e176 100644 --- a/src/blackmisc/geo/earthangle.cpp +++ b/src/blackmisc/geo/earthangle.cpp @@ -8,9 +8,16 @@ */ #include "blackmisc/geo/earthangle.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" +#include "blackmisc/pq/units.h" #include "blackmisc/geo/latitude.h" #include "blackmisc/geo/longitude.h" -#include "blackmisc/iconlist.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/geo/geoobjectlist.cpp b/src/blackmisc/geo/geoobjectlist.cpp index f113a151a..c8751a0c4 100644 --- a/src/blackmisc/geo/geoobjectlist.cpp +++ b/src/blackmisc/geo/geoobjectlist.cpp @@ -8,9 +8,11 @@ */ #include "blackmisc/geo/geoobjectlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/airportlist.h" +#include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/xplane/navdatareference.h" diff --git a/src/blackmisc/geo/geoobjectlist.h b/src/blackmisc/geo/geoobjectlist.h index 3619939d5..117f06725 100644 --- a/src/blackmisc/geo/geoobjectlist.h +++ b/src/blackmisc/geo/geoobjectlist.h @@ -12,9 +12,9 @@ #ifndef BLACKMISC_GEO_GEOOBJECTLIST_H #define BLACKMISC_GEO_GEOOBJECTLIST_H -#include "blackmisc/collection.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" -#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/pq/length.h" namespace BlackMisc { @@ -40,6 +40,8 @@ namespace BlackMisc namespace Geo { + class ICoordinateGeodetic; + //! List of objects with geo coordinates. template class IGeoObjectList diff --git a/src/blackmisc/geo/registermetadatageo.h b/src/blackmisc/geo/registermetadatageo.h index 470a682c5..7cf9aaa13 100644 --- a/src/blackmisc/geo/registermetadatageo.h +++ b/src/blackmisc/geo/registermetadatageo.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_GEO_REGISTERMETAGEO_H #define BLACKMISC_GEO_REGISTERMETAGEO_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Geo diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index 11a814161..01b551dc9 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -10,6 +10,10 @@ #include "blackmisc/icon.h" #include "blackmisc/iconlist.h" #include "blackmisc/pq/angle.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/sequence.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index 22fbae846..ec166ccb7 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -12,17 +12,29 @@ #ifndef BLACKMISC_ICON_H #define BLACKMISC_ICON_H -#include "blackmiscexport.h" -#include "icons.h" -#include "variant.h" -#include "inheritancetraits.h" -#include "dictionary.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/icons.h" +#include "blackmisc/json.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + #include +#include +#include +#include +#include namespace BlackMisc { class CIcon; - namespace PhysicalQuantities { class CAngle; } + namespace PhysicalQuantities + { + class CAngle; + } namespace Mixin { diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index f59b64694..82f3fb260 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -7,7 +7,13 @@ * contained in the LICENSE file. */ -#include "iconlist.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/dbus.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/range.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h index b0951e364..bc435d075 100644 --- a/src/blackmisc/iconlist.h +++ b/src/blackmisc/iconlist.h @@ -12,11 +12,18 @@ #ifndef BLACKMISC_ICONLIST_H #define BLACKMISC_ICONLIST_H -#include "blackmiscexport.h" -#include "sequence.h" -#include "collection.h" -#include "icon.h" -#include "icons.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/icon.h" +#include "blackmisc/icons.h" +#include "blackmisc/sequence.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 0d3a27ea7..b38f6273c 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -9,13 +9,17 @@ //! \cond PRIVATE -#include "icons.h" +#include "blackmisc/buildconfig.h" #include "blackmisc/fileutils.h" -#include "buildconfig.h" -#include +#include "blackmisc/icons.h" + #include +#include +#include +#include #include -#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 347f90133..a213af5ee 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -12,9 +12,17 @@ #ifndef BLACKMISC_ICONS_H #define BLACKMISC_ICONS_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" + +#include +#include +#include #include -#include +#include +#include + +class QSize; +template class QMap; namespace BlackMisc { diff --git a/src/blackmisc/identifiable.cpp b/src/blackmisc/identifiable.cpp index 957e1762e..2ae6d024d 100644 --- a/src/blackmisc/identifiable.cpp +++ b/src/blackmisc/identifiable.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "identifiable.h" +#include "blackmisc/identifiable.h" namespace BlackMisc { diff --git a/src/blackmisc/identifiable.h b/src/blackmisc/identifiable.h index 062dcea24..8df0978d1 100644 --- a/src/blackmisc/identifiable.h +++ b/src/blackmisc/identifiable.h @@ -7,14 +7,19 @@ * contained in the LICENSE file. */ -#ifndef BLACKMISC_IDENTIFIABLE_H -#define BLACKMISC_IDENTIFIABLE_H //! \file -#include "blackmiscexport.h" -#include "identifier.h" +#ifndef BLACKMISC_IDENTIFIABLE_H +#define BLACKMISC_IDENTIFIABLE_H + +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/identifier.h" + +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/identifier.cpp b/src/blackmisc/identifier.cpp index 02978dd3a..a4f48c174 100644 --- a/src/blackmisc/identifier.cpp +++ b/src/blackmisc/identifier.cpp @@ -7,7 +7,8 @@ * contained in the LICENSE file. */ -#include "identifier.h" +#include "blackmisc/identifier.h" + #include #include #include diff --git a/src/blackmisc/identifier.h b/src/blackmisc/identifier.h index 2ed88f2bb..c9722f856 100644 --- a/src/blackmisc/identifier.h +++ b/src/blackmisc/identifier.h @@ -7,17 +7,23 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_IDENTIFIER_H #define BLACKMISC_IDENTIFIER_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" -#include "blackmiscexport.h" -#include "valueobject.h" -#include "timestampbased.h" #include +#include #include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/identifierlist.cpp b/src/blackmisc/identifierlist.cpp index 8a345b236..0f99ef7ad 100644 --- a/src/blackmisc/identifierlist.cpp +++ b/src/blackmisc/identifierlist.cpp @@ -7,8 +7,11 @@ * contained in the LICENSE file. */ -#include "identifierlist.h" -#include "predicates.h" +#include "blackmisc/compare.h" +#include "blackmisc/identifierlist.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/identifierlist.h b/src/blackmisc/identifierlist.h index 1ab02a28e..f3c9a3955 100644 --- a/src/blackmisc/identifierlist.h +++ b/src/blackmisc/identifierlist.h @@ -12,11 +12,14 @@ #ifndef BLACKMISC_IDENTIFIERLIST_H #define BLACKMISC_IDENTIFIERLIST_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/identifier.h" -#include "collection.h" -#include "sequence.h" -#include "timestampobjectlist.h" +#include "blackmisc/sequence.h" +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/imageutils.cpp b/src/blackmisc/imageutils.cpp index e05e000e2..3b10cdff0 100644 --- a/src/blackmisc/imageutils.cpp +++ b/src/blackmisc/imageutils.cpp @@ -8,9 +8,10 @@ */ #include "imageutils.h" -#include "stringutils.h" -#include "pixmap.h" +#include "blackmisc/stringutils.h" + #include +#include bool BlackMisc::pixmapToPngByteArray(const QPixmap &pixmap, QByteArray &array) { diff --git a/src/blackmisc/imageutils.h b/src/blackmisc/imageutils.h index a4c313e3b..f0b5b32c5 100644 --- a/src/blackmisc/imageutils.h +++ b/src/blackmisc/imageutils.h @@ -13,6 +13,7 @@ #define BLACKMISC_IMAGEUTILS_H #include "blackmisc/blackmiscexport.h" + #include #include #include diff --git a/src/blackmisc/input/actionhotkey.cpp b/src/blackmisc/input/actionhotkey.cpp index bd0a70d86..285fa8467 100644 --- a/src/blackmisc/input/actionhotkey.cpp +++ b/src/blackmisc/input/actionhotkey.cpp @@ -7,8 +7,7 @@ * contained in the LICENSE file. */ -#include "actionhotkey.h" -#include "variant.h" +#include "blackmisc/input/actionhotkey.h" namespace BlackMisc { diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h index da8bc6db0..52375f40a 100644 --- a/src/blackmisc/input/actionhotkey.h +++ b/src/blackmisc/input/actionhotkey.h @@ -13,10 +13,15 @@ #define BLACKMISC_INPUT_ACTIONHOTKEY_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/input/hotkeycombination.h" #include "blackmisc/identifier.h" -#include +#include "blackmisc/input/hotkeycombination.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/actionhotkeylist.cpp b/src/blackmisc/input/actionhotkeylist.cpp index 57b50d460..fc9c2f9d6 100644 --- a/src/blackmisc/input/actionhotkeylist.cpp +++ b/src/blackmisc/input/actionhotkeylist.cpp @@ -9,6 +9,9 @@ #include "actionhotkeylist.h" +#include "blackmisc/input/actionhotkeylist.h" +#include "blackmisc/input/hotkeycombination.h" + namespace BlackMisc { namespace Input diff --git a/src/blackmisc/input/actionhotkeylist.h b/src/blackmisc/input/actionhotkeylist.h index fa625a7fc..fe8ecb4a8 100644 --- a/src/blackmisc/input/actionhotkeylist.h +++ b/src/blackmisc/input/actionhotkeylist.h @@ -13,9 +13,15 @@ #define BLACKMISC_INPUT_ACTIONHOTKEYLIST_H #include "blackmisc/blackmiscexport.h" -#include "actionhotkey.h" #include "blackmisc/collection.h" +#include "blackmisc/input/actionhotkey.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/hotkeycombination.cpp b/src/blackmisc/input/hotkeycombination.cpp index 5935d8613..dd529fabd 100644 --- a/src/blackmisc/input/hotkeycombination.cpp +++ b/src/blackmisc/input/hotkeycombination.cpp @@ -8,9 +8,13 @@ */ #include "blackmisc/input/hotkeycombination.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/variant.h" +#include "blackmisc/compare.h" +#include "blackmisc/iterator.h" + #include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/hotkeycombination.h b/src/blackmisc/input/hotkeycombination.h index ed8b663bb..a75c95bbd 100644 --- a/src/blackmisc/input/hotkeycombination.h +++ b/src/blackmisc/input/hotkeycombination.h @@ -13,10 +13,15 @@ #define BLACKMISC_INPUT_HOTKEYCOMBINATION_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/input/keyboardkeylist.h" +#include "blackmisc/input/joystickbutton.h" #include "blackmisc/input/joystickbuttonlist.h" +#include "blackmisc/input/keyboardkey.h" +#include "blackmisc/input/keyboardkeylist.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/valueobject.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/joystickbutton.cpp b/src/blackmisc/input/joystickbutton.cpp index 64f9b654a..4aee8c8de 100644 --- a/src/blackmisc/input/joystickbutton.cpp +++ b/src/blackmisc/input/joystickbutton.cpp @@ -8,8 +8,8 @@ */ #include "blackmisc/input/joystickbutton.h" + #include "blackmisc/variant.h" -#include namespace BlackMisc { diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h index 5692a65df..1aacd276a 100644 --- a/src/blackmisc/input/joystickbutton.h +++ b/src/blackmisc/input/joystickbutton.h @@ -13,8 +13,14 @@ #define BLACKMISC_INPUT_JOYSTICKBUTTON_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/joystickbuttonlist.cpp b/src/blackmisc/input/joystickbuttonlist.cpp index 6b3895f53..044b78f64 100644 --- a/src/blackmisc/input/joystickbuttonlist.cpp +++ b/src/blackmisc/input/joystickbuttonlist.cpp @@ -8,7 +8,6 @@ */ #include "blackmisc/input/joystickbuttonlist.h" -#include "blackmisc/predicates.h" namespace BlackMisc { diff --git a/src/blackmisc/input/joystickbuttonlist.h b/src/blackmisc/input/joystickbuttonlist.h index 8fd9e95fd..05a471211 100644 --- a/src/blackmisc/input/joystickbuttonlist.h +++ b/src/blackmisc/input/joystickbuttonlist.h @@ -13,9 +13,14 @@ #define BLACKMISC_INPUT_JOYSTICKBUTTONLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/input/joystickbutton.h" #include "blackmisc/collection.h" +#include "blackmisc/input/joystickbutton.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp index 1a3a8a0ab..5d0cfa24d 100644 --- a/src/blackmisc/input/keyboardkey.cpp +++ b/src/blackmisc/input/keyboardkey.cpp @@ -8,6 +8,12 @@ */ #include "blackmisc/input/keyboardkey.h" + +#include +#include +#include +#include + #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h index 45ad9ba22..2372bef61 100644 --- a/src/blackmisc/input/keyboardkey.h +++ b/src/blackmisc/input/keyboardkey.h @@ -12,10 +12,16 @@ #ifndef BLACKMISC_INPUT_KEYBOARDKEY_H #define BLACKMISC_INPUT_KEYBOARDKEY_H -#include "keycodes.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/input/keycodes.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/keyboardkeylist.cpp b/src/blackmisc/input/keyboardkeylist.cpp index 6147c6c7f..152b75274 100644 --- a/src/blackmisc/input/keyboardkeylist.cpp +++ b/src/blackmisc/input/keyboardkeylist.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "blackmisc/input//keyboardkeylist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/input/keyboardkeylist.h" +#include "blackmisc/input/keycodes.h" namespace BlackMisc { diff --git a/src/blackmisc/input/keyboardkeylist.h b/src/blackmisc/input/keyboardkeylist.h index c0fe8eaff..35f626fc6 100644 --- a/src/blackmisc/input/keyboardkeylist.h +++ b/src/blackmisc/input/keyboardkeylist.h @@ -13,10 +13,14 @@ #define BLACKMISC_INPUT_KEYBOARDKEYLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/input/keyboardkey.h" #include "blackmisc/collection.h" +#include "blackmisc/input/keyboardkey.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/input/registermetadatainput.cpp b/src/blackmisc/input/registermetadatainput.cpp index f9a1ddcee..1539cbfe6 100644 --- a/src/blackmisc/input/registermetadatainput.cpp +++ b/src/blackmisc/input/registermetadatainput.cpp @@ -10,6 +10,8 @@ #include "registermetadatainput.h" #include "input.h" +#include + namespace BlackMisc { namespace Input diff --git a/src/blackmisc/input/registermetadatainput.h b/src/blackmisc/input/registermetadatainput.h index 594f58c34..3712ee3b7 100644 --- a/src/blackmisc/input/registermetadatainput.h +++ b/src/blackmisc/input/registermetadatainput.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_INPUT_REGISTERMETADATAINPUT_H #define BLACKMISC_INPUT_REGISTERMETADATAINPUT_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Input diff --git a/src/blackmisc/json.cpp b/src/blackmisc/json.cpp index e9f9ab741..cc889498a 100644 --- a/src/blackmisc/json.cpp +++ b/src/blackmisc/json.cpp @@ -8,9 +8,15 @@ */ #include "json.h" -#include "stringutils.h" -#include "imageutils.h" +#include "blackmisc/imageutils.h" +#include "blackmisc/stringutils.h" + +#include #include +#include +#include + +class QPixmap; const QJsonValue &operator >>(const QJsonValue &json, int &value) { diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h index 3c78f72fc..87404c848 100644 --- a/src/blackmisc/json.h +++ b/src/blackmisc/json.h @@ -13,20 +13,25 @@ #define BLACKMISC_JSON_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/metaclass.h" -#include "blackmisc/inheritancetraits.h" #include "blackmisc/fileutils.h" -#include +#include "blackmisc/inheritancetraits.h" +#include "blackmisc/metaclass.h" + +#include +#include #include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include +class QDateTime; +class QPixmap; +class QStringList; + /*! * \defgroup JSON Streaming operators for JSON */ diff --git a/src/blackmisc/lockfree.h b/src/blackmisc/lockfree.h index 8247c0496..1132d4424 100644 --- a/src/blackmisc/lockfree.h +++ b/src/blackmisc/lockfree.h @@ -12,11 +12,21 @@ #ifndef BLACKMISC_LOCKFREE_H #define BLACKMISC_LOCKFREE_H +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/integersequence.h" #include "blackmisc/variant.h" -#include +#include "blackmisc/variantprivate.h" + +#include +#include #include +#include +#include +#include +#include #include -#include +#include +#include #include #if ! (defined(Q_CC_GNU) && __GNUC__ <= 4) diff --git a/src/blackmisc/logcategory.cpp b/src/blackmisc/logcategory.cpp index c0dac5848..3325f1b2a 100644 --- a/src/blackmisc/logcategory.cpp +++ b/src/blackmisc/logcategory.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "logcategory.h" +#include "blackmisc/logcategory.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index 33ca5a77b..888ab5b64 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -7,14 +7,18 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_LOGCATEGORY_H #define BLACKMISC_LOGCATEGORY_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/valueobject.h" -#include "blackmiscexport.h" -#include "valueobject.h" -#include "sequence.h" +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/logcategorylist.cpp b/src/blackmisc/logcategorylist.cpp index e0efad517..a88d4c674 100644 --- a/src/blackmisc/logcategorylist.cpp +++ b/src/blackmisc/logcategorylist.cpp @@ -7,7 +7,18 @@ * contained in the LICENSE file. */ -#include "logcategorylist.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/dbus.h" +#include "blackmisc/iterator.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/range.h" +#include "blackmisc/variant.h" + +#include +#include +#include + +struct QMetaObject; namespace BlackMisc { diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index 963f4a3a8..a80df7c2e 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -7,20 +7,28 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_LOGCATEGORYLIST_H #define BLACKMISC_LOGCATEGORYLIST_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/sequence.h" +#include "blackmisc/typetraits.h" -#include "blackmiscexport.h" -#include "logcategory.h" -#include "sequence.h" -#include "collection.h" -#include "typetraits.h" +#include +#include #include +#include +#include #include +#include +#include +#include #include -#include namespace BlackMisc { diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp index 9e881e176..cc10322e7 100644 --- a/src/blackmisc/loghandler.cpp +++ b/src/blackmisc/loghandler.cpp @@ -9,11 +9,20 @@ //! \cond PRIVATE -#include "loghandler.h" -#include "algorithm.h" -#include "worker.h" +#include "blackmisc/algorithm.h" +#include "blackmisc/compare.h" +#include "blackmisc/loghandler.h" +#include "blackmisc/worker.h" + #include +#include +#include #include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h index da90e8fe8..178a6bbce 100644 --- a/src/blackmisc/loghandler.h +++ b/src/blackmisc/loghandler.h @@ -7,21 +7,27 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_LOGHANDLER_H #define BLACKMISC_LOGHANDLER_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logpattern.h" +#include "blackmisc/statusmessage.h" -#include "blackmiscexport.h" -#include "logpattern.h" -#include "statusmessage.h" +#include +#include +#include #include -#include #include #include -#include #include +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/logpattern.cpp b/src/blackmisc/logpattern.cpp index d9436b5b2..3c99222a8 100644 --- a/src/blackmisc/logpattern.cpp +++ b/src/blackmisc/logpattern.cpp @@ -7,8 +7,16 @@ * contained in the LICENSE file. */ -#include "logpattern.h" -#include "logcategorylist.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/logpattern.h" +#include "blackmisc/sequence.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h index 99672debf..7385ee4a6 100644 --- a/src/blackmisc/logpattern.h +++ b/src/blackmisc/logpattern.h @@ -7,15 +7,30 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_LOGPATTERN_H #define BLACKMISC_LOGPATTERN_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" -#include "blackmiscexport.h" -#include "statusmessage.h" -#include -#include +#include +#include +#include +#include +#include + +class QStringList; +template class QHash; namespace BlackMisc { diff --git a/src/blackmisc/math/mathutils.cpp b/src/blackmisc/math/mathutils.cpp index 21857c7a3..8f2e165f5 100644 --- a/src/blackmisc/math/mathutils.cpp +++ b/src/blackmisc/math/mathutils.cpp @@ -8,11 +8,14 @@ */ #include "blackmisc/math/mathutils.h" + #include #include +#include #include #include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/metadatautils.cpp b/src/blackmisc/metadatautils.cpp index e5b8a5f86..e16066659 100644 --- a/src/blackmisc/metadatautils.cpp +++ b/src/blackmisc/metadatautils.cpp @@ -8,7 +8,10 @@ */ #include "metadatautils.h" + #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/metadatautils.h b/src/blackmisc/metadatautils.h index ac7db8bd1..54ab1a790 100644 --- a/src/blackmisc/metadatautils.h +++ b/src/blackmisc/metadatautils.h @@ -13,9 +13,14 @@ #define BLACKMISC_METADATAUTILS_H #include "blackmisc/blackmiscexport.h" -#include + +#include #include +class QMetaType; +class QTextStream; +struct QMetaObject; + //! Metadata util functions namespace BlackMisc { diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp index 63aa9f3ec..5629c7667 100644 --- a/src/blackmisc/namevariantpair.cpp +++ b/src/blackmisc/namevariantpair.cpp @@ -7,8 +7,12 @@ * contained in the LICENSE file. */ -#include "namevariantpair.h" -#include "iconlist.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/propertyindexvariantmap.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index dcd598da4..350744b64 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -12,10 +12,15 @@ #ifndef BLACKMISC_NAMEVARIANTPAIR_H #define BLACKMISC_NAMEVARIANTPAIR_H -#include "blackmiscexport.h" -#include "variant.h" -#include "valueobject.h" -#include "icon.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/namevariantpairlist.cpp b/src/blackmisc/namevariantpairlist.cpp index 3169dde95..2748ae2ff 100644 --- a/src/blackmisc/namevariantpairlist.cpp +++ b/src/blackmisc/namevariantpairlist.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "namevariantpairlist.h" -#include "predicates.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/range.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index d99623365..bf144e71a 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -12,10 +12,15 @@ #ifndef BLACKMISC_NAMEVARIANPAIRTLIST_H #define BLACKMISC_NAMEVARIANPAIRTLIST_H -#include "blackmiscexport.h" -#include "namevariantpair.h" -#include "collection.h" -#include "sequence.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/icon.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp index e2c0d41a5..f2c502fa9 100644 --- a/src/blackmisc/network/authenticateduser.cpp +++ b/src/blackmisc/network/authenticateduser.cpp @@ -9,9 +9,16 @@ #include "blackmisc/network/authenticateduser.h" #include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" -#include + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h index 810fcb6e8..d2efd577a 100644 --- a/src/blackmisc/network/authenticateduser.h +++ b/src/blackmisc/network/authenticateduser.h @@ -15,9 +15,18 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/country.h" #include "blackmisc/datastore.h" -#include "blackmisc/propertyindex.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/network/rolelist.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/client.cpp b/src/blackmisc/network/client.cpp index 403d372ff..4f4fbc28f 100644 --- a/src/blackmisc/network/client.cpp +++ b/src/blackmisc/network/client.cpp @@ -8,10 +8,15 @@ */ #include "blackmisc/network/client.h" -#include "blackmisc/icon.h" #include "blackmisc/aviation/callsign.h" +#include "blackmisc/compare.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclassprivate.h" +#include #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index b0792913d..e820a8975 100644 --- a/src/blackmisc/network/client.h +++ b/src/blackmisc/network/client.h @@ -12,12 +12,20 @@ #ifndef BLACKMISC_NETWORK_CLIENT_H #define BLACKMISC_NETWORK_CLIENT_H +#include "blackmisc/aviation/callsign.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/network/user.h" -#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/network/voicecapabilities.h" #include "blackmisc/propertyindex.h" #include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/clientlist.cpp b/src/blackmisc/network/clientlist.cpp index 5255b97d3..bde8dad08 100644 --- a/src/blackmisc/network/clientlist.cpp +++ b/src/blackmisc/network/clientlist.cpp @@ -8,7 +8,10 @@ */ #include "blackmisc/network/clientlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/metaclassprivate.h" + +#include +#include using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h index 60dccf3c6..14c69cfea 100644 --- a/src/blackmisc/network/clientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -12,16 +12,14 @@ #ifndef BLACKMISC_NETWORK_CLIENTLIST_H #define BLACKMISC_NETWORK_CLIENTLIST_H +#include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/network/client.h" #include "blackmisc/sequence.h" -#include "blackmisc/collection.h" -#include "blackmisc/aviation/callsignobjectlist.h" -#include "blackmisc/aviation/callsign.h" +#include "blackmisc/variant.h" -#include -#include -#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/entityflags.cpp b/src/blackmisc/network/entityflags.cpp index 0dfdd4852..65f663a60 100644 --- a/src/blackmisc/network/entityflags.cpp +++ b/src/blackmisc/network/entityflags.cpp @@ -8,11 +8,11 @@ */ #include "blackmisc/network/entityflags.h" -#include "blackmisc/dbus.h" -#include -#include #include "blackmisc/verify.h" +#include +#include + namespace BlackMisc { namespace Network diff --git a/src/blackmisc/network/entityflags.h b/src/blackmisc/network/entityflags.h index ccec3e07d..43fd3aa0f 100644 --- a/src/blackmisc/network/entityflags.h +++ b/src/blackmisc/network/entityflags.h @@ -14,7 +14,10 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/statusmessage.h" -#include + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp index 45910ff28..884254cee 100644 --- a/src/blackmisc/network/networkutils.cpp +++ b/src/blackmisc/network/networkutils.cpp @@ -7,14 +7,27 @@ * contained in the LICENSE file. */ -#include "networkutils.h" -#include -#include -#include -#include +#include "blackmisc/network/networkutils.h" +#include "blackmisc/network/server.h" + #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include using namespace BlackMisc::Network; diff --git a/src/blackmisc/network/networkutils.h b/src/blackmisc/network/networkutils.h index 8f8c12867..5e650de67 100644 --- a/src/blackmisc/network/networkutils.h +++ b/src/blackmisc/network/networkutils.h @@ -13,20 +13,28 @@ #define BLACKMISC_NETWORKUTILS_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/network/server.h" #include "blackmisc/network/url.h" -#include + +#include #include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include + +class QHttpPart; +class QNetworkReply; +class QUrl; +class QUrlQuery; namespace BlackMisc { namespace Network { + class CServer; + //! Utilities, e.g. checking whether a network connection can be established class BLACKMISC_EXPORT CNetworkUtils { diff --git a/src/blackmisc/network/registermetadatanetwork.h b/src/blackmisc/network/registermetadatanetwork.h index 264685165..f5131931a 100644 --- a/src/blackmisc/network/registermetadatanetwork.h +++ b/src/blackmisc/network/registermetadatanetwork.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_NETWORK_REGISTERMETADATANETWORK_H #define BLACKMISC_NETWORK_REGISTERMETADATANETWORK_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Network diff --git a/src/blackmisc/network/role.cpp b/src/blackmisc/network/role.cpp index b77f367c8..a040f9038 100644 --- a/src/blackmisc/network/role.cpp +++ b/src/blackmisc/network/role.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "role.h" +#include "blackmisc/network/role.h" +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/role.h b/src/blackmisc/network/role.h index aa518300a..11a18df99 100644 --- a/src/blackmisc/network/role.h +++ b/src/blackmisc/network/role.h @@ -13,8 +13,14 @@ #define BLACKMISC_NETWORK_ROLE_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" #include "blackmisc/datastore.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include #include namespace BlackMisc diff --git a/src/blackmisc/network/rolelist.cpp b/src/blackmisc/network/rolelist.cpp index 4946cc25c..02239bda4 100644 --- a/src/blackmisc/network/rolelist.cpp +++ b/src/blackmisc/network/rolelist.cpp @@ -7,8 +7,13 @@ * contained in the LICENSE file. */ +#include "blackmisc/network/role.h" #include "blackmisc/network/rolelist.h" +#include +#include +#include + namespace BlackMisc { namespace Network diff --git a/src/blackmisc/network/rolelist.h b/src/blackmisc/network/rolelist.h index 10f421346..37b4ef4a2 100644 --- a/src/blackmisc/network/rolelist.h +++ b/src/blackmisc/network/rolelist.h @@ -13,14 +13,22 @@ #define BLACKMISC_NETWORK_ROLELIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/network/role.h" #include "blackmisc/collection.h" +#include "blackmisc/network/role.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { namespace Network { + class CRole; + //! Value object encapsulating a list of servers. class BLACKMISC_EXPORT CRoleList : public CSequence, diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp index 1dc04293f..a4f0f6bf9 100644 --- a/src/blackmisc/network/server.cpp +++ b/src/blackmisc/network/server.cpp @@ -8,9 +8,14 @@ */ #include "blackmisc/network/server.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" -#include + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index f5ce3a3fc..49999da84 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -13,9 +13,15 @@ #define BLACKMISC_NETWORK_SERVER_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/network/user.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/serverlist.cpp b/src/blackmisc/network/serverlist.cpp index d85c07d75..a4b1ff476 100644 --- a/src/blackmisc/network/serverlist.cpp +++ b/src/blackmisc/network/serverlist.cpp @@ -8,6 +8,10 @@ */ #include "blackmisc/network/serverlist.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/network/server.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index 2601d01d5..6fcd0ae29 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -13,14 +13,20 @@ #define BLACKMISC_NETWORK_SERVERLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/network/server.h" #include "blackmisc/collection.h" +#include "blackmisc/network/server.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { namespace Network { + class CServer; + //! Value object encapsulating a list of servers. class BLACKMISC_EXPORT CServerList : public CSequence, diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp index 688b8a9f6..fc7f3695d 100644 --- a/src/blackmisc/network/textmessage.cpp +++ b/src/blackmisc/network/textmessage.cpp @@ -8,10 +8,15 @@ */ #include "blackmisc/network/textmessage.h" -#include "blackmisc/pq/constants.h" -#include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" #include "blackmisc/aviation/selcal.h" +#include "blackmisc/pq/constants.h" +#include "blackmisc/pq/physicalquantity.h" + +#include +#include +#include using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h index a503d47f3..0463cf8cd 100644 --- a/src/blackmisc/network/textmessage.h +++ b/src/blackmisc/network/textmessage.h @@ -12,13 +12,21 @@ #ifndef BLACKMISC_NETWORK_TEXTMESSAGE_H #define BLACKMISC_NETWORK_TEXTMESSAGE_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/timestampbased.h" -#include "blackmisc/pq/frequency.h" #include "blackmisc/aviation/callsign.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/timestampbased.h" #include "blackmisc/valueobject.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/textmessagelist.cpp b/src/blackmisc/network/textmessagelist.cpp index 563ddba24..bcf055242 100644 --- a/src/blackmisc/network/textmessagelist.cpp +++ b/src/blackmisc/network/textmessagelist.cpp @@ -8,7 +8,14 @@ */ #include "blackmisc/network/textmessagelist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/iterator.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/range.h" + +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h index 5b8b0e3dd..40eaddc79 100644 --- a/src/blackmisc/network/textmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -12,19 +12,25 @@ #ifndef BLACKMISC_NETWORK_TEXTMESSAGELIST_H #define BLACKMISC_NETWORK_TEXTMESSAGELIST_H +#include "blackmisc/aviation/callsign.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/network/textmessage.h" -#include "blackmisc/timestampobjectlist.h" #include "blackmisc/collection.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/pq/frequency.h" #include "blackmisc/sequence.h" -#include -#include +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/variant.h" + #include +#include +#include namespace BlackMisc { namespace Network { + class CTextMessage; + //! Value object encapsulating a list of text messages class BLACKMISC_EXPORT CTextMessageList : public CSequence, diff --git a/src/blackmisc/network/url.cpp b/src/blackmisc/network/url.cpp index dd8e3d346..dbc892f1c 100644 --- a/src/blackmisc/network/url.cpp +++ b/src/blackmisc/network/url.cpp @@ -8,9 +8,12 @@ */ #include "blackmisc/network/url.h" -#include "blackmisc/network/networkutils.h" #include "blackmisc/propertyindex.h" +#include +#include +#include + namespace BlackMisc { namespace Network diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h index 1cca57d42..bd0e78b55 100644 --- a/src/blackmisc/network/url.h +++ b/src/blackmisc/network/url.h @@ -13,9 +13,16 @@ #define BLACKMISC_NETWORK_NETWORKLOCATION_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" -#include +#include "blackmisc/variant.h" + +#include +#include #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/urllist.cpp b/src/blackmisc/network/urllist.cpp index e0d16b2d8..46767b20c 100644 --- a/src/blackmisc/network/urllist.cpp +++ b/src/blackmisc/network/urllist.cpp @@ -8,8 +8,11 @@ */ #include "blackmisc/network/urllist.h" -#include "blackmisc/network/networkutils.h" #include "blackmisc/math/mathutils.h" +#include "blackmisc/network/networkutils.h" + +#include +#include using namespace BlackMisc::Math; diff --git a/src/blackmisc/network/urllist.h b/src/blackmisc/network/urllist.h index e89bfca6b..fdf4ea661 100644 --- a/src/blackmisc/network/urllist.h +++ b/src/blackmisc/network/urllist.h @@ -13,10 +13,14 @@ #define BLACKMISC_NETWORK_NETWORKLOCATIONLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/network/url.h" #include "blackmisc/collection.h" +#include "blackmisc/network/url.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp index da8c0b361..9a7c47dc4 100644 --- a/src/blackmisc/network/user.cpp +++ b/src/blackmisc/network/user.cpp @@ -9,11 +9,16 @@ #include "blackmisc/network/user.h" #include "blackmisc/aviation/airporticaocode.h" -#include "blackmisc/icon.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/variant.h" -#include + +#include #include +#include +#include +#include +#include using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h index d814747c6..fbbdab1c1 100644 --- a/src/blackmisc/network/user.h +++ b/src/blackmisc/network/user.h @@ -12,11 +12,18 @@ #ifndef BLACKMISC_NETWORK_USER_H #define BLACKMISC_NETWORK_USER_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" #include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/userlist.cpp b/src/blackmisc/network/userlist.cpp index 861662a82..489ea0464 100644 --- a/src/blackmisc/network/userlist.cpp +++ b/src/blackmisc/network/userlist.cpp @@ -8,7 +8,10 @@ */ #include "blackmisc/network/userlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/metaclassprivate.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index 13a6ae309..d3a7c4468 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -13,12 +13,12 @@ #define BLACKMISC_NETWORK_USERLIST_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/network/user.h" #include "blackmisc/sequence.h" -#include "blackmisc/collection.h" -#include -#include -#include +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/network/voicecapabilites.cpp b/src/blackmisc/network/voicecapabilites.cpp index 924b93a97..2e79fc08a 100644 --- a/src/blackmisc/network/voicecapabilites.cpp +++ b/src/blackmisc/network/voicecapabilites.cpp @@ -7,9 +7,14 @@ * contained in the LICENSE file. */ -#include "blackmisc/network/voicecapabilities.h" +#include "blackmisc/icon.h" #include "blackmisc/iconlist.h" -#include +#include "blackmisc/icons.h" +#include "blackmisc/network/voicecapabilities.h" + +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/orderable.cpp b/src/blackmisc/orderable.cpp index fb9afee84..2e4273c80 100644 --- a/src/blackmisc/orderable.cpp +++ b/src/blackmisc/orderable.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "orderable.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/orderable.h" #include "blackmisc/variant.h" + +#include +#include #include namespace BlackMisc diff --git a/src/blackmisc/orderable.h b/src/blackmisc/orderable.h index 287988f8d..d6e5ca76c 100644 --- a/src/blackmisc/orderable.h +++ b/src/blackmisc/orderable.h @@ -12,8 +12,11 @@ #ifndef BLACKMISC_ORDERABLE_H #define BLACKMISC_ORDERABLE_H -#include "blackmiscexport.h" -#include "propertyindex.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/orderablelist.cpp b/src/blackmisc/orderablelist.cpp index 7263994c3..1f9d903e3 100644 --- a/src/blackmisc/orderablelist.cpp +++ b/src/blackmisc/orderablelist.cpp @@ -8,10 +8,11 @@ */ #include "blackmisc/orderablelist.h" -#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/predicates.h" #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributorlist.h" + #include -#include #include namespace BlackMisc diff --git a/src/blackmisc/orderablelist.h b/src/blackmisc/orderablelist.h index 3698c8110..f0d970cc6 100644 --- a/src/blackmisc/orderablelist.h +++ b/src/blackmisc/orderablelist.h @@ -12,8 +12,9 @@ #ifndef BLACKMISC_ORDERABLELIST_H #define BLACKMISC_ORDERABLELIST_H -#include "blackmisc/collection.h" -#include "blackmisc/sequence.h" +#include "blackmisc/blackmiscexport.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/pixmap.cpp b/src/blackmisc/pixmap.cpp index fb5aeea14..e69fe94e0 100644 --- a/src/blackmisc/pixmap.cpp +++ b/src/blackmisc/pixmap.cpp @@ -7,11 +7,19 @@ * contained in the LICENSE file. */ -#include "pixmap.h" +#include "blackmisc/pixmap.h" +#include "blackmisc/statusmessage.h" + #include #include +#include +#include +#include +#include #include + + namespace BlackMisc { CPixmap::CPixmap(const QPixmap &pixmap) : m_pixmap(pixmap), m_hasCachedPixmap(true) diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h index cac0533a7..854209d2c 100644 --- a/src/blackmisc/pixmap.h +++ b/src/blackmisc/pixmap.h @@ -12,14 +12,20 @@ #ifndef BLACKMISC_PIXMAP_H #define BLACKMISC_PIXMAP_H -#include "blackmiscexport.h" -#include "valueobject.h" -#include "statusmessage.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/valueobject.h" + +#include +#include #include #include +#include namespace BlackMisc { + class CStatusMessage; + //! Pixmap which can be transferred via DBus. //! \remark: Use, when a pixmap cannot be stored in the resources class BLACKMISC_EXPORT CPixmap : public CValueObject diff --git a/src/blackmisc/pq/angle.cpp b/src/blackmisc/pq/angle.cpp index de8c520b2..effd37d2f 100644 --- a/src/blackmisc/pq/angle.cpp +++ b/src/blackmisc/pq/angle.cpp @@ -9,7 +9,10 @@ #include "blackmisc/pq/angle.h" #include "blackmisc/iconlist.h" -#include "blackmisc/aviation/heading.h" +#include "blackmisc/icons.h" +#include "blackmisc/math/mathutils.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/angle.h b/src/blackmisc/pq/angle.h index 8558c076e..9a9038927 100644 --- a/src/blackmisc/pq/angle.h +++ b/src/blackmisc/pq/angle.h @@ -13,8 +13,13 @@ #define BLACKMISC_PQ_ANGLE_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/icon.h" #include "blackmisc/math/mathutils.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/units.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/measurementunit.cpp b/src/blackmisc/pq/measurementunit.cpp index e430f266a..aa0fa3907 100644 --- a/src/blackmisc/pq/measurementunit.cpp +++ b/src/blackmisc/pq/measurementunit.cpp @@ -9,6 +9,7 @@ #include "blackmisc/pq/measurementunit.h" #include "blackmisc/math/mathutils.h" +#include using namespace BlackMisc::Math; diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index 6e302d0b3..32043fb95 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -13,18 +13,24 @@ #define BLACKMISC_PQ_MEASUREMENTUNIT_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/icon.h" #include "blackmisc/math/mathutils.h" +#include "blackmisc/stringutils.h" + #include -#include -#include -#include -#include +#include +#include #include #include -#include -#include +#include +#include +#include +#include +#include #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp index 67a0fe4be..cffe5ffe2 100644 --- a/src/blackmisc/pq/physicalquantity.cpp +++ b/src/blackmisc/pq/physicalquantity.cpp @@ -7,10 +7,32 @@ * contained in the LICENSE file. */ -#include "blackmisc/pq/pq.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/dictionary.h" +#include "blackmisc/pq/measurementunit.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/pqstring.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/variant.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/mass.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/acceleration.h" + #include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index fee50ad9c..e5f37677e 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -12,22 +12,26 @@ #ifndef BLACKMISC_PQ_PHYSICALQUANTITY_H #define BLACKMISC_PQ_PHYSICALQUANTITY_H -#include "blackmisc/pq/measurementunit.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/dbus.h" +#include "blackmisc/icon.h" +#include "blackmisc/json.h" +#include "blackmisc/pq/pqstring.h" #include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" -#include "blackmisc/math/mathutils.h" -#include "blackmisc/pq/pqstring.h" -#include -#include +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include #include -#include -#include +#include namespace BlackMisc { namespace PhysicalQuantities { - class CLength; class CPressure; class CFrequency; diff --git a/src/blackmisc/pq/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp index d5d6da742..97959a5db 100644 --- a/src/blackmisc/pq/pqstring.cpp +++ b/src/blackmisc/pq/pqstring.cpp @@ -8,8 +8,22 @@ */ #include "blackmisc/pq/pqstring.h" -#include "blackmisc/pq/pq.h" +#include "blackmisc/pq/acceleration.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/mass.h" +#include "blackmisc/pq/measurementunit.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/units.h" + +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h index 730e2c9e5..d28b1a1b6 100644 --- a/src/blackmisc/pq/pqstring.h +++ b/src/blackmisc/pq/pqstring.h @@ -13,9 +13,13 @@ #define BLACKMISC_PQ_PQSTRING_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" #include "blackmisc/variant.h" +#include +#include + namespace BlackMisc { namespace PhysicalQuantities diff --git a/src/blackmisc/pq/registermetadatapq.cpp b/src/blackmisc/pq/registermetadatapq.cpp index af5b55dee..fedec8643 100644 --- a/src/blackmisc/pq/registermetadatapq.cpp +++ b/src/blackmisc/pq/registermetadatapq.cpp @@ -8,7 +8,19 @@ */ #include "registermetadatapq.h" -#include "pq.h" +#include "blackmisc/pq/acceleration.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/mass.h" +#include "blackmisc/pq/pqstring.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" namespace BlackMisc { diff --git a/src/blackmisc/pq/registermetadatapq.h b/src/blackmisc/pq/registermetadatapq.h index 853f5c754..0f17d0002 100644 --- a/src/blackmisc/pq/registermetadatapq.h +++ b/src/blackmisc/pq/registermetadatapq.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_PQ_REGISTERMETADATAPQ_H #define BLACKMISC_PQ_REGISTERMETADATAPQ_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace PhysicalQuantities diff --git a/src/blackmisc/pq/time.cpp b/src/blackmisc/pq/time.cpp index e52cf2d65..6f88a3341 100644 --- a/src/blackmisc/pq/time.cpp +++ b/src/blackmisc/pq/time.cpp @@ -8,6 +8,10 @@ */ #include "blackmisc/pq/time.h" +#include "blackmisc/math/mathutils.h" +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/time.h b/src/blackmisc/pq/time.h index 0b6fe1c07..040165eb9 100644 --- a/src/blackmisc/pq/time.h +++ b/src/blackmisc/pq/time.h @@ -14,6 +14,14 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/pqstring.h" +#include "blackmisc/pq/units.h" + +#include +#include +#include + +class QTime; namespace BlackMisc { diff --git a/src/blackmisc/pq/units.cpp b/src/blackmisc/pq/units.cpp index 30a172bba..0401438e9 100644 --- a/src/blackmisc/pq/units.cpp +++ b/src/blackmisc/pq/units.cpp @@ -8,6 +8,9 @@ */ #include "blackmisc/pq/units.h" +#include "blackmisc/math/mathutils.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/pq/units.h b/src/blackmisc/pq/units.h index a59082ee5..a7de3fee2 100644 --- a/src/blackmisc/pq/units.h +++ b/src/blackmisc/pq/units.h @@ -16,11 +16,18 @@ #undef min #include "blackmisc/blackmiscexport.h" +#include "blackmisc/dbus.h" #include "blackmisc/pq/measurementunit.h" -#include +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/variant.h" + +#include +#include #include -#include -#include +#include +#include +#include +#include // // Used with the template for quantities. This is the reason for diff --git a/src/blackmisc/propertyindex.cpp b/src/blackmisc/propertyindex.cpp index 1961914cf..009994ff8 100644 --- a/src/blackmisc/propertyindex.cpp +++ b/src/blackmisc/propertyindex.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "propertyindex.h" -#include "predicates.h" +#include "blackmisc/propertyindex.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 2b31c9521..7c37e17e6 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -12,14 +12,20 @@ #ifndef BLACKMISC_PROPERTYINDEX_H #define BLACKMISC_PROPERTYINDEX_H -#include "blackmiscexport.h" -#include "dictionary.h" -#include "stringutils.h" -#include "variant.h" -#include "dbus.h" -#include "json.h" -#include "compare.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/json.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + +#include +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/propertyindexlist.cpp b/src/blackmisc/propertyindexlist.cpp index 38f5a5b8e..f550c98ce 100644 --- a/src/blackmisc/propertyindexlist.cpp +++ b/src/blackmisc/propertyindexlist.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "propertyindexlist.h" +#include "blackmisc/propertyindexlist.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index ef4ecd378..b44d87af9 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -12,11 +12,13 @@ #ifndef BLACKMISC_PROPERTYINDEXLIST_H #define BLACKMISC_PROPERTYINDEXLIST_H -#include "blackmiscexport.h" -#include "propertyindex.h" -#include "collection.h" -#include "sequence.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/propertyindexvariantmap.cpp b/src/blackmisc/propertyindexvariantmap.cpp index 76ff40b1e..8b02cd878 100644 --- a/src/blackmisc/propertyindexvariantmap.cpp +++ b/src/blackmisc/propertyindexvariantmap.cpp @@ -9,9 +9,11 @@ //! \cond PRIVATE -#include "propertyindexvariantmap.h" -#include "propertyindexlist.h" -#include "dictionary.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/propertyindexvariantmap.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 3149a5520..da1f1e633 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -12,12 +12,25 @@ #ifndef BLACKMISC_PROPERTYINDEXVARIANTMAP_H #define BLACKMISC_PROPERTYINDEXVARIANTMAP_H -#include "variant.h" -#include "propertyindexlist.h" -#include "blackmiscexport.h" -#include "inheritancetraits.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/inheritancetraits.h" +#include "blackmisc/predicates.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/propertyindexlist.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variant.h" + #include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/registermetadata.cpp b/src/blackmisc/registermetadata.cpp index 0e0ea6c11..c5f35980a 100644 --- a/src/blackmisc/registermetadata.cpp +++ b/src/blackmisc/registermetadata.cpp @@ -8,27 +8,43 @@ */ #include "registermetadata.h" -#include "audio/registermetadataaudio.h" -#include "aviation/registermetadataaviation.h" -#include "geo/registermetadatageo.h" -#include "input/registermetadatainput.h" -#include "network/registermetadatanetwork.h" -#include "pq/registermetadatapq.h" -#include "simulation/registermetadatasimulation.h" -#include "weather/registermetadataweather.h" -#include "propertyindexlist.h" -#include "propertyindexvariantmap.h" -#include "namevariantpairlist.h" -#include "variantlist.h" -#include "variantmap.h" -#include "valuecache.h" -#include "rgbcolor.h" -#include "countrylist.h" -#include "statusmessagelist.h" -#include "pixmap.h" -#include "iconlist.h" -#include "identifierlist.h" -#include "logpattern.h" +#include "blackmisc/audio/registermetadataaudio.h" +#include "blackmisc/aviation/registermetadataaviation.h" +#include "blackmisc/country.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/dbus.h" +#include "blackmisc/geo/registermetadatageo.h" +#include "blackmisc/icon.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/identifier.h" +#include "blackmisc/identifierlist.h" +#include "blackmisc/input/registermetadatainput.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/logpattern.h" +#include "blackmisc/namevariantpair.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/network/registermetadatanetwork.h" +#include "blackmisc/pixmap.h" +#include "blackmisc/pq/registermetadatapq.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/propertyindexlist.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/rgbcolor.h" +#include "blackmisc/sequence.h" +#include "blackmisc/simulation/registermetadatasimulation.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/valuecache.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" +#include "blackmisc/variantlist.h" +#include "blackmisc/variantmap.h" +#include "blackmisc/weather/registermetadataweather.h" + +#include +#include +#include void initBlackMiscResourcesImpl() { diff --git a/src/blackmisc/rgbcolor.cpp b/src/blackmisc/rgbcolor.cpp index d6cd3b078..ae08b31f8 100644 --- a/src/blackmisc/rgbcolor.cpp +++ b/src/blackmisc/rgbcolor.cpp @@ -8,9 +8,17 @@ */ #include "blackmisc/rgbcolor.h" -#include "stringutils.h" -#include "comparefunctions.h" +#include "blackmisc/compare.h" +#include "blackmisc/comparefunctions.h" +#include "blackmisc/icons.h" +#include "blackmisc/stringutils.h" + +#include #include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h index 0479902bf..dadf02bcb 100644 --- a/src/blackmisc/rgbcolor.h +++ b/src/blackmisc/rgbcolor.h @@ -12,9 +12,17 @@ #ifndef BLACKMISC_RGBCOLOR_H #define BLACKMISC_RGBCOLOR_H -#include "blackmiscexport.h" -#include "valueobject.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + #include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/sampleutils.cpp b/src/blackmisc/sampleutils.cpp index 7402ea752..be45773d0 100644 --- a/src/blackmisc/sampleutils.cpp +++ b/src/blackmisc/sampleutils.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "sampleutils.h" +#include "blackmisc/sampleutils.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/sampleutils.h b/src/blackmisc/sampleutils.h index 0390184b5..6e8cff86e 100644 --- a/src/blackmisc/sampleutils.h +++ b/src/blackmisc/sampleutils.h @@ -12,9 +12,12 @@ #ifndef BLACKMISC_SAMPLEUTILS_H #define BLACKMISC_SAMPLEUTILS_H -#include "blackmiscexport.h" +#include "blackmisc/blackmiscexport.h" + +#include #include -#include + +class QTextStream; namespace BlackMisc { diff --git a/src/blackmisc/settingscache.cpp b/src/blackmisc/settingscache.cpp index 43a055698..cdd05aea3 100644 --- a/src/blackmisc/settingscache.cpp +++ b/src/blackmisc/settingscache.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "settingscache.h" -#include "logmessage.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/settingscache.h" + #include namespace BlackMisc diff --git a/src/blackmisc/settingscache.h b/src/blackmisc/settingscache.h index 743d020c6..41003cd71 100644 --- a/src/blackmisc/settingscache.h +++ b/src/blackmisc/settingscache.h @@ -13,8 +13,14 @@ #define BLACKMISC_SETTINGSCACHE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/statusmessage.h" #include "blackmisc/valuecache.h" +#include +#include +#include +#include + namespace BlackMisc { /*! diff --git a/src/blackmisc/simplecommandparser.cpp b/src/blackmisc/simplecommandparser.cpp index a653c5701..01f4957c2 100644 --- a/src/blackmisc/simplecommandparser.cpp +++ b/src/blackmisc/simplecommandparser.cpp @@ -7,8 +7,12 @@ * contained in the LICENSE file. */ -#include "simplecommandparser.h" #include "blackmisc/pq/pqstring.h" +#include "blackmisc/simplecommandparser.h" + +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/simplecommandparser.h b/src/blackmisc/simplecommandparser.h index 44548f3dd..150090b21 100644 --- a/src/blackmisc/simplecommandparser.h +++ b/src/blackmisc/simplecommandparser.h @@ -12,9 +12,10 @@ #ifndef BLACKMISC_SIMPLECOMMANDPARSER_H #define BLACKMISC_SIMPLECOMMANDPARSER_H -#include "blackmiscexport.h" -#include +#include "blackmisc/blackmiscexport.h" + #include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 49da5e347..7ac63102d 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -7,14 +7,24 @@ * contained in the LICENSE file. */ -#include "aircraftmodel.h" -#include "distributorlist.h" -#include "blackmisc/datastoreutility.h" +#include "blackmisc/compare.h" #include "blackmisc/comparefunctions.h" -#include +#include "blackmisc/datastoreutility.h" +#include "blackmisc/icon.h" +#include "blackmisc/iconlist.h" +#include "blackmisc/icons.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/verify.h" + #include #include -#include "blackmisc/verify.h" +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index f386f102c..4adae1ed3 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -12,18 +12,40 @@ #ifndef BLACKMISC_SIMULATION_AIRCRAFTMODEL_H #define BLACKMISC_SIMULATION_AIRCRAFTMODEL_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/simulatorinfo.h" -#include "blackmisc/simulation/distributorlist.h" -#include "blackmisc/aviation/livery.h" #include "blackmisc/aviation/aircrafticaocode.h" -#include "blackmisc/network/user.h" -#include "blackmisc/propertyindex.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/datastore.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/orderable.h" #include "blackmisc/pixmap.h" -#include +#include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { + class CIcon; + class CStatusMessage; + namespace Simulation { //! Aircraft model (used by another pilot, my models on disk) diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 04f2a1f78..4d03d3751 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -8,7 +8,19 @@ */ #include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/compare.h" +#include "blackmisc/iterator.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/range.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include +#include using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index f1121b5d9..ba087d438 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -12,16 +12,35 @@ #ifndef BLACKMISC_SIMULATION_AIRCRAFTMODELLIST_H #define BLACKMISC_SIMULATION_AIRCRAFTMODELLIST_H +#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/aircraftmodel.h" -#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/collection.h" #include "blackmisc/datastoreobjectlist.h" #include "blackmisc/orderablelist.h" -#include "blackmisc/collection.h" #include "blackmisc/sequence.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessagelist.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAircraftIcaoCode; + class CCallsign; + class CLivery; + } + namespace Simulation { //! Value object encapsulating a list of aircraft models diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp index 3a53baa01..6e40c37f9 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelloader.cpp @@ -7,11 +7,16 @@ * contained in the LICENSE file. */ -#include "aircraftmodelloader.h" +#include "blackmisc/compare.h" +#include "blackmisc/simulation/aircraftmodelloader.h" #include "blackmisc/simulation/fscommon/aircraftcfgparser.h" #include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h" #include "blackmisc/simulation/xplane/xplaneutil.h" +#include +#include +#include + using namespace BlackMisc::Simulation::Data; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::XPlane; diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index 8aef6a056..19aea264e 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -14,10 +14,17 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/simulation/aircraftmodelinterfaces.h" -#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/data/modelcaches.h" -#include "blackmisc/pixmap.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include #include +#include +#include #include #include diff --git a/src/blackmisc/simulation/aircraftmodelsetloader.cpp b/src/blackmisc/simulation/aircraftmodelsetloader.cpp index e879b2e55..74d93af08 100644 --- a/src/blackmisc/simulation/aircraftmodelsetloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelsetloader.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "aircraftmodelsetloader.h" +#include "blackmisc/simulation/aircraftmodelsetloader.h" + +#include +#include using namespace BlackMisc::Simulation::Data; diff --git a/src/blackmisc/simulation/aircraftmodelsetloader.h b/src/blackmisc/simulation/aircraftmodelsetloader.h index b0ec3e050..029fe27ba 100644 --- a/src/blackmisc/simulation/aircraftmodelsetloader.h +++ b/src/blackmisc/simulation/aircraftmodelsetloader.h @@ -13,10 +13,16 @@ #define BLACKMISC_SIMULATION_AIRCRAFTMODELSETLOADER_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodelinterfaces.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/data/modelcaches.h" -#include "blackmisc/pixmap.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" + +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/aircraftmodelutils.cpp b/src/blackmisc/simulation/aircraftmodelutils.cpp index e4c80e9c5..51d69b7e0 100644 --- a/src/blackmisc/simulation/aircraftmodelutils.cpp +++ b/src/blackmisc/simulation/aircraftmodelutils.cpp @@ -7,8 +7,8 @@ * contained in the LICENSE file. */ -#include "aircraftmodelutils.h" - +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodelutils.h" namespace BlackMisc { diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp index 3188c39af..a7538cb9e 100644 --- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp +++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp @@ -7,7 +7,11 @@ * contained in the LICENSE file. */ -#include "airspaceaircraftsnapshot.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/simulation/airspaceaircraftsnapshot.h" +#include "blackmisc/simulation/simulatedaircraft.h" + #include using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h index ee3028036..451f08b41 100644 --- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h +++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h @@ -12,11 +12,20 @@ #ifndef BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H #define BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/callsignset.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + #include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/data/modelcaches.cpp b/src/blackmisc/simulation/data/modelcaches.cpp index f7ce9742d..ce6985c65 100644 --- a/src/blackmisc/simulation/data/modelcaches.cpp +++ b/src/blackmisc/simulation/data/modelcaches.cpp @@ -7,8 +7,10 @@ * contained in the LICENSE file. */ -#include "modelcaches.h" #include "blackmisc/logmessage.h" +#include "blackmisc/simulation/data/modelcaches.h" + +#include using namespace BlackMisc; diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index 854040050..d8dace5ab 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -13,8 +13,13 @@ #define BLACKMISC_SIMULATION_DATA_MODELCACHES #include "blackmisc/datacache.h" -#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelinterfaces.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/statusmessage.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index 0a82a4c65..e5525ed46 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -7,8 +7,14 @@ * contained in the LICENSE file. */ -#include "distributor.h" -#include +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h index 901fb31e9..b238314bd 100644 --- a/src/blackmisc/simulation/distributor.h +++ b/src/blackmisc/simulation/distributor.h @@ -13,12 +13,18 @@ #define BLACKMISC_SIMULATION_DISTRIBUTOR_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/simulatorinfo.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/orderable.h" #include "blackmisc/datastore.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/orderable.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/statusmessagelist.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributorlist.cpp b/src/blackmisc/simulation/distributorlist.cpp index 986b9e4fb..b807e2df6 100644 --- a/src/blackmisc/simulation/distributorlist.cpp +++ b/src/blackmisc/simulation/distributorlist.cpp @@ -8,7 +8,9 @@ */ #include "blackmisc/simulation/distributorlist.h" -#include "blackmisc/predicates.h" +#include "blackmisc/metaclassprivate.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributorlist.h b/src/blackmisc/simulation/distributorlist.h index c207ff339..8dbd55843 100644 --- a/src/blackmisc/simulation/distributorlist.h +++ b/src/blackmisc/simulation/distributorlist.h @@ -13,14 +13,17 @@ #define BLACKMISC_SIMULATION_DISTRIBUTORLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/distributor.h" +#include "blackmisc/collection.h" #include "blackmisc/datastoreobjectlist.h" #include "blackmisc/orderablelist.h" -#include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/variant.h" + +#include #include -#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributorlistpreferences.cpp b/src/blackmisc/simulation/distributorlistpreferences.cpp index 9b39769d2..518abcf8f 100644 --- a/src/blackmisc/simulation/distributorlistpreferences.cpp +++ b/src/blackmisc/simulation/distributorlistpreferences.cpp @@ -8,7 +8,8 @@ */ #include "blackmisc/simulation/distributorlistpreferences.h" -#include "blackmisc/predicates.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/distributorlistpreferences.h b/src/blackmisc/simulation/distributorlistpreferences.h index fb48e6208..36fea53b7 100644 --- a/src/blackmisc/simulation/distributorlistpreferences.h +++ b/src/blackmisc/simulation/distributorlistpreferences.h @@ -13,9 +13,19 @@ #define BLACKMISC_SIMULATION_DISTRIBUTORLISTPREFRENCES_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/containerbase.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/valueobject.h" +#include +#include +#include +#include + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp index 97d00ce62..0995efd6e 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp @@ -7,10 +7,16 @@ * contained in the LICENSE file. */ -#include "aircraftcfgentries.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentries.h" #include "blackmisc/variant.h" + #include #include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h index 44920ceae..f3465b727 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h @@ -13,12 +13,16 @@ #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGENTRY_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/timestampbased.h" -#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/timestampbased.h" +#include "blackmisc/valueobject.h" #include "blackmisc/variant.h" +#include +#include + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp index 745fece59..7e4186cdf 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp @@ -7,9 +7,10 @@ * contained in the LICENSE file. */ -#include "aircraftcfgentrieslist.h" #include "blackmisc/predicates.h" -#include "blackmisc/logmessage.h" +#include "blackmisc/range.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" using namespace BlackMisc; using namespace BlackMisc::Simulation; diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h index a43787642..084e3537f 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h @@ -13,14 +13,18 @@ #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/fscommon/aircraftcfgentries.h" -#include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/sequence.h" #include "blackmisc/collection.h" -#include -#include -#include -#include +#include "blackmisc/sequence.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentries.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp index 43a3766fb..59337410d 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp @@ -7,13 +7,29 @@ * contained in the LICENSE file. */ -#include "aircraftcfgparser.h" -#include "blackmisc/simulation/fscommon/fscommonutil.h" -#include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/fileutils.h" -#include "blackmisc/predicates.h" #include "blackmisc/logmessage.h" +#include "blackmisc/simulation/aircraftmodelutils.h" +#include "blackmisc/simulation/fscommon/aircraftcfgentries.h" +#include "blackmisc/simulation/fscommon/aircraftcfgparser.h" +#include "blackmisc/simulation/fscommon/fscommonutil.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/worker.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include using namespace BlackMisc; diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.h b/src/blackmisc/simulation/fscommon/aircraftcfgparser.h index 309e256a8..3eaef20d2 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.h @@ -13,17 +13,24 @@ #define BLACKMISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/worker.h" -#include "blackmisc/pixmap.h" -#include "blackmisc/datacache.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelloader.h" #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" -#include "blackmisc/simulation/data/modelcaches.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include #include +#include +#include +#include +#include + +class QSettings; namespace BlackMisc { + class CWorker; + namespace Simulation { namespace FsCommon diff --git a/src/blackmisc/simulation/fscommon/bcdconversions.cpp b/src/blackmisc/simulation/fscommon/bcdconversions.cpp index 49e2bed3d..59dc0c038 100644 --- a/src/blackmisc/simulation/fscommon/bcdconversions.cpp +++ b/src/blackmisc/simulation/fscommon/bcdconversions.cpp @@ -7,12 +7,13 @@ * contained in the LICENSE file. */ -#include "bcdconversions.h" +#include "blackmisc/aviation/transponder.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/simulation/fscommon/bcdconversions.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; - namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/fscommon/bcdconversions.h b/src/blackmisc/simulation/fscommon/bcdconversions.h index 8b731b2c5..dec5c8a8f 100644 --- a/src/blackmisc/simulation/fscommon/bcdconversions.h +++ b/src/blackmisc/simulation/fscommon/bcdconversions.h @@ -14,11 +14,16 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/pq/frequency.h" -#include "blackmisc/aviation/transponder.h" + #include namespace BlackMisc { + namespace Aviation + { + class CTransponder; + } + namespace Simulation { namespace FsCommon diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index 39131fd4f..d14a8e431 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -8,9 +8,14 @@ */ #include "blackmisc/buildconfig.h" -#include "fscommonutil.h" -#include +#include "blackmisc/simulation/fscommon/fscommonutil.h" + #include +#include +#include +#include +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.h b/src/blackmisc/simulation/fscommon/fscommonutil.h index fb9f3f513..1e80d3605 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.h +++ b/src/blackmisc/simulation/fscommon/fscommonutil.h @@ -13,8 +13,11 @@ #define BLACKMISC_SIMULATION_FSCOMMONUTIL_H #include "blackmisc/blackmiscexport.h" + #include +class QStringList; + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp index 5c2de29e2..64184c067 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp @@ -7,11 +7,14 @@ * contained in the LICENSE file. */ -#include "vpilotmodelrule.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/livery.h" #include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/fscommon/vpilotmodelrule.h" +#include "blackmisc/simulation/simulatorinfo.h" + +#include using namespace BlackMisc::Network; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h index 961b50593..2b4fd655e 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h +++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h @@ -13,11 +13,16 @@ #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULE_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/simulation/aircraftmodel.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/datastore.h" #include "blackmisc/timestampbased.h" -#include +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp index e9bdee094..8b8a66755 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "vpilotmodelruleset.h" -#include "blackmisc/predicates.h" +#include "blackmisc/range.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h" + +#include +#include #include +#include +#include using namespace BlackMisc::Network; diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h index 134f77260..7a4be6c8f 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h +++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h @@ -12,11 +12,18 @@ #ifndef BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULELIST_H #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELRULELIST_H +#include +#include +#include + #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/fscommon/vpilotmodelrule.h" -#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/sequence.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/fscommon/vpilotmodelrule.h" +#include "blackmisc/variant.h" namespace BlackMisc { diff --git a/src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp b/src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp index 15e4b8e38..c49353e12 100644 --- a/src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp +++ b/src/blackmisc/simulation/fscommon/vpilotrulesreader.cpp @@ -7,12 +7,29 @@ * contained in the LICENSE file. */ -#include "vpilotrulesreader.h" #include "blackmisc/logmessage.h" -#include -#include +#include "blackmisc/simulation/fscommon/vpilotmodelrule.h" +#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/worker.h" + +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h index b41b8f238..793df75f2 100644 --- a/src/blackmisc/simulation/fscommon/vpilotrulesreader.h +++ b/src/blackmisc/simulation/fscommon/vpilotrulesreader.h @@ -13,16 +13,20 @@ #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTRULESREADER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/worker.h" +#include "blackmisc/datacache.h" #include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h" #include "blackmisc/simulation/data/modelcaches.h" -#include +#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h" + #include #include +#include +#include namespace BlackMisc { + class CWorker; + namespace Simulation { namespace FsCommon diff --git a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.cpp b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.cpp index a42e9d063..e988a13dc 100644 --- a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.cpp +++ b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.cpp @@ -7,13 +7,13 @@ * contained in the LICENSE file. */ -#include "fsxsimulatorsetup.h" - -#include "buildconfig.h" +#include "blackmisc/buildconfig.h" #include "blackmisc/simulation/fscommon/fscommonutil.h" +#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h" #include "blackmisc/simulation/fsx/simconnectutilities.h" +#include "simulation/simulatorsetup.h" -#include +#include using namespace BlackMisc; using namespace BlackMisc::Simulation::FsCommon; diff --git a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h index 72ba033e1..176faeb4a 100644 --- a/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h +++ b/src/blackmisc/simulation/fsx/fsxsimulatorsetup.h @@ -12,9 +12,10 @@ #ifndef BLACKMISC_SIMULATION_FSX_SIMSETUP_H #define BLACKMISC_SIMULATION_FSX_SIMSETUP_H +#include "blackmisc/simulation/simulatorsetup.h" #include "blackmisc/blackmiscexport.h" -#include "../simulatorsetup.h" -#include + +class QString; namespace BlackMisc { diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.cpp b/src/blackmisc/simulation/fsx/simconnectutilities.cpp index e63fd7c62..5c0e2f354 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.cpp +++ b/src/blackmisc/simulation/fsx/simconnectutilities.cpp @@ -7,10 +7,16 @@ * contained in the LICENSE file. */ -#include "simconnectutilities.h" -#include -#include +#include "blackmisc/simulation/fsx/simconnectutilities.h" + #include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/fsx/simconnectutilities.h b/src/blackmisc/simulation/fsx/simconnectutilities.h index 23335dbc0..4e5695598 100644 --- a/src/blackmisc/simulation/fsx/simconnectutilities.h +++ b/src/blackmisc/simulation/fsx/simconnectutilities.h @@ -13,8 +13,10 @@ #define BLACKMISC_SIMULATION_FSX_SIMCONNECTUTILITIES_H #include "blackmisc/blackmiscexport.h" + +#include +#include #include -#include // Apart from the below definitions, the following code is OS independent, // though it does not make sense to be used on non WIN machines. diff --git a/src/blackmisc/simulation/ownaircraftprovider.cpp b/src/blackmisc/simulation/ownaircraftprovider.cpp index 7968c4d2e..3dbb79a11 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.cpp +++ b/src/blackmisc/simulation/ownaircraftprovider.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "ownaircraftprovider.h" +#include "blackmisc/simulation/ownaircraftprovider.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h index 64075603d..5c5b75c82 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -12,12 +12,31 @@ #ifndef BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDER_H +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/identifier.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/simulatedaircraft.h" +#include +#include + namespace BlackMisc { + namespace Aviation + { + class CAircraftIcaoCode; + class CAircraftSituation; + class CCallsign; + class CTransponder; + } + namespace Simulation { //! Direct threadsafe in memory access to own aircraft diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.cpp b/src/blackmisc/simulation/ownaircraftproviderdummy.cpp index 11f47b577..0cafb025b 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "ownaircraftproviderdummy.h" +#include "blackmisc/simulation/ownaircraftproviderdummy.h" + +#include using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h index 649ccd61e..13778c918 100644 --- a/src/blackmisc/simulation/ownaircraftproviderdummy.h +++ b/src/blackmisc/simulation/ownaircraftproviderdummy.h @@ -12,11 +12,31 @@ #ifndef BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H #define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/identifier.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/ownaircraftprovider.h" +#include "blackmisc/simulation/simulatedaircraft.h" + +#include namespace BlackMisc { + namespace Aviation + { + class CAircraftIcaoCode; + class CAircraftSituation; + class CCallsign; + class CTransponder; + } + namespace Simulation { //! For testing, thread safety not implemented in this class diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp index 436a30427..10af397e8 100644 --- a/src/blackmisc/simulation/registermetadatasimulation.cpp +++ b/src/blackmisc/simulation/registermetadatasimulation.cpp @@ -9,6 +9,8 @@ #include "registermetadatasimulation.h" #include "simulation.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::Fsx; diff --git a/src/blackmisc/simulation/registermetadatasimulation.h b/src/blackmisc/simulation/registermetadatasimulation.h index 5d7de95a9..5d658543a 100644 --- a/src/blackmisc/simulation/registermetadatasimulation.h +++ b/src/blackmisc/simulation/registermetadatasimulation.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_SIMULATION_REGISTERMETADATASIMULATION_H #define BLACKMISC_SIMULATION_REGISTERMETADATASIMULATION_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index a223080eb..50eb45e52 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "remoteaircraftprovider.h" +#include "blackmisc/simulation/remoteaircraftprovider.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index c37467252..d6067e1f6 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -12,17 +12,32 @@ #ifndef BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H +#include "blackmisc/aviation/aircraftpartslist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/identifier.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" -#include "blackmisc/aviation/aircraftsituationlist.h" -#include "blackmisc/aviation/aircraftpartslist.h" +#include +#include +#include +#include +#include #include namespace BlackMisc { + namespace Aviation + { + class CAircraftParts; + class CAircraftSituation; + class CCallsign; + } + namespace Simulation { //! Direct thread safe in memory access to remote aircraft diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index e11fd0c7f..e54f866ce 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -7,7 +7,23 @@ * contained in the LICENSE file. */ -#include "remoteaircraftproviderdummy.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/simulation/remoteaircraftproviderdummy.h" +#include "blackmisc/variant.h" + +#include + +namespace BlackMisc { +namespace Aviation { +class CAircraftParts; +class CAircraftSituation; +} // namespace Aviation +} // namespace BlackMisc using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.h b/src/blackmisc/simulation/remoteaircraftproviderdummy.h index 43a0a385a..1a8f791a4 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.h +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.h @@ -12,11 +12,32 @@ #ifndef BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDERDUMMY_H #define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDERDUMMY_H +#include "blackmisc/aviation/aircraftpartslist.h" +#include "blackmisc/aviation/aircraftsituationlist.h" +#include "blackmisc/aviation/callsignset.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/identifier.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/remoteaircraftprovider.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/simulatedaircraftlist.h" + +#include +#include +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAircraftParts; + class CAircraftSituation; + class CCallsign; + } + namespace Simulation { diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp index 9c81dd521..4a74516a0 100644 --- a/src/blackmisc/simulation/simulatedaircraft.cpp +++ b/src/blackmisc/simulation/simulatedaircraft.cpp @@ -7,10 +7,15 @@ * contained in the LICENSE file. */ -#include "simulatedaircraft.h" -#include "blackmisc/stringutils.h" -#include "blackmisc/propertyindex.h" +#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/pq/constants.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/stringutils.h" + +#include using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 9b4ec33c7..e5e1e24b0 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -12,24 +12,50 @@ #ifndef BLACKMISC_SIMULATION_SIMULATEDAIRCRAFT_H #define BLACKMISC_SIMULATION_SIMULATEDAIRCRAFT_H -#include "blackmisc/blackmiscexport.h" -#include "aircraftmodel.h" +#include "blackmisc/aviation/aircraftlights.h" +#include "blackmisc/aviation/aircraftparts.h" #include "blackmisc/aviation/aircraftsituation.h" -#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/comsystem.h" +#include "blackmisc/aviation/livery.h" #include "blackmisc/aviation/selcal.h" #include "blackmisc/aviation/transponder.h" -#include "blackmisc/aviation/comsystem.h" -#include "blackmisc/aviation/aircraftparts.h" -#include "blackmisc/aviation/livery.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/namevariantpairlist.h" -#include "blackmisc/propertyindex.h" -#include "blackmisc/network/client.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" +#include "blackmisc/icon.h" +#include "blackmisc/metaclass.h" #include "blackmisc/network/user.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAircraftIcaoCode; + class CAltitude; + class CHeading; + } + namespace PhysicalQuantities + { + class CAngle; + class CSpeed; + } + namespace Simulation { //! Comprehensive information of an aircraft diff --git a/src/blackmisc/simulation/simulatedaircraftlist.cpp b/src/blackmisc/simulation/simulatedaircraftlist.cpp index 32b647578..83422b534 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.cpp +++ b/src/blackmisc/simulation/simulatedaircraftlist.cpp @@ -7,10 +7,19 @@ * contained in the LICENSE file. */ +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/network/user.h" #include "blackmisc/predicates.h" -#include "blackmisc/propertyindexallclasses.h" +#include "blackmisc/range.h" + +#include +#include using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 77e8e5c8a..f5523ca65 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -12,19 +12,31 @@ #ifndef BLACKMISC_SIMULATION_SIMULATEDNAIRCRAFTLIST_H #define BLACKMISC_SIMULATION_SIMULATEDNAIRCRAFTLIST_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/callsignobjectlist.h" +#include "blackmisc/aviation/callsignset.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/geo/geoobjectlist.h" #include "blackmisc/network/userlist.h" -#include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include -#include -#include +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { + namespace Aviation + { + class CAircraftParts; + class CCallsign; + } + namespace Simulation + { + class CAircraftModel; + class CSimulatedAircraft; + } + namespace Simulation { //! Value object encapsulating a list of aircraft. diff --git a/src/blackmisc/simulation/simulation.h b/src/blackmisc/simulation/simulation.h index d8130aa86..1859b2d88 100644 --- a/src/blackmisc/simulation/simulation.h +++ b/src/blackmisc/simulation/simulation.h @@ -16,7 +16,9 @@ */ #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraftlist.h" +#include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfolist.h" #include "blackmisc/simulation/airspaceaircraftsnapshot.h" #include "blackmisc/simulation/distributorlist.h" diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index aaf0bc109..f6a449a2c 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -7,11 +7,13 @@ * contained in the LICENSE file. */ -#include "simulatorinfo.h" -#include "buildconfig.h" +#include "blackmisc/buildconfig.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/datastoreutility.h" #include "blackmisc/simulation/fscommon/fscommonutil.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include +#include #include using namespace BlackMisc; diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h index 2e3bdd58b..6dab4778c 100644 --- a/src/blackmisc/simulation/simulatorinfo.h +++ b/src/blackmisc/simulation/simulatorinfo.h @@ -13,8 +13,17 @@ #define BLACKMISC_SIMULATION_SIMULATORINFO_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" + +#include +#include +#include +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatorinfolist.cpp b/src/blackmisc/simulation/simulatorinfolist.cpp index 0397df4fa..0e89a6735 100644 --- a/src/blackmisc/simulation/simulatorinfolist.cpp +++ b/src/blackmisc/simulation/simulatorinfolist.cpp @@ -8,7 +8,9 @@ */ #include "blackmisc/simulation/simulatorinfolist.h" -#include "blackmisc/predicates.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h index 4589bd3aa..cc5d10fc8 100644 --- a/src/blackmisc/simulation/simulatorinfolist.h +++ b/src/blackmisc/simulation/simulatorinfolist.h @@ -13,11 +13,12 @@ #define BLACKMISC_SIMULATION_SIMULATORINFOLIST_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" -#include -#include +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index c0978e999..03e1bbfa0 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -7,7 +7,11 @@ * contained in the LICENSE file. */ -#include "simulatorplugininfo.h" + +#include "blackmisc/simulation/simulatorplugininfo.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h index 3e832992e..c3d81f8ac 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.h +++ b/src/blackmisc/simulation/simulatorplugininfo.h @@ -13,8 +13,13 @@ #define BLACKMISC_SIMULATION_SIMULATORPLUGININFO_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" +#include +#include +#include + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/simulatorplugininfolist.cpp b/src/blackmisc/simulation/simulatorplugininfolist.cpp index e695e2925..dc21cb454 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.cpp +++ b/src/blackmisc/simulation/simulatorplugininfolist.cpp @@ -7,7 +7,14 @@ * contained in the LICENSE file. */ -#include "simulatorplugininfolist.h" +#include "blackmisc/iterator.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/range.h" +#include "blackmisc/simulation/simulatorplugininfo.h" +#include "blackmisc/simulation/simulatorplugininfolist.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatorplugininfolist.h b/src/blackmisc/simulation/simulatorplugininfolist.h index 01c32c55c..92559f869 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.h +++ b/src/blackmisc/simulation/simulatorplugininfolist.h @@ -12,16 +12,21 @@ #ifndef BLACKMISC_SIMULATION_SIMULATORPLUGININFOLIST_H #define BLACKMISC_SIMULATION_SIMULATORPLUGININFOLIST_H -#include "simulatorplugininfo.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/sequence.h" #include "blackmisc/collection.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include +#include #include namespace BlackMisc { namespace Simulation { + class CSimulatorPluginInfo; + //! Value object encapsulating a list of SimulatorInfo objects. class BLACKMISC_EXPORT CSimulatorPluginInfoList : public BlackMisc::CSequence, diff --git a/src/blackmisc/simulation/simulatorsetup.cpp b/src/blackmisc/simulation/simulatorsetup.cpp index 7ebffe4b9..68c45dd17 100644 --- a/src/blackmisc/simulation/simulatorsetup.cpp +++ b/src/blackmisc/simulation/simulatorsetup.cpp @@ -7,7 +7,11 @@ * contained in the LICENSE file. */ -#include "simulatorsetup.h" +#include "blackmisc/dbus.h" +#include "blackmisc/simulation/simulatorsetup.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h index 885bcfa3c..79f102e8e 100644 --- a/src/blackmisc/simulation/simulatorsetup.h +++ b/src/blackmisc/simulation/simulatorsetup.h @@ -12,10 +12,19 @@ #ifndef BLACKMISC_SIMULATION_SIMULATORSETUP_H #define BLACKMISC_SIMULATION_SIMULATORSETUP_H -#include "blackmisc/namevariantpairlist.h" #include "blackmisc/blackmiscexport.h" -#include +#include "blackmisc/containerbase.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/namevariantpairlist.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 865434a1e..33f82661f 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -7,19 +7,33 @@ * contained in the LICENSE file. */ -#include "aircraftmodelloaderxplane.h" -#include "xplaneutil.h" -#include "blackmisc/simulation/aircraftmodelutils.h" -#include "blackmisc/predicates.h" -#include "blackmisc/logmessage.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/livery.h" #include "blackmisc/fileutils.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodelutils.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h" +#include "blackmisc/simulation/xplane/xplaneutil.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/worker.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/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h index 143a1d656..8a74cf699 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h @@ -13,15 +13,21 @@ #define BLACKMISC_SIMULATION_XPLANE_AIRCRAFTMODELLOADERXPLANE_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/worker.h" -#include "blackmisc/pixmap.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/simulation/aircraftmodelloader.h" -#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include #include +#include +#include +#include +#include namespace BlackMisc { + class CWorker; + namespace Simulation { namespace XPlane diff --git a/src/blackmisc/simulation/xplane/navdatareference.cpp b/src/blackmisc/simulation/xplane/navdatareference.cpp index b98c29c4f..662784adf 100644 --- a/src/blackmisc/simulation/xplane/navdatareference.cpp +++ b/src/blackmisc/simulation/xplane/navdatareference.cpp @@ -11,6 +11,8 @@ #include "blackmisc/simulation/xplane/navdatareference.h" +#include + namespace BlackMisc { namespace Simulation diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h index 4e281d325..15059b3a2 100644 --- a/src/blackmisc/simulation/xplane/navdatareference.h +++ b/src/blackmisc/simulation/xplane/navdatareference.h @@ -12,9 +12,24 @@ #ifndef BLACKMISC_SIMULATION_XPLANE_NAVDATAREFERENCE_H #define BLACKMISC_SIMULATION_XPLANE_NAVDATAREFERENCE_H -#include "blackmisc/sequence.h" -#include "blackmisc/geo/geoobjectlist.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" #include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/geo/geoobjectlist.h" +#include "blackmisc/geo/latitude.h" +#include "blackmisc/geo/longitude.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/sequence.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/simulation/xplane/xplaneutil.cpp b/src/blackmisc/simulation/xplane/xplaneutil.cpp index 8538df125..df306a539 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.cpp +++ b/src/blackmisc/simulation/xplane/xplaneutil.cpp @@ -7,10 +7,14 @@ * contained in the LICENSE file. */ -#include "xplaneutil.h" +#include "blackmisc/simulation/xplane/xplaneutil.h" +#include "qsystemdetection.h" + #include +#include +#include +#include #include -#include #if defined(Q_OS_WIN) #include diff --git a/src/blackmisc/stacktrace.cpp b/src/blackmisc/stacktrace.cpp index 7208653fc..322d420b4 100644 --- a/src/blackmisc/stacktrace.cpp +++ b/src/blackmisc/stacktrace.cpp @@ -8,21 +8,28 @@ */ #include "blackmisc/stacktrace.h" -#include + +#include +#include +#include #include +#include #include + #if defined(Q_CC_MSVC) # include + # pragma warning(push) # pragma warning(disable:4091) # include + # pragma warning(pop) #elif defined(Q_OS_WIN) && defined (Q_CC_GNU) # include # include #elif defined(Q_CC_GNU) -# include # include +# include # include #endif diff --git a/src/blackmisc/statusexception.cpp b/src/blackmisc/statusexception.cpp index 3736bb84a..597593260 100644 --- a/src/blackmisc/statusexception.cpp +++ b/src/blackmisc/statusexception.cpp @@ -7,7 +7,11 @@ * contained in the LICENSE file. */ -#include "statusexception.h" +#include "blackmisc/statusexception.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/statusexception.h b/src/blackmisc/statusexception.h index b68493868..3c3a44a1f 100644 --- a/src/blackmisc/statusexception.h +++ b/src/blackmisc/statusexception.h @@ -12,8 +12,12 @@ #ifndef BLACKMISC_STATUSEXCEPTION_H #define BLACKMISC_STATUSEXCEPTION_H -#include "statusmessage.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/statusmessage.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index 75c287f7d..63d76f55f 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -7,9 +7,15 @@ * contained in the LICENSE file. */ -#include "statusmessagelist.h" -#include "statusmessage.h" -#include "logcategorylist.h" +#include "blackmisc/compare.h" +#include "blackmisc/range.h" +#include "blackmisc/statusmessagelist.h" + +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index b9afd1814..67adcd607 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -12,12 +12,18 @@ #ifndef BLACKMISC_STATUSMESSAGELIST_H #define BLACKMISC_STATUSMESSAGELIST_H -#include "blackmiscexport.h" -#include "timestampobjectlist.h" -#include "valueobject.h" -#include "sequence.h" -#include "collection.h" -#include "statusmessage.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/sequence.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/timestampobjectlist.h" +#include "blackmisc/variant.h" + +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index 0ce78f101..d58507a88 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -8,8 +8,8 @@ */ #include "stringutils.h" -#include "pixmap.h" -#include + +#include QString BlackMisc::boolToOnOff(bool v, bool i18n) { diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index 944757022..47ef78441 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -13,10 +13,18 @@ #define BLACKMISC_STRINGUTILS_H #include "blackmisc/blackmiscexport.h" -#include + #include -#include +#include #include +#include +#include +#include +#include +#include +#include + +template class QMap; //! Free functions in BlackMisc namespace BlackMisc diff --git a/src/blackmisc/testing.cpp b/src/blackmisc/testing.cpp index 749c7f0bb..e698e0dec 100644 --- a/src/blackmisc/testing.cpp +++ b/src/blackmisc/testing.cpp @@ -7,8 +7,24 @@ * contained in the LICENSE file. */ -#include "testing.h" -#include "network/voicecapabilities.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/iterator.h" +#include "blackmisc/network/user.h" +#include "blackmisc/pq/frequency.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindexvariantmap.h" +#include "blackmisc/sequence.h" +#include "blackmisc/testing.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/testing.h b/src/blackmisc/testing.h index 0cacbbca2..2394d0770 100644 --- a/src/blackmisc/testing.h +++ b/src/blackmisc/testing.h @@ -12,8 +12,11 @@ #ifndef BLACKMISC_TESTING_H #define BLACKMISC_TESTING_H -#include "blackmiscexport.h" +#include "blackmisc/aviation/atcstation.h" #include "blackmisc/aviation/atcstationlist.h" +#include "blackmisc/blackmiscexport.h" + +#include //! Generate data for testing purposes. namespace BlackMisc diff --git a/src/blackmisc/threadedreader.cpp b/src/blackmisc/threadedreader.cpp index dea4401ec..5073b204b 100644 --- a/src/blackmisc/threadedreader.cpp +++ b/src/blackmisc/threadedreader.cpp @@ -7,9 +7,16 @@ * contained in the LICENSE file. */ -#include "threadedreader.h" -#include "blackmisc/threadutils.h" #include "blackmisc/network/networkutils.h" +#include "blackmisc/threadedreader.h" +#include "blackmisc/threadutils.h" + +#include +#include +#include +#include +#include +#include using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackmisc/threadedreader.h b/src/blackmisc/threadedreader.h index 3601c39b3..a4d947c59 100644 --- a/src/blackmisc/threadedreader.h +++ b/src/blackmisc/threadedreader.h @@ -7,21 +7,22 @@ * contained in the LICENSE file. */ +//! \file + #ifndef BLACKMISC_THREADED_READER_H #define BLACKMISC_THREADED_READER_H -//! \file +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/worker.h" -#include "blackmiscexport.h" -#include "blackmisc/network/urllist.h" -#include "blackmisc/network/entityflags.h" -#include "worker.h" -#include #include -#include -#include -#include -#include +#include +#include +#include +#include + +class QNetworkReply; +class QTimer; namespace BlackMisc { diff --git a/src/blackmisc/threadutils.cpp b/src/blackmisc/threadutils.cpp index e89e695a2..1dc9304d7 100644 --- a/src/blackmisc/threadutils.cpp +++ b/src/blackmisc/threadutils.cpp @@ -7,9 +7,12 @@ * contained in the LICENSE file. */ -#include "threadutils.h" -#include +#include "blackmisc/threadutils.h" + #include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/threadutils.h b/src/blackmisc/threadutils.h index e38d4b1a2..893bb56a2 100644 --- a/src/blackmisc/threadutils.h +++ b/src/blackmisc/threadutils.h @@ -12,9 +12,9 @@ #ifndef BLACKMISC_CTHREADUTILS_H #define BLACKMISC_CTHREADUTILS_H -#include "blackmiscexport.h" -#include -#include +#include "blackmisc/blackmiscexport.h" + +class QObject; namespace BlackMisc { diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp index 030df9051..329c5f684 100644 --- a/src/blackmisc/timestampbased.cpp +++ b/src/blackmisc/timestampbased.cpp @@ -7,10 +7,15 @@ * contained in the LICENSE file. */ -#include "timestampbased.h" #include "blackmisc/comparefunctions.h" +#include "blackmisc/timestampbased.h" #include "blackmisc/variant.h" +#include +#include +#include +#include + namespace BlackMisc { ITimestampBased::ITimestampBased() : m_timestampMSecsSinceEpoch(QDateTime::currentMSecsSinceEpoch()) diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h index 7bd4a7a1a..5d9f41604 100644 --- a/src/blackmisc/timestampbased.h +++ b/src/blackmisc/timestampbased.h @@ -12,9 +12,13 @@ #ifndef BLACKMISC_TIMESTAMPBASED_H #define BLACKMISC_TIMESTAMPBASED_H -#include "blackmiscexport.h" -#include "propertyindex.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/variant.h" + #include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/timestampobjectlist.cpp b/src/blackmisc/timestampobjectlist.cpp index 44200bf10..0336ef850 100644 --- a/src/blackmisc/timestampobjectlist.cpp +++ b/src/blackmisc/timestampobjectlist.cpp @@ -14,12 +14,15 @@ #include "blackmisc/aviation/liverylist.h" #include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/aviation/airlineicaocodelist.h" -#include "blackmisc/network/textmessagelist.h" -#include "blackmisc/simulation/distributorlist.h" #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/network/textmessage.h" +#include "blackmisc/network/textmessagelist.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/identifierlist.h" #include "blackmisc/countrylist.h" + +#include #include #include #include diff --git a/src/blackmisc/timestampobjectlist.h b/src/blackmisc/timestampobjectlist.h index 297932759..26bcab5cd 100644 --- a/src/blackmisc/timestampobjectlist.h +++ b/src/blackmisc/timestampobjectlist.h @@ -12,10 +12,12 @@ #ifndef BLACKMISC_TIMESTAMPOBJECTLIST_H #define BLACKMISC_TIMESTAMPOBJECTLIST_H -#include "blackmisc/collection.h" -#include "blackmisc/sequence.h" +#include "blackmisc/blackmiscexport.h" + #include -#include +#include + +class QDateTime; namespace BlackMisc { diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp index b6c8c3291..a49885427 100644 --- a/src/blackmisc/valuecache.cpp +++ b/src/blackmisc/valuecache.cpp @@ -10,14 +10,30 @@ //! \cond PRIVATE #include "blackmisc/valuecache.h" -#include "blackmisc/identifier.h" -#include "blackmisc/logmessage.h" -#include "blackmisc/algorithm.h" -#include "blackmisc/lockfree.h" #include "blackmisc/atomicfile.h" -#include -#include +#include "blackmisc/identifier.h" +#include "blackmisc/lockfree.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/logmessage.h" + +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h index e614f7f3f..a6286d30b 100644 --- a/src/blackmisc/valuecache.h +++ b/src/blackmisc/valuecache.h @@ -12,9 +12,42 @@ #ifndef BLACKMISC_VALUECACHE_H #define BLACKMISC_VALUECACHE_H -#include "blackmisc/valuecacheprivate.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/identifier.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" #include "blackmisc/range.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/valuecacheprivate.h" +#include "blackmisc/variant.h" +#include "blackmisc/variantmap.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include + +namespace BlackMisc +{ + class CLogCategoryList; +} namespace BlackMisc { @@ -241,6 +274,7 @@ namespace BlackMisc private: friend class Private::CValuePage; struct Element; + using ElementPtr = QSharedPointer; // QMap doesn't support move-only types QMap m_elements; diff --git a/src/blackmisc/variant.cpp b/src/blackmisc/variant.cpp index 8e47eb031..a5a2f9dc2 100644 --- a/src/blackmisc/variant.cpp +++ b/src/blackmisc/variant.cpp @@ -9,12 +9,26 @@ //! \cond PRIVATE -#include "variant.h" -#include "icon.h" -#include "logmessage.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/icon.h" +#include "blackmisc/logmessage.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/variant.h" + +#include +#include #include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index f44adeb33..d7d1cc445 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -12,24 +12,30 @@ #ifndef BLACKMISC_VARIANT_H #define BLACKMISC_VARIANT_H -#include "variantprivate.h" -#include "blackmiscexport.h" -#include "stringutils.h" -#include "compare.h" -#include "dbus.h" -#include "json.h" -#include + +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/compare.h" +#include "blackmisc/dbus.h" +#include "blackmisc/inheritancetraits.h" +#include "blackmisc/json.h" +#include "blackmisc/stringutils.h" +#include "blackmisc/variantprivate.h" + +#include #include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include #include namespace BlackMisc { - class CPropertyIndex; class CIcon; + class CPropertyIndex; namespace Mixin { diff --git a/src/blackmisc/variantlist.cpp b/src/blackmisc/variantlist.cpp index 36852fc59..cddef82c8 100644 --- a/src/blackmisc/variantlist.cpp +++ b/src/blackmisc/variantlist.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "variantlist.h" +#include "blackmisc/variantlist.h" namespace BlackMisc { diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index c592fdb3a..6cc9501fe 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -12,10 +12,12 @@ #ifndef BLACKMISC_VARIANTLIST_H #define BLACKMISC_VARIANTLIST_H -#include "blackmiscexport.h" -#include "variant.h" -#include "sequence.h" -#include "collection.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/variantmap.cpp b/src/blackmisc/variantmap.cpp index 7437c0aec..199d931b8 100644 --- a/src/blackmisc/variantmap.cpp +++ b/src/blackmisc/variantmap.cpp @@ -9,6 +9,8 @@ #include "blackmisc/variantmap.h" +#include + namespace BlackMisc { diff --git a/src/blackmisc/variantmap.h b/src/blackmisc/variantmap.h index bc8368f5d..3481dcf31 100644 --- a/src/blackmisc/variantmap.h +++ b/src/blackmisc/variantmap.h @@ -12,8 +12,16 @@ #ifndef BLACKMISC_VARIANTMAP_H #define BLACKMISC_VARIANTMAP_H -#include "blackmisc/variant.h" +#include "blackmisc/blackmiscexport.h" #include "blackmisc/dictionary.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/verify.cpp b/src/blackmisc/verify.cpp index cbce879fa..9387e3cc7 100644 --- a/src/blackmisc/verify.cpp +++ b/src/blackmisc/verify.cpp @@ -9,10 +9,12 @@ #include "blackmisc/verify.h" #include "blackmisc/logmessage.h" + +#include + #if defined(Q_CC_MSVC) #include #elif defined(Q_OS_UNIX) -#include #endif #if defined(Q_CC_CLANG) diff --git a/src/blackmisc/verify.h b/src/blackmisc/verify.h index 5191ae1fa..0100d747a 100644 --- a/src/blackmisc/verify.h +++ b/src/blackmisc/verify.h @@ -13,7 +13,6 @@ #define BLACKMISC_VERIFY_H #include "blackmisc/blackmiscexport.h" -#include namespace BlackMisc { diff --git a/src/blackmisc/weather/cloudlayer.cpp b/src/blackmisc/weather/cloudlayer.cpp index 4fbab6464..d88a43e4a 100644 --- a/src/blackmisc/weather/cloudlayer.cpp +++ b/src/blackmisc/weather/cloudlayer.cpp @@ -11,8 +11,7 @@ #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" -#include -#include +#include using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/cloudlayer.h b/src/blackmisc/weather/cloudlayer.h index 1f64e2476..7fb360a3f 100644 --- a/src/blackmisc/weather/cloudlayer.h +++ b/src/blackmisc/weather/cloudlayer.h @@ -12,10 +12,15 @@ #ifndef BLACKMISC_WEATHER_CLOUDLAYER_H #define BLACKMISC_WEATHER_CLOUDLAYER_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/aviation/altitude.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/cloudlayerlist.cpp b/src/blackmisc/weather/cloudlayerlist.cpp index 70dacbc7c..0ad7dca6a 100644 --- a/src/blackmisc/weather/cloudlayerlist.cpp +++ b/src/blackmisc/weather/cloudlayerlist.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "cloudlayerlist.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/compare.h" +#include "blackmisc/weather/cloudlayerlist.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/cloudlayerlist.h b/src/blackmisc/weather/cloudlayerlist.h index 901306ffe..061df63ca 100644 --- a/src/blackmisc/weather/cloudlayerlist.h +++ b/src/blackmisc/weather/cloudlayerlist.h @@ -12,12 +12,22 @@ #ifndef BLACKMISC_WEATHER_CLOUDLAYERLIST_H #define BLACKMISC_WEATHER_CLOUDLAYERLIST_H -#include "cloudlayer.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/cloudlayer.h" + +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAltitude; + } + namespace Weather { /*! diff --git a/src/blackmisc/weather/gridpoint.cpp b/src/blackmisc/weather/gridpoint.cpp index 8e4cdb154..0eb56272e 100644 --- a/src/blackmisc/weather/gridpoint.cpp +++ b/src/blackmisc/weather/gridpoint.cpp @@ -11,6 +11,8 @@ #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include + using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/weather/gridpoint.h b/src/blackmisc/weather/gridpoint.h index 5d5f6b053..844e583d8 100644 --- a/src/blackmisc/weather/gridpoint.h +++ b/src/blackmisc/weather/gridpoint.h @@ -13,14 +13,20 @@ #define BLACKMISC_WEATHER_GRIDPOINT_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" #include "blackmisc/weather/cloudlayerlist.h" #include "blackmisc/weather/temperaturelayerlist.h" #include "blackmisc/weather/visibilitylayerlist.h" #include "blackmisc/weather/windlayerlist.h" -#include "blackmisc/pq/pressure.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/metar.cpp b/src/blackmisc/weather/metar.cpp index 4c706ea60..6a52a95ed 100644 --- a/src/blackmisc/weather/metar.cpp +++ b/src/blackmisc/weather/metar.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "metar.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/weather/cloudlayer.h" +#include "blackmisc/weather/metar.h" +#include "blackmisc/weather/presentweather.h" + +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/metar.h b/src/blackmisc/weather/metar.h index 211cb29c4..2e2e9854b 100644 --- a/src/blackmisc/weather/metar.h +++ b/src/blackmisc/weather/metar.h @@ -12,21 +12,28 @@ #ifndef BLACKMISC_AVIATION_METAR_H #define BLACKMISC_AVIATION_METAR_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" #include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/valueobject.h" #include "blackmisc/weather/cloudlayerlist.h" #include "blackmisc/weather/presentweatherlist.h" #include "blackmisc/weather/windlayer.h" -#include "blackmisc/pq/time.h" -#include "blackmisc/pq/length.h" -#include "blackmisc/pq/temperature.h" -#include "blackmisc/pq/pressure.h" + +#include +#include namespace BlackMisc { namespace Weather { + class CCloudLayer; + class CPresentWeather; + /*! * Value object encapsulating information about METAR * FIXME: runway visibilities diff --git a/src/blackmisc/weather/metardecoder.cpp b/src/blackmisc/weather/metardecoder.cpp index 58992ca22..7d9533768 100644 --- a/src/blackmisc/weather/metardecoder.cpp +++ b/src/blackmisc/weather/metardecoder.cpp @@ -9,11 +9,29 @@ //! \cond PRIVATE -#include "metardecoder.h" + +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/logmessage.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/length.h" +#include "blackmisc/pq/measurementunit.h" +#include "blackmisc/pq/pressure.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/time.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/statusmessage.h" +#include "blackmisc/weather/cloudlayer.h" +#include "blackmisc/weather/metardecoder.h" #include "blackmisc/weather/presentweather.h" +#include "blackmisc/weather/windlayer.h" + +#include #include -#include +#include +#include +#include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/metardecoder.h b/src/blackmisc/weather/metardecoder.h index 35510b8d6..897a5b00e 100644 --- a/src/blackmisc/weather/metardecoder.h +++ b/src/blackmisc/weather/metardecoder.h @@ -13,12 +13,12 @@ #define BLACKMISC_WEATHER_METARDECODER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" #include "blackmisc/weather/metar.h" -#include + #include -#include +#include #include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/metarset.cpp b/src/blackmisc/weather/metarset.cpp index ae0e97456..1127b8dbe 100644 --- a/src/blackmisc/weather/metarset.cpp +++ b/src/blackmisc/weather/metarset.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "metarset.h" +#include "blackmisc/weather/metarset.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/metarset.h b/src/blackmisc/weather/metarset.h index b9a883103..5e1e47831 100644 --- a/src/blackmisc/weather/metarset.h +++ b/src/blackmisc/weather/metarset.h @@ -12,10 +12,17 @@ #ifndef BLACKMISC_WEATHER_METARSET_H #define BLACKMISC_WEATHER_METARSET_H +#include "blackmisc/aviation/airporticaocode.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/weather/metar.h" #include "blackmisc/collection.h" +#include "blackmisc/compare.h" +#include "blackmisc/metaclassprivate.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/metar.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/presentweather.h b/src/blackmisc/weather/presentweather.h index 1738891fe..a96dad9f9 100644 --- a/src/blackmisc/weather/presentweather.h +++ b/src/blackmisc/weather/presentweather.h @@ -13,9 +13,16 @@ #define BLACKMISC_WEATHER_PRESENTWEATHER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" +#include "blackmisc/dictionary.h" +#include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" -#include +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/presentweatherlist.cpp b/src/blackmisc/weather/presentweatherlist.cpp index e293e0645..4c02dba5b 100644 --- a/src/blackmisc/weather/presentweatherlist.cpp +++ b/src/blackmisc/weather/presentweatherlist.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "presentweatherlist.h" +#include "blackmisc/weather/presentweatherlist.h" namespace BlackMisc { diff --git a/src/blackmisc/weather/presentweatherlist.h b/src/blackmisc/weather/presentweatherlist.h index 63eb13bea..4fbd123de 100644 --- a/src/blackmisc/weather/presentweatherlist.h +++ b/src/blackmisc/weather/presentweatherlist.h @@ -12,9 +12,13 @@ #ifndef BLACKMISC_WEATHER_PRESENTWEATHERLIST_H #define BLACKMISC_WEATHER_PRESENTWEATHERLIST_H -#include "presentweather.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/presentweather.h" +#include "presentweather.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/registermetadataweather.cpp b/src/blackmisc/weather/registermetadataweather.cpp index f1073e9bf..8b45c2a85 100644 --- a/src/blackmisc/weather/registermetadataweather.cpp +++ b/src/blackmisc/weather/registermetadataweather.cpp @@ -8,7 +8,9 @@ */ #include "registermetadataweather.h" -#include "weather.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/weather.h" namespace BlackMisc { diff --git a/src/blackmisc/weather/registermetadataweather.h b/src/blackmisc/weather/registermetadataweather.h index f6c4e674c..00728e906 100644 --- a/src/blackmisc/weather/registermetadataweather.h +++ b/src/blackmisc/weather/registermetadataweather.h @@ -9,11 +9,11 @@ //! \file -#include "blackmisc/blackmiscexport.h" - #ifndef BLACKMISC_WEATHER_REGISTERMETADATAWEATHER_H #define BLACKMISC_WEATHER_REGISTERMETADATAWEATHER_H +#include "blackmisc/blackmiscexport.h" + namespace BlackMisc { namespace Weather diff --git a/src/blackmisc/weather/temperaturelayer.cpp b/src/blackmisc/weather/temperaturelayer.cpp index fc0e89fac..65ff26fdc 100644 --- a/src/blackmisc/weather/temperaturelayer.cpp +++ b/src/blackmisc/weather/temperaturelayer.cpp @@ -11,9 +11,6 @@ #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" -#include -#include - using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/weather/temperaturelayer.h b/src/blackmisc/weather/temperaturelayer.h index 989161c09..c03b9e67b 100644 --- a/src/blackmisc/weather/temperaturelayer.h +++ b/src/blackmisc/weather/temperaturelayer.h @@ -12,11 +12,17 @@ #ifndef BLACKMISC_WEATHER_TEMPERATURELAYER_H #define BLACKMISC_WEATHER_TEMPERATURELAYER_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/aviation/altitude.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/temperaturelayerlist.cpp b/src/blackmisc/weather/temperaturelayerlist.cpp index 3d367a1d1..f906fe50e 100644 --- a/src/blackmisc/weather/temperaturelayerlist.cpp +++ b/src/blackmisc/weather/temperaturelayerlist.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "temperaturelayerlist.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/compare.h" +#include "blackmisc/weather/temperaturelayerlist.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/temperaturelayerlist.h b/src/blackmisc/weather/temperaturelayerlist.h index bdaf5860a..086180a6e 100644 --- a/src/blackmisc/weather/temperaturelayerlist.h +++ b/src/blackmisc/weather/temperaturelayerlist.h @@ -12,12 +12,23 @@ #ifndef BLACKMISC_WEATHER_TEMPERATURELAYERLIST_H #define BLACKMISC_WEATHER_TEMPERATURELAYERLIST_H -#include "temperaturelayer.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/temperaturelayer.h" +#include "temperaturelayer.h" + +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAltitude; + } + namespace Weather { /*! diff --git a/src/blackmisc/weather/visibilitylayer.h b/src/blackmisc/weather/visibilitylayer.h index f100ae3f2..f7881b07f 100644 --- a/src/blackmisc/weather/visibilitylayer.h +++ b/src/blackmisc/weather/visibilitylayer.h @@ -12,11 +12,17 @@ #ifndef BLACKMISC_WEATHER_VISIBILITYLAYER_H #define BLACKMISC_WEATHER_VISIBILITYLAYER_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" #include "blackmisc/aviation/altitude.h" +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/pq/length.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/visibilitylayerlist.cpp b/src/blackmisc/weather/visibilitylayerlist.cpp index d42d77958..167406bf5 100644 --- a/src/blackmisc/weather/visibilitylayerlist.cpp +++ b/src/blackmisc/weather/visibilitylayerlist.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "visibilitylayerlist.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/compare.h" +#include "blackmisc/weather/visibilitylayerlist.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/visibilitylayerlist.h b/src/blackmisc/weather/visibilitylayerlist.h index f2a4e2072..1f3e5e78b 100644 --- a/src/blackmisc/weather/visibilitylayerlist.h +++ b/src/blackmisc/weather/visibilitylayerlist.h @@ -12,12 +12,22 @@ #ifndef BLACKMISC_WEATHER_VISIBILITYLAYERLIST_H #define BLACKMISC_WEATHER_VISIBILITYLAYERLIST_H -#include "visibilitylayer.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/visibilitylayer.h" + +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAltitude; + } + namespace Weather { /*! diff --git a/src/blackmisc/weather/weatherdataplugininfo.cpp b/src/blackmisc/weather/weatherdataplugininfo.cpp index 903022776..50bd42ab6 100644 --- a/src/blackmisc/weather/weatherdataplugininfo.cpp +++ b/src/blackmisc/weather/weatherdataplugininfo.cpp @@ -7,7 +7,10 @@ * contained in the LICENSE file. */ -#include "weatherdataplugininfo.h" +#include "blackmisc/weather/weatherdataplugininfo.h" + +#include +#include using namespace BlackMisc; diff --git a/src/blackmisc/weather/weatherdataplugininfo.h b/src/blackmisc/weather/weatherdataplugininfo.h index 5868659b3..8c3205da5 100644 --- a/src/blackmisc/weather/weatherdataplugininfo.h +++ b/src/blackmisc/weather/weatherdataplugininfo.h @@ -13,8 +13,13 @@ #define BLACKMISC_WEATHER_WEATHERDATAPLUGININFO_H #include "blackmisc/blackmiscexport.h" +#include "blackmisc/metaclass.h" #include "blackmisc/valueobject.h" +#include +#include +#include + namespace BlackMisc { namespace Weather diff --git a/src/blackmisc/weather/weatherdataplugininfolist.cpp b/src/blackmisc/weather/weatherdataplugininfolist.cpp index bbe4cf7aa..11a255183 100644 --- a/src/blackmisc/weather/weatherdataplugininfolist.cpp +++ b/src/blackmisc/weather/weatherdataplugininfolist.cpp @@ -7,7 +7,12 @@ * contained in the LICENSE file. */ -#include "weatherdataplugininfolist.h" +#include "blackmisc/metaclassprivate.h" +#include "blackmisc/range.h" +#include "blackmisc/weather/weatherdataplugininfo.h" +#include "blackmisc/weather/weatherdataplugininfolist.h" + +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/weatherdataplugininfolist.h b/src/blackmisc/weather/weatherdataplugininfolist.h index 874087ed6..9227c4460 100644 --- a/src/blackmisc/weather/weatherdataplugininfolist.h +++ b/src/blackmisc/weather/weatherdataplugininfolist.h @@ -12,16 +12,21 @@ #ifndef BLACKMISC_WEATHER_WEATHERDATAPLUGININFOLIST_H #define BLACKMISC_WEATHER_WEATHERDATAPLUGININFOLIST_H -#include "weatherdataplugininfo.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/sequence.h" #include "blackmisc/collection.h" +#include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/weatherdataplugininfo.h" + +#include #include namespace BlackMisc { namespace Weather { + class CWeatherDataPluginInfo; + //! Value object encapsulating a list of CWeatherDataPluginInfo objects. class BLACKMISC_EXPORT CWeatherDataPluginInfoList : public BlackMisc::CSequence, diff --git a/src/blackmisc/weather/weathergrid.cpp b/src/blackmisc/weather/weathergrid.cpp index 81bfc76ec..676521c92 100644 --- a/src/blackmisc/weather/weathergrid.cpp +++ b/src/blackmisc/weather/weathergrid.cpp @@ -7,8 +7,23 @@ * contained in the LICENSE file. */ -#include "weathergrid.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/pq/angle.h" +#include "blackmisc/pq/physicalquantity.h" +#include "blackmisc/pq/speed.h" +#include "blackmisc/pq/temperature.h" +#include "blackmisc/pq/units.h" +#include "blackmisc/range.h" +#include "blackmisc/weather/cloudlayer.h" +#include "blackmisc/weather/cloudlayerlist.h" +#include "blackmisc/weather/temperaturelayer.h" +#include "blackmisc/weather/temperaturelayerlist.h" +#include "blackmisc/weather/visibilitylayer.h" +#include "blackmisc/weather/visibilitylayerlist.h" +#include "blackmisc/weather/weathergrid.h" +#include "blackmisc/weather/windlayer.h" +#include "blackmisc/weather/windlayerlist.h" using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/weathergrid.h b/src/blackmisc/weather/weathergrid.h index a6f54ab1f..d98c06d9d 100644 --- a/src/blackmisc/weather/weathergrid.h +++ b/src/blackmisc/weather/weathergrid.h @@ -12,13 +12,22 @@ #ifndef BLACKMISC_WEATHER_WEATHERGRID_H #define BLACKMISC_WEATHER_WEATHERGRID_H -#include "gridpoint.h" #include "blackmisc/blackmiscexport.h" +#include "blackmisc/pq/length.h" #include "blackmisc/sequence.h" -#include "blackmisc/geo/geoobjectlist.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/gridpoint.h" + +#include +#include namespace BlackMisc { + namespace Geo + { + class ICoordinateGeodetic; + } + namespace Weather { /*! diff --git a/src/blackmisc/weather/weathergridprovider.cpp b/src/blackmisc/weather/weathergridprovider.cpp index 13100e6a1..575d72311 100644 --- a/src/blackmisc/weather/weathergridprovider.cpp +++ b/src/blackmisc/weather/weathergridprovider.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "weathergridprovider.h" +#include "blackmisc/weather/weathergridprovider.h" using namespace BlackMisc; diff --git a/src/blackmisc/weather/weathergridprovider.h b/src/blackmisc/weather/weathergridprovider.h index 1c26f2dd7..e42b1d905 100644 --- a/src/blackmisc/weather/weathergridprovider.h +++ b/src/blackmisc/weather/weathergridprovider.h @@ -13,13 +13,15 @@ #define BLACKMISC_WEATHER_WEATHERGRIDPROVIDER_H #include "blackmisc/blackmiscexport.h" -#include "blackmisc/identifier.h" -#include "blackmisc/weather/weathergrid.h" -#include "blackmisc/pq/length.h" #include "blackmisc/slot.h" +#include "blackmisc/weather/weathergrid.h" + +#include +#include namespace BlackMisc { + namespace Weather { //! Direct threadsafe in memory access to weather grid diff --git a/src/blackmisc/weather/windlayer.cpp b/src/blackmisc/weather/windlayer.cpp index a0b1a5bf7..08c85f9d3 100644 --- a/src/blackmisc/weather/windlayer.cpp +++ b/src/blackmisc/weather/windlayer.cpp @@ -8,6 +8,7 @@ */ #include "blackmisc/weather/windlayer.h" +#include "blackmisc/pq/physicalquantity.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/weather/windlayer.h b/src/blackmisc/weather/windlayer.h index ed305b829..de4c1eb2b 100644 --- a/src/blackmisc/weather/windlayer.h +++ b/src/blackmisc/weather/windlayer.h @@ -12,13 +12,17 @@ #ifndef BLACKMISC_WEATHER_WINDLAYER_H #define BLACKMISC_WEATHER_WINDLAYER_H +#include "blackmisc/aviation/altitude.h" #include "blackmisc/blackmiscexport.h" -#include "blackmisc/valueobject.h" -#include "blackmisc/propertyindex.h" +#include "blackmisc/metaclass.h" #include "blackmisc/pq/angle.h" #include "blackmisc/pq/speed.h" -#include "blackmisc/aviation/altitude.h" -#include +#include "blackmisc/propertyindex.h" +#include "blackmisc/valueobject.h" +#include "blackmisc/variant.h" + +#include +#include namespace BlackMisc { diff --git a/src/blackmisc/weather/windlayerlist.cpp b/src/blackmisc/weather/windlayerlist.cpp index c62af6a49..2f88153a2 100644 --- a/src/blackmisc/weather/windlayerlist.cpp +++ b/src/blackmisc/weather/windlayerlist.cpp @@ -7,7 +7,9 @@ * contained in the LICENSE file. */ -#include "windlayerlist.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/compare.h" +#include "blackmisc/weather/windlayerlist.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/weather/windlayerlist.h b/src/blackmisc/weather/windlayerlist.h index f1e7c2fab..b300f53f4 100644 --- a/src/blackmisc/weather/windlayerlist.h +++ b/src/blackmisc/weather/windlayerlist.h @@ -12,12 +12,22 @@ #ifndef BLACKMISC_WEATHER_WINDLAYERLIST_H #define BLACKMISC_WEATHER_WINDLAYERLIST_H -#include "windlayer.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" +#include "blackmisc/variant.h" +#include "blackmisc/weather/windlayer.h" + +#include +#include +#include namespace BlackMisc { + namespace Aviation + { + class CAltitude; + } + namespace Weather { /*! diff --git a/src/blackmisc/worker.cpp b/src/blackmisc/worker.cpp index 2c2a33312..b9c27579e 100644 --- a/src/blackmisc/worker.cpp +++ b/src/blackmisc/worker.cpp @@ -7,8 +7,9 @@ * contained in the LICENSE file. */ -#include "worker.h" #include "blackmisc/threadutils.h" +#include "blackmisc/worker.h" + #include namespace BlackMisc diff --git a/src/blackmisc/worker.h b/src/blackmisc/worker.h index 6e52c5b07..d7d5c20ec 100644 --- a/src/blackmisc/worker.h +++ b/src/blackmisc/worker.h @@ -12,17 +12,25 @@ #ifndef BLACKMISC_WORKER_H #define BLACKMISC_WORKER_H -#include "blackmiscexport.h" -#include "variant.h" -#include "stacktrace.h" -#include "invoke.h" -#include +#include "blackmisc/blackmiscexport.h" +#include "blackmisc/invoke.h" +#include "blackmisc/stacktrace.h" +#include "blackmisc/variant.h" + +#include +#include #include -#include +#include +#include #include +#include +#include +#include #include +#include +#include #include -#include +#include namespace BlackMisc { diff --git a/src/blacksound/soundgenerator.h b/src/blacksound/soundgenerator.h index 86acb444f..77470bad4 100644 --- a/src/blacksound/soundgenerator.h +++ b/src/blacksound/soundgenerator.h @@ -16,6 +16,7 @@ #include "blackmisc/aviation/selcal.h" #include "blackmisc/audio/audiodeviceinfo.h" #include "blackmisc/pq/time.h" +#include "blackmisc/pq/frequency.h" #include "blackmisc/audio/notificationsounds.h" #include #include diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index bd910800d..2f4dfc627 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -15,6 +15,7 @@ #include "multiplayerpacketparser.h" #include "registermetadata.h" #include "blackcore/interpolatorlinear.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/logmessage.h" #include "blackmisc/propertyindexallclasses.h" diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index c576785bd..2783fb22e 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -10,6 +10,7 @@ #include "simulatorfsx.h" #include "blackcore/interpolatorlinear.h" #include "blackcore/application.h" +#include "blackmisc/network/textmessage.h" #include "blackmisc/simulation/fscommon/bcdconversions.h" #include "blackmisc/simulation/fsx/simconnectutilities.h" #include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"