diff --git a/src/blackcore/actionbind.cpp b/src/blackcore/actionbind.cpp index dc4be0c9a..fe5d1f5f1 100644 --- a/src/blackcore/actionbind.cpp +++ b/src/blackcore/actionbind.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "actionbind.h" +#include "blackcore/actionbind.h" namespace BlackCore { diff --git a/src/blackcore/actionbind.h b/src/blackcore/actionbind.h index 1e42dc0a9..b26b14c8f 100644 --- a/src/blackcore/actionbind.h +++ b/src/blackcore/actionbind.h @@ -12,7 +12,7 @@ #define BLACKCORE_ACTIONBIND_H #include "blackcore/application.h" -#include "blackcoreexport.h" +#include "blackcore/blackcoreexport.h" #include namespace BlackCore diff --git a/src/blackcore/afv/audio/callsigndelaycache.cpp b/src/blackcore/afv/audio/callsigndelaycache.cpp index e3ebd7fcc..3ffd962da 100644 --- a/src/blackcore/afv/audio/callsigndelaycache.cpp +++ b/src/blackcore/afv/audio/callsigndelaycache.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "callsigndelaycache.h" +#include "blackcore/afv/audio/callsigndelaycache.h" namespace BlackCore::Afv::Audio { diff --git a/src/blackcore/afv/audio/callsignsampleprovider.cpp b/src/blackcore/afv/audio/callsignsampleprovider.cpp index 37bc1f872..8ed4ff59e 100644 --- a/src/blackcore/afv/audio/callsignsampleprovider.cpp +++ b/src/blackcore/afv/audio/callsignsampleprovider.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "callsignsampleprovider.h" -#include "callsigndelaycache.h" +#include "blackcore/afv/audio/callsignsampleprovider.h" +#include "blackcore/afv/audio/callsigndelaycache.h" #include "blackcore/afv/audio/receiversampleprovider.h" #include "blacksound/sampleprovider/samples.h" diff --git a/src/blackcore/afv/audio/input.cpp b/src/blackcore/afv/audio/input.cpp index eef6cdada..84cfabfb8 100644 --- a/src/blackcore/afv/audio/input.cpp +++ b/src/blackcore/afv/audio/input.cpp @@ -8,7 +8,7 @@ //! \file -#include "input.h" +#include "blackcore/afv/audio/input.h" #include "blacksound/audioutilities.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" diff --git a/src/blackcore/afv/audio/output.cpp b/src/blackcore/afv/audio/output.cpp index efef3a0e2..a3d9f2c13 100644 --- a/src/blackcore/afv/audio/output.cpp +++ b/src/blackcore/afv/audio/output.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "output.h" +#include "blackcore/afv/audio/output.h" #include "blacksound/audioutilities.h" #include "blackmisc/metadatautils.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/afv/audio/receiversampleprovider.cpp b/src/blackcore/afv/audio/receiversampleprovider.cpp index ab042e284..fd1a187e5 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.cpp +++ b/src/blackcore/afv/audio/receiversampleprovider.cpp @@ -8,7 +8,7 @@ //! \file -#include "receiversampleprovider.h" +#include "blackcore/afv/audio/receiversampleprovider.h" #include "blackmisc/logmessage.h" #include "blackmisc/metadatautils.h" #include "blacksound/sampleprovider/resourcesoundsampleprovider.h" diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.cpp b/src/blackcore/afv/audio/soundcardsampleprovider.cpp index fc42606b4..50e3868e3 100644 --- a/src/blackcore/afv/audio/soundcardsampleprovider.cpp +++ b/src/blackcore/afv/audio/soundcardsampleprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "soundcardsampleprovider.h" +#include "blackcore/afv/audio/soundcardsampleprovider.h" #include "blackmisc/metadatautils.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index febdc9c69..413493cb2 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "afvclient.h" +#include "blackcore/afv/clients/afvclient.h" #include "blackcore/context/contextownaircraft.h" #include "blackcore/context/contextnetwork.h" #include "blackcore/context/contextsimulator.h" diff --git a/src/blackcore/afv/connection/apiserverconnection.cpp b/src/blackcore/afv/connection/apiserverconnection.cpp index 234c38072..3d167275f 100644 --- a/src/blackcore/afv/connection/apiserverconnection.cpp +++ b/src/blackcore/afv/connection/apiserverconnection.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "apiserverconnection.h" +#include "blackcore/afv/connection/apiserverconnection.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/network/external/qjsonwebtoken.h" diff --git a/src/blackcore/afv/connection/clientconnection.cpp b/src/blackcore/afv/connection/clientconnection.cpp index 3868a8871..486ec9109 100644 --- a/src/blackcore/afv/connection/clientconnection.cpp +++ b/src/blackcore/afv/connection/clientconnection.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientconnection.h" +#include "blackcore/afv/connection/clientconnection.h" #include "blackmisc/logmessage.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackcore/afv/connection/clientconnectiondata.cpp b/src/blackcore/afv/connection/clientconnectiondata.cpp index 7f054fd36..fff8916da 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.cpp +++ b/src/blackcore/afv/connection/clientconnectiondata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientconnectiondata.h" +#include "blackcore/afv/connection/clientconnectiondata.h" #include "blackmisc/logmessage.h" #include diff --git a/src/blackcore/afv/connection/clientconnectiondata.h b/src/blackcore/afv/connection/clientconnectiondata.h index e1934d267..12248cb72 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.h +++ b/src/blackcore/afv/connection/clientconnectiondata.h @@ -12,7 +12,7 @@ #define BLACKCORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H #include "blackcore/afv/dto.h" -#include "apiserverconnection.h" +#include "blackcore/afv/connection/apiserverconnection.h" #include "blackmisc/logcategories.h" #include "blackcore/afv/crypto/cryptodtochannel.h" diff --git a/src/blackcore/afv/crypto/cryptodtochannel.cpp b/src/blackcore/afv/crypto/cryptodtochannel.cpp index aec2c6e16..410b79f50 100644 --- a/src/blackcore/afv/crypto/cryptodtochannel.cpp +++ b/src/blackcore/afv/crypto/cryptodtochannel.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "cryptodtochannel.h" +#include "blackcore/afv/crypto/cryptodtochannel.h" #include "blackmisc/verify.h" using namespace BlackMisc; diff --git a/src/blackcore/afv/crypto/cryptodtochannel.h b/src/blackcore/afv/crypto/cryptodtochannel.h index cde5c0564..3750e51d6 100644 --- a/src/blackcore/afv/crypto/cryptodtochannel.h +++ b/src/blackcore/afv/crypto/cryptodtochannel.h @@ -12,7 +12,7 @@ #define BLACKCORE_AFV_CRYPTO_CRYPTODTOCHANNEL_H #include "blackcore/afv/dto.h" -#include "cryptodtomode.h" +#include "blackcore/afv/crypto/cryptodtomode.h" #include #include diff --git a/src/blackcore/afv/crypto/cryptodtoheaderdto.h b/src/blackcore/afv/crypto/cryptodtoheaderdto.h index bcd9bee2e..26d7e9ccf 100644 --- a/src/blackcore/afv/crypto/cryptodtoheaderdto.h +++ b/src/blackcore/afv/crypto/cryptodtoheaderdto.h @@ -11,7 +11,7 @@ #ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H #define BLACKCORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H -#include "cryptodtomode.h" +#include "blackcore/afv/crypto/cryptodtomode.h" #include "msgpack.hpp" #include #include diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.cpp b/src/blackcore/afv/crypto/cryptodtoserializer.cpp index 34f1c8f7e..b3283d883 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.cpp +++ b/src/blackcore/afv/crypto/cryptodtoserializer.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "cryptodtoserializer.h" +#include "blackcore/afv/crypto/cryptodtoserializer.h" namespace BlackCore::Afv::Crypto { diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.h b/src/blackcore/afv/crypto/cryptodtoserializer.h index 3d70b7d3c..9375852ec 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.h +++ b/src/blackcore/afv/crypto/cryptodtoserializer.h @@ -11,9 +11,9 @@ #ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H #define BLACKCORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H -#include "cryptodtochannel.h" -#include "cryptodtomode.h" -#include "cryptodtoheaderdto.h" +#include "blackcore/afv/crypto/cryptodtochannel.h" +#include "blackcore/afv/crypto/cryptodtomode.h" +#include "blackcore/afv/crypto/cryptodtoheaderdto.h" #include "sodium.h" #include diff --git a/src/blackcore/afv/model/afvmapreader.cpp b/src/blackcore/afv/model/afvmapreader.cpp index 2ee222f5d..86b00bd30 100644 --- a/src/blackcore/afv/model/afvmapreader.cpp +++ b/src/blackcore/afv/model/afvmapreader.cpp @@ -1,4 +1,4 @@ -#include "afvmapreader.h" +#include "blackcore/afv/model/afvmapreader.h" #include "blackcore/application.h" #include "blackcore/afv/dto.h" #include "blackmisc/aviation/callsign.h" diff --git a/src/blackcore/afv/model/afvmapreader.h b/src/blackcore/afv/model/afvmapreader.h index 6366ac734..6d07533a9 100644 --- a/src/blackcore/afv/model/afvmapreader.h +++ b/src/blackcore/afv/model/afvmapreader.h @@ -9,7 +9,7 @@ #ifndef BLACKCORE_AFV_AFVMAPREADER_H #define BLACKCORE_AFV_AFVMAPREADER_H -#include "atcstationmodel.h" +#include "blackcore/afv/model/atcstationmodel.h" #include "blackcore/blackcoreexport.h" #include diff --git a/src/blackcore/afv/model/atcstationmodel.cpp b/src/blackcore/afv/model/atcstationmodel.cpp index 0e78010a5..251d717ad 100644 --- a/src/blackcore/afv/model/atcstationmodel.cpp +++ b/src/blackcore/afv/model/atcstationmodel.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "atcstationmodel.h" +#include "blackcore/afv/model/atcstationmodel.h" #include using namespace BlackCore::Afv; diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index c62736a93..5a319b76f 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -22,7 +22,6 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" -#include "aircraftmatcher.h" #include #include diff --git a/src/blackcore/airspaceanalyzer.cpp b/src/blackcore/airspaceanalyzer.cpp index 675bfa644..a0445ca5c 100644 --- a/src/blackcore/airspaceanalyzer.cpp +++ b/src/blackcore/airspaceanalyzer.cpp @@ -7,7 +7,7 @@ */ #include "blackcore/airspaceanalyzer.h" -#include "airspacemonitor.h" +#include "blackcore/airspacemonitor.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/transponder.h" diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 56803ff04..8a966ba21 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "blackconfig/buildconfig.h" #include "blackcore/application.h" +#include "blackconfig/buildconfig.h" #include "blackcore/db/networkwatchdog.h" #include "blackcore/context/contextnetwork.h" #include "blackcore/context/contextsimulatorimpl.h" @@ -39,7 +39,6 @@ #include "blackmisc/stringutils.h" #include "blackmisc/threadutils.h" #include "blackmisc/verify.h" -#include "application.h" #include #include diff --git a/src/blackcore/context/contextapplicationempty.h b/src/blackcore/context/contextapplicationempty.h index 06e2ede98..c3fbd76b3 100644 --- a/src/blackcore/context/contextapplicationempty.h +++ b/src/blackcore/context/contextapplicationempty.h @@ -11,9 +11,9 @@ #ifndef BLACKCORE_CONTEXTAPPLICATION_EMPTY_H #define BLACKCORE_CONTEXTAPPLICATION_EMPTY_H -#include "blackcoreexport.h" -#include "contextapplication.h" -#include "corefacade.h" +#include "blackcore/blackcoreexport.h" +#include "blackcore/context/contextapplication.h" +#include "blackcore/corefacade.h" #include "blackmisc/identifierlist.h" // clazy:excludeall=const-signal-or-slot diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index 73b12f5a1..04b453d47 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -6,15 +6,13 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "contextaudio.h" - -#include "blackcore/afv/clients/afvclient.h" #include "blackcore/context/contextaudio.h" #include "blackcore/context/contextnetwork.h" // for user login #include "blackcore/context/contextownaircraft.h" // for COM integration #include "blackcore/context/contextsimulator.h" // for COM intergration #include "blackcore/context/contextaudioimpl.h" #include "blackcore/context/contextaudioproxy.h" +#include "blackcore/afv/clients/afvclient.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/dbusserver.h" #include "blackmisc/stringutils.h" diff --git a/src/blackcore/context/contextnetworkempty.h b/src/blackcore/context/contextnetworkempty.h index 91a588fc6..47d66818a 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/blackcore/context/contextnetworkempty.h @@ -11,8 +11,8 @@ #ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_EMPTY_H #define BLACKCORE_CONTEXT_CONTEXTNETWORK_EMPTY_H -#include "blackcoreexport.h" -#include "contextnetwork.h" +#include "blackcore/blackcoreexport.h" +#include "blackcore/context/contextnetwork.h" #include "blackmisc/logmessage.h" // clazy:excludeall=const-signal-or-slot diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 51bb09db4..f74e603d9 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -37,7 +37,6 @@ #include "blackmisc/simplecommandparser.h" #include "blackmisc/stringutils.h" #include "blackconfig/buildconfig.h" -#include "contextnetworkimpl.h" #include #include diff --git a/src/blackcore/context/contextownaircraftempty.h b/src/blackcore/context/contextownaircraftempty.h index 5635ae92a..96eb19768 100644 --- a/src/blackcore/context/contextownaircraftempty.h +++ b/src/blackcore/context/contextownaircraftempty.h @@ -11,8 +11,8 @@ #ifndef BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H #define BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H -#include "blackcoreexport.h" -#include "contextownaircraft.h" +#include "blackcore/blackcoreexport.h" +#include "blackcore/context/contextownaircraft.h" #include "blackmisc/logmessage.h" // clazy:excludeall=const-signal-or-slot diff --git a/src/blackcore/context/contextsimulatorempty.h b/src/blackcore/context/contextsimulatorempty.h index 397f56f84..628efdeb6 100644 --- a/src/blackcore/context/contextsimulatorempty.h +++ b/src/blackcore/context/contextsimulatorempty.h @@ -11,8 +11,8 @@ #ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H #define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H -#include "blackcoreexport.h" -#include "contextsimulator.h" +#include "blackcore/blackcoreexport.h" +#include "blackcore/context/contextsimulator.h" #include "blackmisc/logmessage.h" // clazy:excludeall=const-signal-or-slot diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 5f167ff14..ad25cd1b9 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "contextsimulatorimpl.h" +#include "blackcore/context/contextsimulatorimpl.h" #include "blackcore/context/contextapplication.h" #include "blackcore/context/contextnetwork.h" #include "blackcore/context/contextnetworkimpl.h" diff --git a/src/blackcore/corefacade.h b/src/blackcore/corefacade.h index 47b72ef05..5328895e4 100644 --- a/src/blackcore/corefacade.h +++ b/src/blackcore/corefacade.h @@ -11,7 +11,7 @@ #ifndef BLACKCORE_COREFACADE_H #define BLACKCORE_COREFACADE_H -#include "corefacadeconfig.h" +#include "blackcore/corefacadeconfig.h" #include "blackcore/data/launchersetup.h" #include "blackcore/vatsim/vatsimsettings.h" #include "blackcore/blackcoreexport.h" diff --git a/src/blackcore/data/launchersetup.cpp b/src/blackcore/data/launchersetup.cpp index 4cd0463ed..bd3c1d27d 100644 --- a/src/blackcore/data/launchersetup.cpp +++ b/src/blackcore/data/launchersetup.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "launchersetup.h" +#include "blackcore/data/launchersetup.h" #include "blackmisc/stringutils.h" using namespace BlackMisc; diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp index 99a50d80e..672b31dd2 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/blackcore/db/airportdatareader.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "airportdatareader.h" +#include "blackcore/db/airportdatareader.h" #include "blackcore/db/databaseutils.h" #include "blackcore/application.h" #include "blackmisc/network/networkutils.h" diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/blackcore/db/backgrounddataupdater.cpp index 8c83d40a7..b11cfdd6d 100644 --- a/src/blackcore/db/backgrounddataupdater.cpp +++ b/src/blackcore/db/backgrounddataupdater.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "backgrounddataupdater.h" +#include "blackcore/db/backgrounddataupdater.h" #include "blackcore/db/databaseutils.h" #include "blackcore/db/databasewriter.h" #include "blackcore/application.h" diff --git a/src/blackcore/db/databaseutils.cpp b/src/blackcore/db/databaseutils.cpp index 842ac249b..a24446e66 100644 --- a/src/blackcore/db/databaseutils.cpp +++ b/src/blackcore/db/databaseutils.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackcore/db/databaseutils.h" #include "blackcore/application.h" -#include "databaseutils.h" #include "blackcore/webdataservices.h" #include "blackmisc/logmessage.h" #include "blackmisc/fileutils.h" diff --git a/src/blackcore/db/infodatareader.cpp b/src/blackcore/db/infodatareader.cpp index 2ca4c0abb..4ee0b2dac 100644 --- a/src/blackcore/db/infodatareader.cpp +++ b/src/blackcore/db/infodatareader.cpp @@ -6,13 +6,13 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackcore/db/infodatareader.h" #include "blackcore/application.h" #include "blackcore/webdataservices.h" #include "blackmisc/sequence.h" #include "blackmisc/logmessage.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/verify.h" -#include "infodatareader.h" #include #include diff --git a/src/blackcore/db/networkwatchdog.cpp b/src/blackcore/db/networkwatchdog.cpp index 36ff5262b..376e35567 100644 --- a/src/blackcore/db/networkwatchdog.cpp +++ b/src/blackcore/db/networkwatchdog.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "networkwatchdog.h" -#include "application.h" +#include "blackcore/db/networkwatchdog.h" +#include "blackcore/application.h" #include "blackmisc/logmessage.h" #include "blackmisc/network/networkutils.h" diff --git a/src/blackcore/fsd/addatc.cpp b/src/blackcore/fsd/addatc.cpp index 90053ed89..f00fa9562 100644 --- a/src/blackcore/fsd/addatc.cpp +++ b/src/blackcore/fsd/addatc.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "addatc.h" -#include "serializer.h" +#include "blackcore/fsd/addatc.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" namespace BlackCore::Fsd diff --git a/src/blackcore/fsd/addpilot.cpp b/src/blackcore/fsd/addpilot.cpp index 7ebaa08b6..8857a3c15 100644 --- a/src/blackcore/fsd/addpilot.cpp +++ b/src/blackcore/fsd/addpilot.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "addpilot.h" -#include "serializer.h" +#include "blackcore/fsd/addpilot.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/atcdataupdate.cpp b/src/blackcore/fsd/atcdataupdate.cpp index cd5eb4235..0d6a5ea71 100644 --- a/src/blackcore/fsd/atcdataupdate.cpp +++ b/src/blackcore/fsd/atcdataupdate.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "atcdataupdate.h" -#include "serializer.h" +#include "blackcore/fsd/atcdataupdate.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/authchallenge.cpp b/src/blackcore/fsd/authchallenge.cpp index c52f56030..3e20a9142 100644 --- a/src/blackcore/fsd/authchallenge.cpp +++ b/src/blackcore/fsd/authchallenge.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "authchallenge.h" +#include "blackcore/fsd/authchallenge.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/authresponse.cpp b/src/blackcore/fsd/authresponse.cpp index 74ab057aa..206288203 100644 --- a/src/blackcore/fsd/authresponse.cpp +++ b/src/blackcore/fsd/authresponse.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "authresponse.h" +#include "blackcore/fsd/authresponse.h" #include "blackmisc/logmessage.h" namespace BlackCore::Fsd diff --git a/src/blackcore/fsd/clientidentification.cpp b/src/blackcore/fsd/clientidentification.cpp index f0f08604e..99fd1215c 100644 --- a/src/blackcore/fsd/clientidentification.cpp +++ b/src/blackcore/fsd/clientidentification.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientidentification.h" +#include "blackcore/fsd/clientidentification.h" #include "blackmisc/logmessage.h" namespace BlackCore::Fsd diff --git a/src/blackcore/fsd/clientquery.cpp b/src/blackcore/fsd/clientquery.cpp index 831805286..e75da7c81 100644 --- a/src/blackcore/fsd/clientquery.cpp +++ b/src/blackcore/fsd/clientquery.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientquery.h" -#include "serializer.h" +#include "blackcore/fsd/clientquery.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/clientresponse.cpp b/src/blackcore/fsd/clientresponse.cpp index d5f477da4..8ca26f0d9 100644 --- a/src/blackcore/fsd/clientresponse.cpp +++ b/src/blackcore/fsd/clientresponse.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientresponse.h" -#include "serializer.h" +#include "blackcore/fsd/clientresponse.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/deleteatc.cpp b/src/blackcore/fsd/deleteatc.cpp index 3f0450a2c..5eda7928c 100644 --- a/src/blackcore/fsd/deleteatc.cpp +++ b/src/blackcore/fsd/deleteatc.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "deleteatc.h" +#include "blackcore/fsd/deleteatc.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/deletepilot.cpp b/src/blackcore/fsd/deletepilot.cpp index 83c8751f3..06e1599ae 100644 --- a/src/blackcore/fsd/deletepilot.cpp +++ b/src/blackcore/fsd/deletepilot.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "deletepilot.h" +#include "blackcore/fsd/deletepilot.h" #include "blackmisc/logmessage.h" using namespace BlackMisc; diff --git a/src/blackcore/fsd/flightplan.cpp b/src/blackcore/fsd/flightplan.cpp index ac8eaafe9..b74f8cd82 100644 --- a/src/blackcore/fsd/flightplan.cpp +++ b/src/blackcore/fsd/flightplan.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "flightplan.h" -#include "serializer.h" +#include "blackcore/fsd/flightplan.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index 8249f0a6a..85a08108d 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -6,8 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "fsdclient.h" -#include "fsdclient.h" +#include "blackcore/fsd/fsdclient.h" #include "blackcore/application.h" #include "blackcore/fsd/addatc.h" diff --git a/src/blackcore/fsd/fsdidentification.cpp b/src/blackcore/fsd/fsdidentification.cpp index d8f4f2f0f..0f6e5e18b 100644 --- a/src/blackcore/fsd/fsdidentification.cpp +++ b/src/blackcore/fsd/fsdidentification.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "fsdidentification.h" +#include "blackcore/fsd/fsdidentification.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/interimpilotdataupdate.cpp b/src/blackcore/fsd/interimpilotdataupdate.cpp index a5bb19648..f9c5e3dc0 100644 --- a/src/blackcore/fsd/interimpilotdataupdate.cpp +++ b/src/blackcore/fsd/interimpilotdataupdate.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interimpilotdataupdate.h" -#include "pbh.h" +#include "blackcore/fsd/interimpilotdataupdate.h" +#include "blackcore/fsd/pbh.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/killrequest.cpp b/src/blackcore/fsd/killrequest.cpp index 6617c4661..afb679a6c 100644 --- a/src/blackcore/fsd/killrequest.cpp +++ b/src/blackcore/fsd/killrequest.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "killrequest.h" +#include "blackcore/fsd/killrequest.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/pilotdataupdate.cpp b/src/blackcore/fsd/pilotdataupdate.cpp index dabfe99c0..13ce3bfb5 100644 --- a/src/blackcore/fsd/pilotdataupdate.cpp +++ b/src/blackcore/fsd/pilotdataupdate.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "pilotdataupdate.h" -#include "pbh.h" -#include "serializer.h" +#include "blackcore/fsd/pilotdataupdate.h" +#include "blackcore/fsd/pbh.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/ping.cpp b/src/blackcore/fsd/ping.cpp index cd5fd9cf2..d312ef683 100644 --- a/src/blackcore/fsd/ping.cpp +++ b/src/blackcore/fsd/ping.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "ping.h" +#include "blackcore/fsd/ping.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/planeinforequest.cpp b/src/blackcore/fsd/planeinforequest.cpp index 3417b1070..83157d2d0 100644 --- a/src/blackcore/fsd/planeinforequest.cpp +++ b/src/blackcore/fsd/planeinforequest.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "planeinforequest.h" +#include "blackcore/fsd/planeinforequest.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/planeinforequestfsinn.cpp b/src/blackcore/fsd/planeinforequestfsinn.cpp index 95fe86522..6afcaea83 100644 --- a/src/blackcore/fsd/planeinforequestfsinn.cpp +++ b/src/blackcore/fsd/planeinforequestfsinn.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "planeinforequestfsinn.h" +#include "blackcore/fsd/planeinforequestfsinn.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/planeinformation.cpp b/src/blackcore/fsd/planeinformation.cpp index bb4366350..141834d14 100644 --- a/src/blackcore/fsd/planeinformation.cpp +++ b/src/blackcore/fsd/planeinformation.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "planeinformation.h" +#include "blackcore/fsd/planeinformation.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/planeinformationfsinn.cpp b/src/blackcore/fsd/planeinformationfsinn.cpp index df17ae3cd..2a8d64ce1 100644 --- a/src/blackcore/fsd/planeinformationfsinn.cpp +++ b/src/blackcore/fsd/planeinformationfsinn.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "planeinformationfsinn.h" +#include "blackcore/fsd/planeinformationfsinn.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/pong.cpp b/src/blackcore/fsd/pong.cpp index 92a6504e3..040fa1ed6 100644 --- a/src/blackcore/fsd/pong.cpp +++ b/src/blackcore/fsd/pong.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "pong.h" +#include "blackcore/fsd/pong.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/revbclientparts.cpp b/src/blackcore/fsd/revbclientparts.cpp index 4471a377e..ce2744560 100644 --- a/src/blackcore/fsd/revbclientparts.cpp +++ b/src/blackcore/fsd/revbclientparts.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "revbclientparts.h" -#include "serializer.h" +#include "blackcore/fsd/revbclientparts.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/serializer.cpp b/src/blackcore/fsd/serializer.cpp index a21456f51..8c67714f3 100644 --- a/src/blackcore/fsd/serializer.cpp +++ b/src/blackcore/fsd/serializer.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "serializer.h" +#include "blackcore/fsd/serializer.h" #include "blackmisc/verify.h" #include "blackmisc/logmessage.h" #include "blackmisc/logcategories.h" diff --git a/src/blackcore/fsd/servererror.cpp b/src/blackcore/fsd/servererror.cpp index 41575c6d0..937dbb285 100644 --- a/src/blackcore/fsd/servererror.cpp +++ b/src/blackcore/fsd/servererror.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "servererror.h" +#include "blackcore/fsd/servererror.h" #include #include "blackmisc/logmessage.h" diff --git a/src/blackcore/fsd/textmessage.cpp b/src/blackcore/fsd/textmessage.cpp index 8f0346a9d..757ee9c73 100644 --- a/src/blackcore/fsd/textmessage.cpp +++ b/src/blackcore/fsd/textmessage.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "textmessage.h" +#include "blackcore/fsd/textmessage.h" #include "blackmisc/logmessage.h" diff --git a/src/blackcore/githubpackagesreader.cpp b/src/blackcore/githubpackagesreader.cpp index 5426a7bf0..e14986897 100644 --- a/src/blackcore/githubpackagesreader.cpp +++ b/src/blackcore/githubpackagesreader.cpp @@ -8,7 +8,7 @@ //! \file -#include "githubpackagesreader.h" +#include "blackcore/githubpackagesreader.h" #include "blackcore/application.h" #include "blackconfig/buildconfig.h" #include diff --git a/src/blackcore/modelsetbuilder.cpp b/src/blackcore/modelsetbuilder.cpp index 9e6ef34de..4c77f2618 100644 --- a/src/blackcore/modelsetbuilder.cpp +++ b/src/blackcore/modelsetbuilder.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "application.h" -#include "modelsetbuilder.h" -#include "webdataservices.h" +#include "blackcore/application.h" +#include "blackcore/modelsetbuilder.h" +#include "blackcore/webdataservices.h" #include "blackcore/db/databaseutils.h" #include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/simulation/aircraftmodel.h" diff --git a/src/blackcore/progress.h b/src/blackcore/progress.h index fcf2c6858..69ba27558 100644 --- a/src/blackcore/progress.h +++ b/src/blackcore/progress.h @@ -9,7 +9,7 @@ #ifndef BLACKCORE_PROGRESS_H #define BLACKCORE_PROGRESS_H -#include "application.h" +#include "blackcore/application.h" namespace BlackCore { diff --git a/src/blackcore/registermetadata.cpp b/src/blackcore/registermetadata.cpp index ce1cce2b6..ad67e2eb0 100644 --- a/src/blackcore/registermetadata.cpp +++ b/src/blackcore/registermetadata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadata.h" +#include "blackcore/registermetadata.h" #include "blackcore/context/contextapplication.h" #include "blackcore/data/launchersetup.h" #include "blackcore/data/globalsetup.h" diff --git a/src/blackcore/vatsim/vatsimsettings.cpp b/src/blackcore/vatsim/vatsimsettings.cpp index 5b8e4ae22..756b6e616 100644 --- a/src/blackcore/vatsim/vatsimsettings.cpp +++ b/src/blackcore/vatsim/vatsimsettings.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "vatsimsettings.h" +#include "blackcore/vatsim/vatsimsettings.h" using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackcore/webdataservicesms.cpp b/src/blackcore/webdataservicesms.cpp index c35ccdc95..050e68bea 100644 --- a/src/blackcore/webdataservicesms.cpp +++ b/src/blackcore/webdataservicesms.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "webdataservicesms.h" +#include "blackcore/webdataservicesms.h" #include "blackcore/webdataservices.h" #include "blackcore/application.h" #include "blackmisc/aviation/aircrafticaocodelist.h" diff --git a/src/blackcore/webreaderflags.cpp b/src/blackcore/webreaderflags.cpp index 0e0307bde..8283eb853 100644 --- a/src/blackcore/webreaderflags.cpp +++ b/src/blackcore/webreaderflags.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "webreaderflags.h" +#include "blackcore/webreaderflags.h" using namespace BlackMisc::Network; diff --git a/src/blackgui/components/weathercomponent.h b/src/blackgui/components/weathercomponent.h index ae4f959c2..ab4e03c65 100644 --- a/src/blackgui/components/weathercomponent.h +++ b/src/blackgui/components/weathercomponent.h @@ -11,8 +11,8 @@ #ifndef BLACKGUI_WEATHERCOMPONENT_H #define BLACKGUI_WEATHERCOMPONENT_H -#include "enablefordockwidgetinfoarea.h" -#include "coordinatedialog.h" +#include "blackgui/enablefordockwidgetinfoarea.h" +#include "blackgui/components/coordinatedialog.h" #include "blackgui/blackguiexport.h" #include "blackcore/actionbind.h" #include "blackmisc/geo/coordinategeodetic.h" diff --git a/src/blackmisc/audio/notificationsounds.cpp b/src/blackmisc/audio/notificationsounds.cpp index 75f8031d5..9515691f3 100644 --- a/src/blackmisc/audio/notificationsounds.cpp +++ b/src/blackmisc/audio/notificationsounds.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "notificationsounds.h" +#include "blackmisc/audio/notificationsounds.h" #include #include diff --git a/src/blackmisc/audio/registermetadataaudio.cpp b/src/blackmisc/audio/registermetadataaudio.cpp index e11657640..d9f47973c 100644 --- a/src/blackmisc/audio/registermetadataaudio.cpp +++ b/src/blackmisc/audio/registermetadataaudio.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadataaudio.h" -#include "audio.h" -#include "ptt.h" +#include "blackmisc/audio/registermetadataaudio.h" +#include "blackmisc/audio/audio.h" +#include "blackmisc/audio/ptt.h" #include "blackmisc/variant.h" #include diff --git a/src/blackmisc/aviation/aircraftcategorylist.h b/src/blackmisc/aviation/aircraftcategorylist.h index 269db4e38..256b62227 100644 --- a/src/blackmisc/aviation/aircraftcategorylist.h +++ b/src/blackmisc/aviation/aircraftcategorylist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTCATEGORYLIST_H #define BLACKMISC_AVIATION_AIRCRAFTCATEGORYLIST_H -#include "aircraftcategory.h" +#include "blackmisc/aviation/aircraftcategory.h" #include "blackmisc/db/datastoreobjectlist.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h index 9cb3da8fe..6d78322f2 100644 --- a/src/blackmisc/aviation/aircrafticaocode.h +++ b/src/blackmisc/aviation/aircrafticaocode.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H #define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H -#include "aircraftcategory.h" +#include "blackmisc/aviation/aircraftcategory.h" #include "blackmisc/db/datastore.h" #include "blackmisc/pq/length.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/aviation/aircrafticaocodelist.cpp b/src/blackmisc/aviation/aircrafticaocodelist.cpp index db5be4843..cceb7f961 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.cpp +++ b/src/blackmisc/aviation/aircrafticaocodelist.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "aircrafticaocodelist.h" -#include "aircraftcategorylist.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/aircraftcategorylist.h" #include "blackmisc/range.h" #include "blackmisc/setbuilder.h" diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h index f0393ccf9..b82d7f6d2 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.h +++ b/src/blackmisc/aviation/aircrafticaocodelist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H #define BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H -#include "aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/db/datastoreobjectlist.h" diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 01a2875ed..0f6560c4b 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "aircraftparts.h" -#include "aircraftlights.h" +#include "blackmisc/aviation/aircraftparts.h" +#include "blackmisc/aviation/aircraftlights.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/propertyindex.h" #include "blackmisc/stringutils.h" diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h index 983d3f908..dcdfa6d45 100644 --- a/src/blackmisc/aviation/aircraftsituationchange.h +++ b/src/blackmisc/aviation/aircraftsituationchange.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONCHANGE_H #define BLACKMISC_AVIATION_AIRCRAFTSITUATIONCHANGE_H -#include "callsign.h" -#include "altitude.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/pq/angle.h" #include "blackmisc/pq/speed.h" #include "blackmisc/metaclass.h" diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 496d6dbb5..b0fa3d35f 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "airlineicaocode.h" -#include "callsign.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/db/datastoreutility.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/icons.h" diff --git a/src/blackmisc/aviation/airlineicaocodelist.h b/src/blackmisc/aviation/airlineicaocodelist.h index a89aa22ae..d390f0865 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.h +++ b/src/blackmisc/aviation/airlineicaocodelist.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H #define BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H -#include "airlineicaocode.h" -#include "callsign.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/db/datastoreobjectlist.h" diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index 9fedfd9fb..60439495a 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -18,7 +18,6 @@ #include "blackmisc/comparefunctions.h" #include "blackmisc/iconlist.h" #include "blackmisc/icons.h" -#include "altitude.h" #include #include diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index a290dfe65..27a28ef78 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "flightplan.h" -#include "airlineicaocode.h" -#include "flightplan.h" -#include "altitude.h" +#include "blackmisc/aviation/flightplan.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/flightplan.h" +#include "blackmisc/aviation/altitude.h" #include "blackmisc/pq/time.h" #include "blackmisc/pq/speed.h" #include "blackmisc/iconlist.h" diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 2fc9b121d..58a71f217 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -11,12 +11,12 @@ #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H #define BLACKMISC_AVIATION_FLIGHTPLAN_H -#include "airporticaocode.h" -#include "aircrafticaocode.h" -#include "altitude.h" -#include "airlineicaocode.h" -#include "callsign.h" -#include "selcal.h" +#include "blackmisc/aviation/airporticaocode.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/altitude.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/callsign.h" +#include "blackmisc/aviation/selcal.h" #include "blackmisc/network/voicecapabilities.h" #include "blackmisc/network/url.h" #include "blackmisc/pq/speed.h" diff --git a/src/blackmisc/aviation/flightplanlist.cpp b/src/blackmisc/aviation/flightplanlist.cpp index a628b657c..90693fc0c 100644 --- a/src/blackmisc/aviation/flightplanlist.cpp +++ b/src/blackmisc/aviation/flightplanlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "flightplanlist.h" +#include "blackmisc/aviation/flightplanlist.h" #include "blackmisc/mixin/mixincompare.h" #include "blackmisc/iterator.h" #include "blackmisc/predicates.h" diff --git a/src/blackmisc/aviation/registermetadataaviation.cpp b/src/blackmisc/aviation/registermetadataaviation.cpp index 988ada487..82faefc3b 100644 --- a/src/blackmisc/aviation/registermetadataaviation.cpp +++ b/src/blackmisc/aviation/registermetadataaviation.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadataaviation.h" -#include "aviation.h" +#include "blackmisc/aviation/registermetadataaviation.h" +#include "blackmisc/aviation/aviation.h" #include "blackmisc/variant.h" namespace BlackMisc diff --git a/src/blackmisc/aviation/simbriefdata.cpp b/src/blackmisc/aviation/simbriefdata.cpp index 3e91c0615..5e24e05fc 100644 --- a/src/blackmisc/aviation/simbriefdata.cpp +++ b/src/blackmisc/aviation/simbriefdata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "simbriefdata.h" +#include "blackmisc/aviation/simbriefdata.h" #include "blackmisc/logcategories.h" #include diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp index 223410a0f..693568d5a 100644 --- a/src/blackmisc/db/artifact.cpp +++ b/src/blackmisc/db/artifact.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "artifact.h" +#include "blackmisc/db/artifact.h" #include "blackmisc/stringutils.h" #include "blackconfig/buildconfig.h" #include diff --git a/src/blackmisc/db/artifact.h b/src/blackmisc/db/artifact.h index a84f6d00d..d7cdf45d9 100644 --- a/src/blackmisc/db/artifact.h +++ b/src/blackmisc/db/artifact.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_DB_ARTIFACT_H #define BLACKMISC_DB_ARTIFACT_H -#include "distributionlist.h" -#include "datastore.h" +#include "blackmisc/db/distributionlist.h" +#include "blackmisc/db/datastore.h" #include "blackmisc/platform.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/network/remotefile.h" diff --git a/src/blackmisc/db/artifactlist.cpp b/src/blackmisc/db/artifactlist.cpp index faa4f66a1..7dd8cb3aa 100644 --- a/src/blackmisc/db/artifactlist.cpp +++ b/src/blackmisc/db/artifactlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "artifactlist.h" +#include "blackmisc/db/artifactlist.h" #include "blackmisc/stringutils.h" using namespace BlackMisc::Network; diff --git a/src/blackmisc/db/artifactlist.h b/src/blackmisc/db/artifactlist.h index b07a6fd9a..6226b6295 100644 --- a/src/blackmisc/db/artifactlist.h +++ b/src/blackmisc/db/artifactlist.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_DB_ARTIFACTLIST_H #define BLACKMISC_DB_ARTIFACTLIST_H -#include "artifact.h" -#include "distributionlist.h" -#include "datastoreobjectlist.h" +#include "blackmisc/db/artifact.h" +#include "blackmisc/db/distributionlist.h" +#include "blackmisc/db/datastoreobjectlist.h" #include "blackmisc/network/remotefilelist.h" #include "blackmisc/platformset.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/db/dbinfo.cpp b/src/blackmisc/db/dbinfo.cpp index b75b9be48..b7de249cf 100644 --- a/src/blackmisc/db/dbinfo.cpp +++ b/src/blackmisc/db/dbinfo.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "dbinfo.h" +#include "blackmisc/db/dbinfo.h" #include "blackmisc/comparefunctions.h" #include diff --git a/src/blackmisc/db/dbinfolist.cpp b/src/blackmisc/db/dbinfolist.cpp index 540f64821..389e827ea 100644 --- a/src/blackmisc/db/dbinfolist.cpp +++ b/src/blackmisc/db/dbinfolist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "dbinfolist.h" +#include "blackmisc/db/dbinfolist.h" using namespace BlackMisc::Network; diff --git a/src/blackmisc/db/dbinfolist.h b/src/blackmisc/db/dbinfolist.h index d4e377571..bd8acf859 100644 --- a/src/blackmisc/db/dbinfolist.h +++ b/src/blackmisc/db/dbinfolist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_DB_DBINFOYLIST_H #define BLACKMISC_DB_DBINFOYLIST_H -#include "dbinfo.h" +#include "blackmisc/db/dbinfo.h" #include "blackmisc/db/datastoreobjectlist.h" #include "blackmisc/network/entityflags.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/db/distribution.cpp b/src/blackmisc/db/distribution.cpp index 9b814186a..0a6d49ebe 100644 --- a/src/blackmisc/db/distribution.cpp +++ b/src/blackmisc/db/distribution.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "distribution.h" +#include "blackmisc/db/distribution.h" #include #include diff --git a/src/blackmisc/db/distributionlist.cpp b/src/blackmisc/db/distributionlist.cpp index dd640e7c8..2fa5bd713 100644 --- a/src/blackmisc/db/distributionlist.cpp +++ b/src/blackmisc/db/distributionlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "distributionlist.h" +#include "blackmisc/db/distributionlist.h" #include "blackmisc/stringutils.h" namespace BlackMisc::Db diff --git a/src/blackmisc/db/distributionlist.h b/src/blackmisc/db/distributionlist.h index accd7c170..0fba7e2a2 100644 --- a/src/blackmisc/db/distributionlist.h +++ b/src/blackmisc/db/distributionlist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_DB_DISTRIBUTIONLIST_H #define BLACKMISC_DB_DISTRIBUTIONLIST_H -#include "distribution.h" +#include "blackmisc/db/distribution.h" #include "blackmisc/db/datastoreobjectlist.h" #include "blackmisc/platform.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/db/registermetadatadb.cpp b/src/blackmisc/db/registermetadatadb.cpp index 99f12d2e4..bac97a494 100644 --- a/src/blackmisc/db/registermetadatadb.cpp +++ b/src/blackmisc/db/registermetadatadb.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatadb.h" -#include "db.h" +#include "blackmisc/db/registermetadatadb.h" +#include "blackmisc/db/db.h" #include "blackmisc/variant.h" namespace BlackMisc diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp index 626d469bd..4feba339e 100644 --- a/src/blackmisc/db/updateinfo.cpp +++ b/src/blackmisc/db/updateinfo.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "updateinfo.h" +#include "blackmisc/db/updateinfo.h" #include "blackmisc/stringutils.h" #include "blackconfig/buildconfig.h" #include diff --git a/src/blackmisc/db/updateinfo.h b/src/blackmisc/db/updateinfo.h index 54adfeb25..ee1139969 100644 --- a/src/blackmisc/db/updateinfo.h +++ b/src/blackmisc/db/updateinfo.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_DB_UPDATEINFO_H #define BLACKMISC_DB_UPDATEINFO_H -#include "artifactlist.h" -#include "distributionlist.h" +#include "blackmisc/db/artifactlist.h" +#include "blackmisc/db/distributionlist.h" #include "blackmisc/datacache.h" #include "blackmisc/valueobject.h" #include diff --git a/src/blackmisc/geo/coordinategeodeticlist.cpp b/src/blackmisc/geo/coordinategeodeticlist.cpp index 25a1d16e1..bb8da60ea 100644 --- a/src/blackmisc/geo/coordinategeodeticlist.cpp +++ b/src/blackmisc/geo/coordinategeodeticlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "coordinategeodeticlist.h" +#include "blackmisc/geo/coordinategeodeticlist.h" #include "math/mathutils.h" #include diff --git a/src/blackmisc/geo/coordinategeodeticlist.h b/src/blackmisc/geo/coordinategeodeticlist.h index 9923592f3..3e3d25ed5 100644 --- a/src/blackmisc/geo/coordinategeodeticlist.h +++ b/src/blackmisc/geo/coordinategeodeticlist.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_GEO_COORDINATEGEODETICLIST_H #define BLACKMISC_GEO_COORDINATEGEODETICLIST_H -#include "elevationplane.h" -#include "coordinategeodetic.h" -#include "geoobjectlist.h" +#include "blackmisc/geo/elevationplane.h" +#include "blackmisc/geo/coordinategeodetic.h" +#include "blackmisc/geo/geoobjectlist.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/geo/elevationplane.cpp b/src/blackmisc/geo/elevationplane.cpp index f5640f0f0..865e1ced9 100644 --- a/src/blackmisc/geo/elevationplane.cpp +++ b/src/blackmisc/geo/elevationplane.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "elevationplane.h" -#include "coordinategeodetic.h" +#include "blackmisc/geo/elevationplane.h" +#include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/pq/length.h" #include "blackmisc/propertyindexref.h" diff --git a/src/blackmisc/geo/kmlutils.cpp b/src/blackmisc/geo/kmlutils.cpp index ffb1fd574..932c8ca3a 100644 --- a/src/blackmisc/geo/kmlutils.cpp +++ b/src/blackmisc/geo/kmlutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "kmlutils.h" +#include "blackmisc/geo/kmlutils.h" #include using namespace BlackMisc; diff --git a/src/blackmisc/geo/registermetadatageo.cpp b/src/blackmisc/geo/registermetadatageo.cpp index fd5794f9a..f9335246d 100644 --- a/src/blackmisc/geo/registermetadatageo.cpp +++ b/src/blackmisc/geo/registermetadatageo.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatageo.h" -#include "geo.h" +#include "blackmisc/geo/registermetadatageo.h" +#include "blackmisc/geo/geo.h" #include "blackmisc/variant.h" namespace BlackMisc diff --git a/src/blackmisc/input/actionhotkeydefs.cpp b/src/blackmisc/input/actionhotkeydefs.cpp index be3342104..1d996c04f 100644 --- a/src/blackmisc/input/actionhotkeydefs.cpp +++ b/src/blackmisc/input/actionhotkeydefs.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "actionhotkeydefs.h" +#include "blackmisc/input/actionhotkeydefs.h" namespace BlackMisc::Input { diff --git a/src/blackmisc/input/actionhotkeylist.cpp b/src/blackmisc/input/actionhotkeylist.cpp index 1ab13eb74..6e76a4a01 100644 --- a/src/blackmisc/input/actionhotkeylist.cpp +++ b/src/blackmisc/input/actionhotkeylist.cpp @@ -6,8 +6,6 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "actionhotkeylist.h" - #include "blackmisc/input/actionhotkeylist.h" #include "blackmisc/input/hotkeycombination.h" diff --git a/src/blackmisc/input/registermetadatainput.cpp b/src/blackmisc/input/registermetadatainput.cpp index 95e39caac..93f24cd16 100644 --- a/src/blackmisc/input/registermetadatainput.cpp +++ b/src/blackmisc/input/registermetadatainput.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatainput.h" -#include "input.h" +#include "blackmisc/input/registermetadatainput.h" +#include "blackmisc/input/input.h" #include "blackmisc/variant.h" #include diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index 04804c820..eccc2f3c4 100644 --- a/src/blackmisc/network/client.h +++ b/src/blackmisc/network/client.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_NETWORK_CLIENT_H #define BLACKMISC_NETWORK_CLIENT_H -#include "user.h" -#include "voicecapabilities.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/voicecapabilities.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/network/clientlist.cpp b/src/blackmisc/network/clientlist.cpp index cfc3330cc..dcb074a2d 100644 --- a/src/blackmisc/network/clientlist.cpp +++ b/src/blackmisc/network/clientlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientlist.h" +#include "blackmisc/network/clientlist.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/network/clientprovider.cpp b/src/blackmisc/network/clientprovider.cpp index 3931910bc..1d384f90d 100644 --- a/src/blackmisc/network/clientprovider.cpp +++ b/src/blackmisc/network/clientprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "clientprovider.h" +#include "blackmisc/network/clientprovider.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/network/clientprovider.h b/src/blackmisc/network/clientprovider.h index 0766dc49c..103428e4e 100644 --- a/src/blackmisc/network/clientprovider.h +++ b/src/blackmisc/network/clientprovider.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_CLIENTPROVIDER_H #define BLACKMISC_NETWORK_CLIENTPROVIDER_H -#include "clientlist.h" +#include "blackmisc/network/clientlist.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/provider.h" #include diff --git a/src/blackmisc/network/ecosystemlist.cpp b/src/blackmisc/network/ecosystemlist.cpp index 1dd197c38..59de6df5c 100644 --- a/src/blackmisc/network/ecosystemlist.cpp +++ b/src/blackmisc/network/ecosystemlist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "ecosystemlist.h" +#include "blackmisc/network/ecosystemlist.h" namespace BlackMisc::Network { diff --git a/src/blackmisc/network/ecosystemlist.h b/src/blackmisc/network/ecosystemlist.h index 9ec937be8..25428114f 100644 --- a/src/blackmisc/network/ecosystemlist.h +++ b/src/blackmisc/network/ecosystemlist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_ECOSYSTEMLIST_H #define BLACKMISC_NETWORK_ECOSYSTEMLIST_H -#include "ecosystem.h" +#include "blackmisc/network/ecosystem.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/network/ecosystemprovider.cpp b/src/blackmisc/network/ecosystemprovider.cpp index 899a0f2ba..e18346e3a 100644 --- a/src/blackmisc/network/ecosystemprovider.cpp +++ b/src/blackmisc/network/ecosystemprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "ecosystemprovider.h" +#include "blackmisc/network/ecosystemprovider.h" #include namespace BlackMisc::Network diff --git a/src/blackmisc/network/ecosystemprovider.h b/src/blackmisc/network/ecosystemprovider.h index 6cc4698f0..f1e42d303 100644 --- a/src/blackmisc/network/ecosystemprovider.h +++ b/src/blackmisc/network/ecosystemprovider.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_ECOSYSTEMPROVIDER_H #define BLACKMISC_NETWORK_ECOSYSTEMPROVIDER_H -#include "ecosystem.h" +#include "blackmisc/network/ecosystem.h" #include "blackmisc/provider.h" #include diff --git a/src/blackmisc/network/external/qjsonwebtoken.cpp b/src/blackmisc/network/external/qjsonwebtoken.cpp index 29ae0682a..40b549dd9 100644 --- a/src/blackmisc/network/external/qjsonwebtoken.cpp +++ b/src/blackmisc/network/external/qjsonwebtoken.cpp @@ -4,7 +4,7 @@ // The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#include "qjsonwebtoken.h" +#include "blackmisc/network/external/qjsonwebtoken.h" #include diff --git a/src/blackmisc/network/rawfsdmessagelist.cpp b/src/blackmisc/network/rawfsdmessagelist.cpp index 3894725c9..4f2d6242f 100644 --- a/src/blackmisc/network/rawfsdmessagelist.cpp +++ b/src/blackmisc/network/rawfsdmessagelist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "rawfsdmessagelist.h" +#include "blackmisc/network/rawfsdmessagelist.h" namespace BlackMisc::Network { diff --git a/src/blackmisc/network/rawfsdmessagelist.h b/src/blackmisc/network/rawfsdmessagelist.h index 8b23a1e2a..2ffe9cac7 100644 --- a/src/blackmisc/network/rawfsdmessagelist.h +++ b/src/blackmisc/network/rawfsdmessagelist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_RAWFSDMESSAGELIST_H #define BLACKMISC_NETWORK_RAWFSDMESSAGELIST_H -#include "rawfsdmessage.h" +#include "blackmisc/network/rawfsdmessage.h" #include "blackmisc/timestampobjectlist.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/network/registermetadatanetwork.cpp b/src/blackmisc/network/registermetadatanetwork.cpp index 8dc714a15..4cedcd293 100644 --- a/src/blackmisc/network/registermetadatanetwork.cpp +++ b/src/blackmisc/network/registermetadatanetwork.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatanetwork.h" -#include "network.h" +#include "blackmisc/network/registermetadatanetwork.h" +#include "blackmisc/network/network.h" #include "blackmisc/variant.h" namespace BlackMisc diff --git a/src/blackmisc/network/remotefile.cpp b/src/blackmisc/network/remotefile.cpp index a95c65e1b..7c07f35c8 100644 --- a/src/blackmisc/network/remotefile.cpp +++ b/src/blackmisc/network/remotefile.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "remotefile.h" +#include "blackmisc/network/remotefile.h" #include "blackmisc/stringutils.h" #include #include diff --git a/src/blackmisc/network/remotefile.h b/src/blackmisc/network/remotefile.h index 77ecb42ec..cc84ce0db 100644 --- a/src/blackmisc/network/remotefile.h +++ b/src/blackmisc/network/remotefile.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_REMOTEFILE_H #define BLACKMISC_NETWORK_REMOTEFILE_H -#include "url.h" +#include "blackmisc/network/url.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/timestampbased.h" #include "blackmisc/metaclass.h" diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index c7bdb8bfc..f0f7eeef5 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_NETWORK_SERVER_H #define BLACKMISC_NETWORK_SERVER_H -#include "user.h" -#include "fsdsetup.h" -#include "ecosystem.h" +#include "blackmisc/network/user.h" +#include "blackmisc/network/fsdsetup.h" +#include "blackmisc/network/ecosystem.h" #include "blackmisc/audio/voicesetup.h" #include "blackmisc/obfuscation.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index 4828c91cf..9301ea1fa 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_SERVERLIST_H #define BLACKMISC_NETWORK_SERVERLIST_H -#include "server.h" +#include "blackmisc/network/server.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/network/settings/networksettings.cpp b/src/blackmisc/network/settings/networksettings.cpp index c68e71a43..d27b3a104 100644 --- a/src/blackmisc/network/settings/networksettings.cpp +++ b/src/blackmisc/network/settings/networksettings.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "networksettings.h" +#include "blackmisc/network/settings/networksettings.h" #include "blackmisc/stringutils.h" #include diff --git a/src/blackmisc/network/urllog.h b/src/blackmisc/network/urllog.h index 1a5a28aee..07b181439 100644 --- a/src/blackmisc/network/urllog.h +++ b/src/blackmisc/network/urllog.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_NETWORK_URLLOG_H #define BLACKMISC_NETWORK_URLLOG_H -#include "url.h" +#include "blackmisc/network/url.h" #include "blackmisc/timestampbased.h" #include "blackmisc/valueobject.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/pq/registermetadatapq.cpp b/src/blackmisc/pq/registermetadatapq.cpp index 98b0bd4de..2b199709f 100644 --- a/src/blackmisc/pq/registermetadatapq.cpp +++ b/src/blackmisc/pq/registermetadatapq.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatapq.h" +#include "blackmisc/pq/registermetadatapq.h" #include "blackmisc/pq/acceleration.h" #include "blackmisc/pq/angle.h" #include "blackmisc/pq/frequency.h" diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index e32333572..d4e69e5d7 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingutils.h" -#include "aircraftmodel.h" +#include "blackmisc/simulation/matchingutils.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/db/datastoreutility.h" #include "blackmisc/comparefunctions.h" #include "blackmisc/fileutils.h" diff --git a/src/blackmisc/simulation/aircraftmodelsetprovider.cpp b/src/blackmisc/simulation/aircraftmodelsetprovider.cpp index ce6d33ae9..96d2d47f7 100644 --- a/src/blackmisc/simulation/aircraftmodelsetprovider.cpp +++ b/src/blackmisc/simulation/aircraftmodelsetprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "aircraftmodelsetprovider.h" +#include "blackmisc/simulation/aircraftmodelsetprovider.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/autopublishdata.cpp b/src/blackmisc/simulation/autopublishdata.cpp index 2b7594539..1bd9509eb 100644 --- a/src/blackmisc/simulation/autopublishdata.cpp +++ b/src/blackmisc/simulation/autopublishdata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "autopublishdata.h" +#include "blackmisc/simulation/autopublishdata.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/fileutils.h" #include "blackmisc/json.h" diff --git a/src/blackmisc/simulation/backgroundvalidation.cpp b/src/blackmisc/simulation/backgroundvalidation.cpp index dd8b28223..29e671c7b 100644 --- a/src/blackmisc/simulation/backgroundvalidation.cpp +++ b/src/blackmisc/simulation/backgroundvalidation.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "backgroundvalidation.h" +#include "blackmisc/simulation/backgroundvalidation.h" #include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/threadutils.h" diff --git a/src/blackmisc/simulation/categorymatcher.cpp b/src/blackmisc/simulation/categorymatcher.cpp index cca786099..bc015f075 100644 --- a/src/blackmisc/simulation/categorymatcher.cpp +++ b/src/blackmisc/simulation/categorymatcher.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "categorymatcher.h" -#include "simulatedaircraft.h" -#include "aircraftmatchersetup.h" -#include "matchingutils.h" +#include "blackmisc/simulation/categorymatcher.h" +#include "blackmisc/simulation/simulatedaircraft.h" +#include "blackmisc/simulation/aircraftmatchersetup.h" +#include "blackmisc/simulation/matchingutils.h" #include "blackmisc/statusmessagelist.h" #include diff --git a/src/blackmisc/simulation/categorymatcher.h b/src/blackmisc/simulation/categorymatcher.h index e15276930..7f422efe5 100644 --- a/src/blackmisc/simulation/categorymatcher.h +++ b/src/blackmisc/simulation/categorymatcher.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_CATEGORYMATCHER_H #define BLACKMISC_SIMULATION_CATEGORYMATCHER_H -#include "aircraftmodellist.h" +#include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/aviation/aircraftcategorylist.h" #include "blackmisc/blackmiscexport.h" diff --git a/src/blackmisc/simulation/distributorlist.cpp b/src/blackmisc/simulation/distributorlist.cpp index ee30496e6..38c1adf42 100644 --- a/src/blackmisc/simulation/distributorlist.cpp +++ b/src/blackmisc/simulation/distributorlist.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "distributorlist.h" -#include "simulatorinfo.h" -#include "aircraftmodel.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/simulation/simulatorinfo.h" +#include "blackmisc/simulation/aircraftmodel.h" #include diff --git a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp index 7804f4c83..889dbc3fc 100644 --- a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp +++ b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "aircraftmodelloaderflightgear.h" +#include "blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h" #include "blackmisc/simulation/aircraftmodel.h" #include namespace BlackMisc::Simulation::Flightgear diff --git a/src/blackmisc/simulation/flightgear/flightgearutil.cpp b/src/blackmisc/simulation/flightgear/flightgearutil.cpp index 4320e5775..539b3cb51 100644 --- a/src/blackmisc/simulation/flightgear/flightgearutil.cpp +++ b/src/blackmisc/simulation/flightgear/flightgearutil.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "flightgearutil.h" +#include "blackmisc/simulation/flightgear/flightgearutil.h" #include "blackmisc/fileutils.h" #include "blackmisc/directoryutils.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp index 4363437f1..958f82488 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp @@ -9,7 +9,7 @@ #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h" #include "blackmisc/statusmessagelist.h" -#include "stringutils.h" +#include "blackmisc/stringutils.h" #include "blackmisc/predicates.h" #include "blackmisc/range.h" #include "blackmisc/setbuilder.h" diff --git a/src/blackmisc/simulation/interpolant.h b/src/blackmisc/simulation/interpolant.h index b4ecb241c..4e22929dd 100644 --- a/src/blackmisc/simulation/interpolant.h +++ b/src/blackmisc/simulation/interpolant.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLANT_H #define BLACKMISC_SIMULATION_INTERPOLANT_H -#include "interpolatorpbh.h" +#include "blackmisc/simulation/interpolatorpbh.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index 4b9e860fe..0b3f511cc 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolationlogger.h" +#include "blackmisc/simulation/interpolationlogger.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/heading.h" #include "blackmisc/geo/kmlutils.h" diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index 9cf8195d7..e57972722 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolationlogger.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H #define BLACKMISC_SIMULATION_INTERPOLATIONLOGGER_H -#include "interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolationrenderingsetup.h" #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/aircraftpartslist.h" diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolationrenderingsetup.cpp index 29167b417..db79abf12 100644 --- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp +++ b/src/blackmisc/simulation/interpolationrenderingsetup.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolationrenderingsetup.h" #include "blackmisc/network/client.h" #include "blackmisc/stringutils.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/simulation/interpolationsetuplist.cpp b/src/blackmisc/simulation/interpolationsetuplist.cpp index 0422ebb8f..ed023afa8 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.cpp +++ b/src/blackmisc/simulation/interpolationsetuplist.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolationsetuplist.h" +#include "blackmisc/simulation/interpolationsetuplist.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/interpolationsetuplist.h b/src/blackmisc/simulation/interpolationsetuplist.h index 8088c5965..45deca06f 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.h +++ b/src/blackmisc/simulation/interpolationsetuplist.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H #define BLACKMISC_SIMULATION_INTERPOLATIONSETUPLIST_H -#include "interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolationrenderingsetup.h" #include "blackmisc/aviation/callsignobjectlist.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/collection.h" diff --git a/src/blackmisc/simulation/interpolationsetupprovider.cpp b/src/blackmisc/simulation/interpolationsetupprovider.cpp index b0b6ed474..2ca05d808 100644 --- a/src/blackmisc/simulation/interpolationsetupprovider.cpp +++ b/src/blackmisc/simulation/interpolationsetupprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolationsetupprovider.h" +#include "blackmisc/simulation/interpolationsetupprovider.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/interpolationsetupprovider.h b/src/blackmisc/simulation/interpolationsetupprovider.h index ed62fccb2..4f444e01c 100644 --- a/src/blackmisc/simulation/interpolationsetupprovider.h +++ b/src/blackmisc/simulation/interpolationsetupprovider.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H #define BLACKMISC_SIMULATION_INTERPOLATIONSETUPPROVIDER_H -#include "interpolationsetuplist.h" -#include "interpolationrenderingsetup.h" -#include "interpolationsetuplist.h" +#include "blackmisc/simulation/interpolationsetuplist.h" +#include "blackmisc/simulation/interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolationsetuplist.h" #include "blackmisc/aviation/callsignset.h" #include "blackmisc/provider.h" #include diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index 4fae31974..792c5f5f4 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolator.h" +#include "blackmisc/simulation/interpolator.h" #include "blackconfig/buildconfig.h" #include "blackmisc/simulation/interpolationlogger.h" #include "blackmisc/simulation/interpolatorlinear.h" diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index bd23449c1..cc2dbe84a 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATOR_H #define BLACKMISC_SIMULATION_INTERPOLATOR_H -#include "interpolationrenderingsetup.h" +#include "blackmisc/simulation/interpolationrenderingsetup.h" #include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/simulation/interpolationsetupprovider.h" #include "blackmisc/simulation/simulationenvironmentprovider.h" diff --git a/src/blackmisc/simulation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolatorlinear.cpp index 8a73b271e..0f316a18d 100644 --- a/src/blackmisc/simulation/interpolatorlinear.cpp +++ b/src/blackmisc/simulation/interpolatorlinear.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolatorlinear.h" -#include "interpolatorfunctions.h" +#include "blackmisc/simulation/interpolatorlinear.h" +#include "blackmisc/simulation/interpolatorfunctions.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/aviation/altitude.h" #include "blackmisc/geo/coordinategeodetic.h" diff --git a/src/blackmisc/simulation/interpolatorlinear.h b/src/blackmisc/simulation/interpolatorlinear.h index ce939ec06..ee3b76e20 100644 --- a/src/blackmisc/simulation/interpolatorlinear.h +++ b/src/blackmisc/simulation/interpolatorlinear.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H #define BLACKMISC_SIMULATION_INTERPOLATORLINEAR_H -#include "interpolator.h" -#include "interpolationlogger.h" -#include "interpolant.h" +#include "blackmisc/simulation/interpolator.h" +#include "blackmisc/simulation/interpolationlogger.h" +#include "blackmisc/simulation/interpolant.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscexport.h" #include diff --git a/src/blackmisc/simulation/interpolatorpbh.cpp b/src/blackmisc/simulation/interpolatorpbh.cpp index 4f881133e..ee08122ef 100644 --- a/src/blackmisc/simulation/interpolatorpbh.cpp +++ b/src/blackmisc/simulation/interpolatorpbh.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolatorpbh.h" -#include "interpolatorfunctions.h" +#include "blackmisc/simulation/interpolatorpbh.h" +#include "blackmisc/simulation/interpolatorfunctions.h" #include "blackmisc/verify.h" #include "blackconfig/buildconfig.h" diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp index 657a9a3f0..2fd53a2bb 100644 --- a/src/blackmisc/simulation/interpolatorspline.cpp +++ b/src/blackmisc/simulation/interpolatorspline.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "interpolatorspline.h" -#include "interpolatorfunctions.h" +#include "blackmisc/simulation/interpolatorspline.h" +#include "blackmisc/simulation/interpolatorfunctions.h" #include "blackmisc/network/fsdsetup.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" diff --git a/src/blackmisc/simulation/interpolatorspline.h b/src/blackmisc/simulation/interpolatorspline.h index 16f3de852..f6a090a3c 100644 --- a/src/blackmisc/simulation/interpolatorspline.h +++ b/src/blackmisc/simulation/interpolatorspline.h @@ -11,9 +11,9 @@ #ifndef BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H #define BLACKMISC_SIMULATION_INTERPOLATORSPLINE_H -#include "interpolator.h" -#include "interpolationlogger.h" -#include "interpolant.h" +#include "blackmisc/simulation/interpolator.h" +#include "blackmisc/simulation/interpolationlogger.h" +#include "blackmisc/simulation/interpolant.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/blackmiscexport.h" #include diff --git a/src/blackmisc/simulation/matchinglog.cpp b/src/blackmisc/simulation/matchinglog.cpp index 395ab2b3f..3aba0e832 100644 --- a/src/blackmisc/simulation/matchinglog.cpp +++ b/src/blackmisc/simulation/matchinglog.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchinglog.h" +#include "blackmisc/simulation/matchinglog.h" #include namespace BlackMisc::Simulation diff --git a/src/blackmisc/simulation/matchingscript.cpp b/src/blackmisc/simulation/matchingscript.cpp index c4795635b..b00ecf702 100644 --- a/src/blackmisc/simulation/matchingscript.cpp +++ b/src/blackmisc/simulation/matchingscript.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingscript.h" +#include "blackmisc/simulation/matchingscript.h" #include "stringutils.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/matchingscriptmisc.cpp b/src/blackmisc/simulation/matchingscriptmisc.cpp index 05417c400..66a555caf 100644 --- a/src/blackmisc/simulation/matchingscriptmisc.cpp +++ b/src/blackmisc/simulation/matchingscriptmisc.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingscriptmisc.h" +#include "blackmisc/simulation/matchingscriptmisc.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/matchingstatistics.cpp b/src/blackmisc/simulation/matchingstatistics.cpp index 370f0d31c..55b0586b9 100644 --- a/src/blackmisc/simulation/matchingstatistics.cpp +++ b/src/blackmisc/simulation/matchingstatistics.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingstatistics.h" +#include "blackmisc/simulation/matchingstatistics.h" namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/matchingstatistics.h b/src/blackmisc/simulation/matchingstatistics.h index 44be969ef..6adeb3d96 100644 --- a/src/blackmisc/simulation/matchingstatistics.h +++ b/src/blackmisc/simulation/matchingstatistics.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_MATCHINGSTATISTICS_H #define BLACKMISC_SIMULATION_MATCHINGSTATISTICS_H -#include "matchingstatisticsentry.h" +#include "blackmisc/simulation/matchingstatisticsentry.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/timestampobjectlist.h" #include "blackmisc/sequence.h" diff --git a/src/blackmisc/simulation/matchingstatisticsentry.cpp b/src/blackmisc/simulation/matchingstatisticsentry.cpp index 46e9f36d8..9dad35eff 100644 --- a/src/blackmisc/simulation/matchingstatisticsentry.cpp +++ b/src/blackmisc/simulation/matchingstatisticsentry.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingstatisticsentry.h" +#include "blackmisc/simulation/matchingstatisticsentry.h" #include "blackmisc/comparefunctions.h" namespace BlackMisc::Simulation diff --git a/src/blackmisc/simulation/matchingutils.cpp b/src/blackmisc/simulation/matchingutils.cpp index fafd41060..8e2440f80 100644 --- a/src/blackmisc/simulation/matchingutils.cpp +++ b/src/blackmisc/simulation/matchingutils.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "matchingutils.h" +#include "blackmisc/simulation/matchingutils.h" using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/modelconverterx.cpp b/src/blackmisc/simulation/modelconverterx.cpp index 964924d76..e25b77ce8 100644 --- a/src/blackmisc/simulation/modelconverterx.cpp +++ b/src/blackmisc/simulation/modelconverterx.cpp @@ -6,10 +6,10 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/simulation/modelconverterx.h" #include "blackconfig/buildconfig.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/logmessage.h" -#include "modelconverterx.h" #include #include diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp index 48ce75443..52b832bd5 100644 --- a/src/blackmisc/simulation/registermetadatasimulation.cpp +++ b/src/blackmisc/simulation/registermetadatasimulation.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadatasimulation.h" -#include "simulation.h" +#include "blackmisc/simulation/registermetadatasimulation.h" +#include "blackmisc/simulation/simulation.h" #include "blackmisc/variant.h" using namespace BlackMisc::Simulation; diff --git a/src/blackmisc/simulation/settings/modelsettings.cpp b/src/blackmisc/simulation/settings/modelsettings.cpp index 5f7ccfe42..6bef33544 100644 --- a/src/blackmisc/simulation/settings/modelsettings.cpp +++ b/src/blackmisc/simulation/settings/modelsettings.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "modelsettings.h" +#include "blackmisc/simulation/settings/modelsettings.h" #include "blackmisc/stringutils.h" namespace BlackMisc::Simulation::Settings diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index 8d7661fc3..b5e05760d 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "simulatorsettings.h" +#include "blackmisc/simulation/settings/simulatorsettings.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/fscommon/fsdirectories.h" #include "blackmisc/simulation/xplane/xplaneutil.h" diff --git a/src/blackmisc/simulation/settings/swiftpluginsettings.cpp b/src/blackmisc/simulation/settings/swiftpluginsettings.cpp index 80d17425e..46738ada9 100644 --- a/src/blackmisc/simulation/settings/swiftpluginsettings.cpp +++ b/src/blackmisc/simulation/settings/swiftpluginsettings.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "swiftpluginsettings.h" +#include "blackmisc/simulation/settings/swiftpluginsettings.h" #include "blackmisc/stringutils.h" namespace BlackMisc::Simulation::Settings diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.cpp b/src/blackmisc/simulation/settings/xswiftbussettings.cpp index 4925ef4d7..8cbde0e20 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettings.cpp +++ b/src/blackmisc/simulation/settings/xswiftbussettings.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "xswiftbussettings.h" -#include "xswiftbussettingsqtfree.inc" +#include "blackmisc/simulation/settings/xswiftbussettings.h" +#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.inc" namespace BlackMisc::Simulation::Settings { diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.h b/src/blackmisc/simulation/settings/xswiftbussettings.h index 0cd90e49c..79cb60e27 100644 --- a/src/blackmisc/simulation/settings/xswiftbussettings.h +++ b/src/blackmisc/simulation/settings/xswiftbussettings.h @@ -11,7 +11,7 @@ #ifndef BLACKMISC_SIMULATION_SETTINGS_XSWIFTBUSSETTINGS_H #define BLACKMISC_SIMULATION_SETTINGS_XSWIFTBUSSETTINGS_H -#include "xswiftbussettingsqtfree.h" +#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.h" #include "blackmisc/statusmessagelist.h" #include "blackmisc/settingscache.h" #include "blackmisc/dbusserver.h" diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.cpp b/src/blackmisc/simulation/simulationenvironmentprovider.cpp index 3ad22020d..232a6070f 100644 --- a/src/blackmisc/simulation/simulationenvironmentprovider.cpp +++ b/src/blackmisc/simulation/simulationenvironmentprovider.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "simulationenvironmentprovider.h" +#include "blackmisc/simulation/simulationenvironmentprovider.h" #include "blackmisc/aviation/aircraftsituationchange.h" #include "blackmisc/logmessage.h" diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.h b/src/blackmisc/simulation/simulationenvironmentprovider.h index 4e4f2446c..e87715b9d 100644 --- a/src/blackmisc/simulation/simulationenvironmentprovider.h +++ b/src/blackmisc/simulation/simulationenvironmentprovider.h @@ -11,8 +11,8 @@ #ifndef BLACKMISC_SIMULATION_SIMULATIONENVIRONMENTPROVIDER_H #define BLACKMISC_SIMULATION_SIMULATIONENVIRONMENTPROVIDER_H -#include "simulatorplugininfo.h" -#include "aircraftmodel.h" +#include "blackmisc/simulation/simulatorplugininfo.h" +#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/settings/simulatorsettings.h" #include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/percallsign.h" diff --git a/src/blackmisc/simulation/xplane/xplaneutil.cpp b/src/blackmisc/simulation/xplane/xplaneutil.cpp index c2db4396a..5b1e7cc97 100644 --- a/src/blackmisc/simulation/xplane/xplaneutil.cpp +++ b/src/blackmisc/simulation/xplane/xplaneutil.cpp @@ -10,7 +10,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" -#include "qsystemdetection.h" +#include #include #include #include diff --git a/src/blackmisc/test/testdata.cpp b/src/blackmisc/test/testdata.cpp index 9d0b7e880..c16fb7a89 100644 --- a/src/blackmisc/test/testdata.cpp +++ b/src/blackmisc/test/testdata.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "testdata.h" +#include "blackmisc/test/testdata.h" #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/flightplan.h" diff --git a/src/blackmisc/test/testing.cpp b/src/blackmisc/test/testing.cpp index 14c3d28eb..3271f07a3 100644 --- a/src/blackmisc/test/testing.cpp +++ b/src/blackmisc/test/testing.cpp @@ -6,6 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ +#include "blackmisc/test/testing.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/iterator.h" @@ -17,7 +18,6 @@ #include "blackmisc/propertyindexvariantmap.h" #include "blackmisc/sequence.h" #include "blackmisc/variant.h" -#include "testing.h" #include #include diff --git a/src/blackmisc/test/testservice.cpp b/src/blackmisc/test/testservice.cpp index f0c71794b..421978113 100644 --- a/src/blackmisc/test/testservice.cpp +++ b/src/blackmisc/test/testservice.cpp @@ -6,8 +6,8 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "testservice.h" -#include "testing.h" +#include "blackmisc/test/testservice.h" +#include "blackmisc/test/testing.h" #include "blackmisc/dbusutils.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/comsystem.h" diff --git a/src/blackmisc/test/testserviceinterface.cpp b/src/blackmisc/test/testserviceinterface.cpp index 70ebb9fea..de1270343 100644 --- a/src/blackmisc/test/testserviceinterface.cpp +++ b/src/blackmisc/test/testserviceinterface.cpp @@ -6,9 +6,9 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "testserviceinterface.h" -#include "testservice.h" -#include "testing.h" +#include "blackmisc/test/testserviceinterface.h" +#include "blackmisc/test/testservice.h" +#include "blackmisc/test/testing.h" #include "blackmisc/test/testdata.h" #include "blackmisc/aviation/flightplan.h" #include diff --git a/src/blackmisc/weather/presentweatherlist.h b/src/blackmisc/weather/presentweatherlist.h index b531528a0..8e256f1e6 100644 --- a/src/blackmisc/weather/presentweatherlist.h +++ b/src/blackmisc/weather/presentweatherlist.h @@ -14,7 +14,6 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" #include "blackmisc/weather/presentweather.h" -#include "presentweather.h" #include diff --git a/src/blackmisc/weather/registermetadataweather.cpp b/src/blackmisc/weather/registermetadataweather.cpp index f1fbbe225..ac517ab68 100644 --- a/src/blackmisc/weather/registermetadataweather.cpp +++ b/src/blackmisc/weather/registermetadataweather.cpp @@ -6,7 +6,7 @@ * or distributed except according to the terms contained in the LICENSE file. */ -#include "registermetadataweather.h" +#include "blackmisc/weather/registermetadataweather.h" #include "blackmisc/valueobject.h" #include "blackmisc/weather/weather.h" #include "blackmisc/variant.h" diff --git a/src/blackmisc/weather/temperaturelayerlist.h b/src/blackmisc/weather/temperaturelayerlist.h index a28d00b6d..acf2c288f 100644 --- a/src/blackmisc/weather/temperaturelayerlist.h +++ b/src/blackmisc/weather/temperaturelayerlist.h @@ -14,7 +14,6 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/sequence.h" #include "blackmisc/weather/temperaturelayer.h" -#include "temperaturelayer.h" #include #include