From 0db0c166689faac724506c02bc0d29f8ac06cc3a Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 10 Nov 2024 13:04:11 +0100 Subject: [PATCH] refactor: Rename BlackConfig to swift::config --- CMakeLists.txt | 8 +-- samples/afvclient/CMakeLists.txt | 2 +- samples/afvclient/afvclientbridge.h | 2 +- samples/afvclient/main.cpp | 4 +- src/CMakeLists.txt | 2 +- src/blackconfig/buildconfig_gen.inc.in | 65 ------------------- src/blackcore/CMakeLists.txt | 2 +- .../afv/audio/callsignsampleprovider.cpp | 4 +- .../afv/audio/soundcardsampleprovider.cpp | 4 +- .../afv/connection/apiserverconnection.cpp | 4 +- .../afv/connection/clientconnection.cpp | 4 +- src/blackcore/airspacemonitor.cpp | 4 +- src/blackcore/application.cpp | 4 +- .../application/applicationsettings.h | 2 +- src/blackcore/application/updatesettings.h | 2 +- src/blackcore/context/contextaudio.cpp | 4 +- src/blackcore/context/contextnetwork.cpp | 4 +- src/blackcore/context/contextnetworkimpl.cpp | 4 +- src/blackcore/context/contextsimulator.cpp | 2 +- src/blackcore/context/contextsimulator.h | 2 +- .../context/contextsimulatorimpl.cpp | 4 +- src/blackcore/data/globalsetup.cpp | 4 +- src/blackcore/data/networksetup.cpp | 4 +- src/blackcore/fsd/clientidentification.h | 6 +- src/blackcore/fsd/fsdclient.cpp | 4 +- src/blackcore/fsd/serializer.cpp | 4 +- src/blackcore/githubpackagesreader.cpp | 4 +- src/blackcore/setupreader.cpp | 4 +- src/blackcore/simulator.cpp | 2 +- src/blackcore/simulator.h | 2 +- src/blackcore/webdataservices.cpp | 4 +- .../components/configsimulatorcomponent.cpp | 4 +- src/blackgui/components/dblogincomponent.cpp | 4 +- .../components/dbownmodelscomponent.cpp | 4 +- .../components/dbquickmappingwizard.cpp | 4 +- .../components/dbusserveraddressselector.cpp | 4 +- src/blackgui/components/downloadcomponent.cpp | 4 +- .../components/firstmodelsetcomponent.cpp | 4 +- .../components/flightplancomponent.cpp | 4 +- .../components/infobarstatuscomponent.cpp | 4 +- .../components/installxswiftbuscomponent.cpp | 4 +- .../components/internalscomponent.cpp | 4 +- .../components/legalinfocomponent.cpp | 4 +- src/blackgui/components/logincomponent.cpp | 4 +- .../components/ownaircraftcomponent.cpp | 4 +- src/blackgui/components/settingscomponent.cpp | 4 +- .../settingsnetworkserverscomponent.cpp | 4 +- .../settingssimulatorbasicscomponent.cpp | 4 +- src/blackgui/components/simulatorselector.cpp | 4 +- .../components/updateinfocomponent.cpp | 4 +- src/blackgui/copyxswiftbusdialog.cpp | 4 +- src/blackgui/editors/pilotform.cpp | 4 +- src/blackgui/guiapplication.cpp | 4 +- src/blackgui/loginmodebuttons.cpp | 4 +- src/blackgui/menus/aircraftmodelmenus.cpp | 4 +- src/blackgui/stylesheetutility.cpp | 4 +- .../views/aircraftcategorytreeview.cpp | 2 +- src/blackgui/views/atcstationtreeview.cpp | 2 +- src/blackgui/views/atcstationview.cpp | 4 +- src/blackgui/views/simulatedaircraftview.cpp | 4 +- src/blackgui/views/viewbase.cpp | 2 +- src/blackgui/views/viewbasenontemplate.cpp | 4 +- src/blackmisc/CMakeLists.txt | 2 +- src/blackmisc/applicationinfo.cpp | 4 +- src/blackmisc/applicationinfolist.cpp | 4 +- src/blackmisc/audio/audioutils.cpp | 4 +- src/blackmisc/aviation/aircraftsituation.cpp | 4 +- .../aviation/aircraftsituationchange.cpp | 4 +- src/blackmisc/compressutils.cpp | 4 +- src/blackmisc/crashhandler.cpp | 4 +- src/blackmisc/db/artifact.cpp | 4 +- src/blackmisc/db/datastore.h | 2 +- src/blackmisc/db/distribution.cpp | 2 +- src/blackmisc/db/distribution.h | 2 +- src/blackmisc/db/updateinfo.cpp | 4 +- src/blackmisc/directoryutils.cpp | 4 +- src/blackmisc/filelogger.cpp | 4 +- src/blackmisc/fileutils.cpp | 4 +- src/blackmisc/loghandler.cpp | 4 +- src/blackmisc/network/networkutils.cpp | 4 +- src/blackmisc/network/ping.cpp | 4 +- src/blackmisc/platform.cpp | 4 +- src/blackmisc/simulation/aircraftmodel.cpp | 4 +- .../simulation/aircraftmodellist.cpp | 4 +- .../simulation/flightgear/flightgearutil.cpp | 4 +- .../simulation/fscommon/aircraftcfgparser.cpp | 4 +- .../simulation/fscommon/fscommonutil.cpp | 4 +- .../simulation/fscommon/fsdirectories.cpp | 4 +- .../interpolation/interpolationlogger.cpp | 4 +- .../interpolationrenderingsetup.cpp | 4 +- .../simulation/interpolation/interpolator.cpp | 4 +- .../interpolation/interpolatorlinear.cpp | 4 +- .../interpolation/interpolatorlinearpbh.cpp | 4 +- .../interpolation/interpolatorspline.cpp | 4 +- src/blackmisc/simulation/modelconverterx.cpp | 4 +- .../simulation/remoteaircraftprovider.cpp | 4 +- .../simulation/settings/simulatorsettings.cpp | 4 +- .../simulationenvironmentprovider.cpp | 4 +- src/blackmisc/simulation/simulatorinfo.cpp | 4 +- .../simulation/simulatorplugininfo.cpp | 4 +- .../xplane/aircraftmodelloaderxplane.cpp | 4 +- src/blackmisc/swiftdirectories.cpp | 4 +- src/blackmisc/timestampobjectlist.h | 8 +-- src/blacksound/CMakeLists.txt | 2 +- src/blacksound/audioutilities.cpp | 4 +- src/blacksound/dsp/biquadfilter.cpp | 4 +- .../sampleprovider/sampleprovider.h | 4 +- src/{blackconfig => config}/CMakeLists.txt | 8 +-- src/{blackconfig => config}/buildconfig.cpp | 16 ++--- src/{blackconfig => config}/buildconfig.h | 14 ++-- src/{blackconfig => config}/buildconfig.inc | 2 +- .../buildconfig_gen.cpp.in | 12 ++-- src/config/buildconfig_gen.inc.in | 65 +++++++++++++++++++ .../simulatoremulatedmonitordialog.cpp | 2 +- .../flightgear/simulatorflightgear.cpp | 4 +- src/plugins/simulator/fs9/CMakeLists.txt | 2 +- src/plugins/simulator/fs9/simulatorfs9.cpp | 4 +- .../simulator/fsxcommon/CMakeLists.txt | 2 +- .../fsxcommon/fsxsettingscomponent.cpp | 4 +- .../simulator/fsxcommon/simconnectobject.cpp | 4 +- .../fsxcommon/simconnectsettingscomponent.cpp | 4 +- .../fsxcommon/simulatorfsxcommon.cpp | 4 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 6 +- .../fsxcommon/simulatorfsxsimconnectproc.cpp | 4 +- src/plugins/simulator/p3d/simulatorp3d.cpp | 4 +- .../simulator/xplane/simulatorxplane.cpp | 4 +- src/swiftdata/swiftdata.cpp | 4 +- src/swiftguistandard/swiftguistd.cpp | 4 +- src/swiftguistandard/swiftguistdinit.cpp | 4 +- src/swiftguistandard/swiftguistdmenus.cpp | 4 +- src/swiftlauncher/swiftlauncher.cpp | 4 +- tests/blackcore/fsd/CMakeLists.txt | 2 +- .../fsd/testfsdclient/testfsdclient.cpp | 4 +- .../fsd/testfsdmessages/testfsdmessages.cpp | 4 +- tests/blackmisc/CMakeLists.txt | 2 +- .../testaircraftsituation.cpp | 4 +- tests/blackmisc/testcompress/testcompress.cpp | 4 +- 137 files changed, 334 insertions(+), 334 deletions(-) delete mode 100644 src/blackconfig/buildconfig_gen.inc.in rename src/{blackconfig => config}/CMakeLists.txt (74%) rename src/{blackconfig => config}/buildconfig.cpp (91%) rename src/{blackconfig => config}/buildconfig.h (92%) rename src/{blackconfig => config}/buildconfig.inc (98%) rename src/{blackconfig => config}/buildconfig_gen.cpp.in (63%) create mode 100644 src/config/buildconfig_gen.inc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 8268c0aaa..e4014c0bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,10 @@ option(SWIFT_BUILD_EMULATED_PLUGIN "Build Emulated plugin" ON) cmake_dependent_option(SWIFT_BUILD_MSFS_PLUGIN "Build MSFS plugin" ON WIN32 OFF) option(SWIFT_MINIFY_DEBUG_SYMBOLS "Minify debug symbols" OFF) -option(SWIFT_BUILD_BLACKCORE "Build Blackcore" ON) -option(SWIFT_BUILD_BLACKSOUND "Build Blacksound" ON) -option(SWIFT_BUILD_BLACKINPUT "Build Blackinput" ON) -option(SWIFT_BUILD_BLACKGUI "Build Blackgui" ON) +option(SWIFT_BUILD_CORE "Build Core" ON) +option(SWIFT_BUILD_SOUND "Build Sound" ON) +option(SWIFT_BUILD_INPUT "Build Input" ON) +option(SWIFT_BUILD_GUI "Build GUI" ON) option(SWIFT_USE_CRASHPAD "Use crashpad" OFF) diff --git a/samples/afvclient/CMakeLists.txt b/samples/afvclient/CMakeLists.txt index 30b092acc..53ea42b51 100644 --- a/samples/afvclient/CMakeLists.txt +++ b/samples/afvclient/CMakeLists.txt @@ -2,5 +2,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 add_executable(samples_afvclient main.cpp afvclientbridge.h afvclientbridge.cpp qml/qml.qrc) -target_link_libraries(samples_afvclient PUBLIC core misc blackconfig Qt::Core Qt::Qml Qt::Gui) +target_link_libraries(samples_afvclient PUBLIC core misc config Qt::Core Qt::Qml Qt::Gui) target_compile_definitions(samples_afvclient PRIVATE _USE_MATH_DEFINES) diff --git a/samples/afvclient/afvclientbridge.h b/samples/afvclient/afvclientbridge.h index d172b2fb0..36a3c3e95 100644 --- a/samples/afvclient/afvclientbridge.h +++ b/samples/afvclient/afvclientbridge.h @@ -48,7 +48,7 @@ public: //! \copydoc BlackCore::Afv::Clients::CAfvClient::connectTo Q_INVOKABLE void connectTo(const QString &cid, const QString &password, const QString &callsign) { - const QString client = "swift " % BlackConfig::CBuildConfig::getShortVersionString(); + const QString client = "swift " % swift::config::CBuildConfig::getShortVersionString(); m_afvClient->connectTo(cid, password, callsign, client); } diff --git a/samples/afvclient/main.cpp b/samples/afvclient/main.cpp index 64a9762e4..88cccda17 100644 --- a/samples/afvclient/main.cpp +++ b/samples/afvclient/main.cpp @@ -10,7 +10,7 @@ #include "blackcore/application.h" #include "blackmisc/network/user.h" #include "blackmisc/obfuscation.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -19,7 +19,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; using namespace BlackCore; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index daaa1674d..b17955a05 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -add_subdirectory(blackconfig) +add_subdirectory(config) add_subdirectory(blackcore) add_subdirectory(blackmisc) add_subdirectory(blackgui) diff --git a/src/blackconfig/buildconfig_gen.inc.in b/src/blackconfig/buildconfig_gen.inc.in deleted file mode 100644 index fb3346a08..000000000 --- a/src/blackconfig/buildconfig_gen.inc.in +++ /dev/null @@ -1,65 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#ifndef IN_BUILDCONFIG_H -#error This file is only to be included by buildconfig.inc -#endif - -#define SWIFTCONFIG_ON true -#define SWIFTCONFIG_OFF false - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithBlackCore() -{ - return SWIFTCONFIG_${SWIFT_BUILD_BLACKCORE}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithBlackSound() -{ - return SWIFTCONFIG_${SWIFT_BUILD_BLACKSOUND}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithBlackInput() -{ - return SWIFTCONFIG_${SWIFT_BUILD_BLACKINPUT}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithFs9Support() -{ - return SWIFTCONFIG_${SWIFT_BUILD_FS9_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithP3DSupport() -{ - return SWIFTCONFIG_${SWIFT_BUILD_P3D_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithFsxSupport() -{ - return SWIFTCONFIG_${SWIFT_BUILD_FSX_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithFsuipcSupport() -{ - return isCompiledWithFsxSupport() || isCompiledWithP3DSupport() || isCompiledWithFs9Support() || SWIFTCONFIG_${SWIFT_BUILD_MSFS_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithXPlaneSupport() -{ - return SWIFTCONFIG_${SWIFT_BUILD_XPLANE_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithFGSupport() -{ - return SWIFTCONFIG_${SWIFT_BUILD_FLIGHTGEAR_PLUGIN}; -} - -constexpr bool BlackConfig::CBuildConfig::isCompiledWithGui() -{ - return SWIFTCONFIG_${SWIFT_BUILD_BLACKGUI}; -} - -constexpr int BlackConfig::CBuildConfig::versionMajor() { return ${SWIFT_VERSION_MAJOR}; } -constexpr int BlackConfig::CBuildConfig::versionMinor() { return ${SWIFT_VERSION_MINOR}; } - -#undef SWIFTCONFIG_ON -#undef SWIFTCONFIG_OFF diff --git a/src/blackcore/CMakeLists.txt b/src/blackcore/CMakeLists.txt index 20a938293..0e27eb7fa 100644 --- a/src/blackcore/CMakeLists.txt +++ b/src/blackcore/CMakeLists.txt @@ -256,7 +256,7 @@ target_link_libraries(core sound externals_sodium msgpack-cxx - blackconfig + config PRIVATE Qt::Qml Qt::Xml diff --git a/src/blackcore/afv/audio/callsignsampleprovider.cpp b/src/blackcore/afv/audio/callsignsampleprovider.cpp index f28f42d22..772c82398 100644 --- a/src/blackcore/afv/audio/callsignsampleprovider.cpp +++ b/src/blackcore/afv/audio/callsignsampleprovider.cpp @@ -9,7 +9,7 @@ #include "blacksound/audioutilities.h" #include "blackmisc/logmessage.h" #include "blackmisc/metadatautils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -18,7 +18,7 @@ using namespace BlackMisc; using namespace BlackSound::SampleProvider; -using namespace BlackConfig; +using namespace swift::config; namespace BlackCore::Afv::Audio { diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.cpp b/src/blackcore/afv/audio/soundcardsampleprovider.cpp index a191be12b..6d04636dd 100644 --- a/src/blackcore/afv/audio/soundcardsampleprovider.cpp +++ b/src/blackcore/afv/audio/soundcardsampleprovider.cpp @@ -3,9 +3,9 @@ #include "blackcore/afv/audio/soundcardsampleprovider.h" #include "blackmisc/metadatautils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackSound::SampleProvider; diff --git a/src/blackcore/afv/connection/apiserverconnection.cpp b/src/blackcore/afv/connection/apiserverconnection.cpp index 41b733cab..55d8efe2b 100644 --- a/src/blackcore/afv/connection/apiserverconnection.cpp +++ b/src/blackcore/afv/connection/apiserverconnection.cpp @@ -7,7 +7,7 @@ #include "qjsonwebtoken/qjsonwebtoken.h" #include "blackmisc/logmessage.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -19,7 +19,7 @@ using namespace BlackMisc; using namespace BlackMisc::Network; -using namespace BlackConfig; +using namespace swift::config; namespace BlackCore::Afv::Connection { diff --git a/src/blackcore/afv/connection/clientconnection.cpp b/src/blackcore/afv/connection/clientconnection.cpp index b59efa1cb..9c161c915 100644 --- a/src/blackcore/afv/connection/clientconnection.cpp +++ b/src/blackcore/afv/connection/clientconnection.cpp @@ -3,11 +3,11 @@ #include "blackcore/afv/connection/clientconnection.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackCore::Afv::Crypto; diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index cae84ea8a..a80ccc12a 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -31,7 +31,7 @@ #include "blackmisc/variant.h" #include "blackmisc/verify.h" #include "blackmisc/worker.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -43,7 +43,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp index 8c3c77f27..4a983e380 100644 --- a/src/blackcore/application.cpp +++ b/src/blackcore/application.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "blackcore/application.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackcore/context/contextnetwork.h" #include "blackcore/context/contextsimulatorimpl.h" #include "blackcore/context/contextaudio.h" @@ -53,7 +53,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Network; diff --git a/src/blackcore/application/applicationsettings.h b/src/blackcore/application/applicationsettings.h index 4555a7858..ff572545f 100644 --- a/src/blackcore/application/applicationsettings.h +++ b/src/blackcore/application/applicationsettings.h @@ -9,7 +9,7 @@ #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/input/actionhotkeylist.h" #include "blackmisc/settingscache.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include diff --git a/src/blackcore/application/updatesettings.h b/src/blackcore/application/updatesettings.h index 4b7dcba8c..fe12f95b5 100644 --- a/src/blackcore/application/updatesettings.h +++ b/src/blackcore/application/updatesettings.h @@ -7,7 +7,7 @@ #define BLACKCORE_APPLICATION_UPDATESETTINGS_H #include "blackcore/application.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/platform.h" #include "blackmisc/settingscache.h" #include diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index d71fa04f1..cd16b2096 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -13,7 +13,7 @@ #include "blackmisc/stringutils.h" #include "blackmisc/verify.h" #include "blackmisc/icons.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #ifdef Q_OS_WIN # include "comdef.h" @@ -274,7 +274,7 @@ namespace BlackCore::Context } const CUser connectedUser = this->getIContextNetwork()->getConnectedServer().getUser(); - const QString client = "swift " % BlackConfig::CBuildConfig::getShortVersionString(); + const QString client = "swift " % swift::config::CBuildConfig::getShortVersionString(); CCallsign cs = connectedUser.getCallsign(); this->unRegisterAudioCallsign(cs, this->identifier()); // un-register "myself" if (this->hasRegisteredAudioCallsign(cs)) // anybody else using that callsign diff --git a/src/blackcore/context/contextnetwork.cpp b/src/blackcore/context/contextnetwork.cpp index b9c8c1d01..058fe3fb1 100644 --- a/src/blackcore/context/contextnetwork.cpp +++ b/src/blackcore/context/contextnetwork.cpp @@ -7,9 +7,9 @@ #include "blackcore/context/contextnetworkproxy.h" #include "blackcore/application.h" #include "blackmisc/dbusserver.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore; using namespace BlackMisc; diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index 938f4c5fa..61547cf09 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -30,13 +30,13 @@ #include "blackmisc/sequence.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackcore/context/contextsimulator.cpp b/src/blackcore/context/contextsimulator.cpp index 7f7f47d3e..866aa9d94 100644 --- a/src/blackcore/context/contextsimulator.cpp +++ b/src/blackcore/context/contextsimulator.cpp @@ -10,7 +10,7 @@ #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index 6a8eb1316..be10fa15d 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/blackcore/context/contextsimulator.h @@ -27,7 +27,7 @@ #include "blackmisc/pq/time.h" #include "blackmisc/identifier.h" #include "blackmisc/pixmap.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index b4604cc7d..1726602f0 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -26,7 +26,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/threadutils.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -36,7 +36,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore::Db; using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index d04ab0192..dedf6c059 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackcore/data/globalsetup.h" #include "blackcore/application.h" #include "blackmisc/json.h" @@ -18,7 +18,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Json; using namespace BlackMisc::Network; diff --git a/src/blackcore/data/networksetup.cpp b/src/blackcore/data/networksetup.cpp index d91f7aac2..2101cdaae 100644 --- a/src/blackcore/data/networksetup.cpp +++ b/src/blackcore/data/networksetup.cpp @@ -3,9 +3,9 @@ #include "blackcore/data/networksetup.h" #include "blackcore/application.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackcore/fsd/clientidentification.h b/src/blackcore/fsd/clientidentification.h index 0e27d9806..7bbcbb4c2 100644 --- a/src/blackcore/fsd/clientidentification.h +++ b/src/blackcore/fsd/clientidentification.h @@ -7,7 +7,7 @@ #define BLACKCORE_FSD_CLIENTIDENTIFICATION_H #include "blackcore/fsd/messagebase.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" namespace BlackCore::Fsd { @@ -34,8 +34,8 @@ namespace BlackCore::Fsd //! Properties std::uint16_t m_clientId = 0; QString m_clientName; - int m_clientVersionMajor = BlackConfig::CBuildConfig::getVersion().majorVersion(); - int m_clientVersionMinor = BlackConfig::CBuildConfig::getVersion().minorVersion(); + int m_clientVersionMajor = swift::config::CBuildConfig::getVersion().majorVersion(); + int m_clientVersionMinor = swift::config::CBuildConfig::getVersion().minorVersion(); QString m_userCid; QString m_sysUid; QString m_initialChallenge; diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/blackcore/fsd/fsdclient.cpp index ea0422617..020662cb6 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/blackcore/fsd/fsdclient.cpp @@ -45,14 +45,14 @@ #include "blackmisc/range.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore::Vatsim; using namespace BlackMisc; using namespace BlackMisc::Aviation; diff --git a/src/blackcore/fsd/serializer.cpp b/src/blackcore/fsd/serializer.cpp index da291468b..e2eabe0f7 100644 --- a/src/blackcore/fsd/serializer.cpp +++ b/src/blackcore/fsd/serializer.cpp @@ -5,9 +5,9 @@ #include "blackmisc/verify.h" #include "blackmisc/logmessage.h" #include "blackmisc/logcategories.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blackcore/githubpackagesreader.cpp b/src/blackcore/githubpackagesreader.cpp index ed2625040..40062e3bc 100644 --- a/src/blackcore/githubpackagesreader.cpp +++ b/src/blackcore/githubpackagesreader.cpp @@ -5,7 +5,7 @@ #include "blackcore/githubpackagesreader.h" #include "blackcore/application.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include @@ -13,7 +13,7 @@ #include using namespace BlackMisc::Db; -using namespace BlackConfig; +using namespace swift::config; namespace BlackCore { diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp index e6a097275..3624e7e79 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/blackcore/setupreader.cpp @@ -13,7 +13,7 @@ #include "blackmisc/network/networkutils.h" #include "blackmisc/network/url.h" #include "blackmisc/statusmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -25,7 +25,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Network; diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 992cf80cf..45c46556b 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -26,7 +26,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h index 34af0675f..51885e921 100644 --- a/src/blackcore/simulator.h +++ b/src/blackcore/simulator.h @@ -32,7 +32,7 @@ #include "blackmisc/pixmap.h" #include "blackmisc/simplecommandparser.h" #include "blackmisc/tokenbucket.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 1c5e7416e..db2a36170 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -21,7 +21,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/worker.h" #include "blackmisc/threadutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -36,7 +36,7 @@ using namespace BlackCore::Db; using namespace BlackCore::Data; using namespace BlackCore::Vatsim; using namespace BlackCore::Context; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/configsimulatorcomponent.cpp b/src/blackgui/components/configsimulatorcomponent.cpp index c1fc2dd67..eab8b210e 100644 --- a/src/blackgui/components/configsimulatorcomponent.cpp +++ b/src/blackgui/components/configsimulatorcomponent.cpp @@ -5,13 +5,13 @@ #include "blackgui/guiutility.h" #include "blackmisc/logmessage.h" #include "blackmisc/simulation/fscommon/fsdirectories.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_configsimulatorcomponent.h" using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; -using namespace BlackConfig; +using namespace swift::config; namespace BlackGui::Components { diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index e6e5be71a..59cd47eb6 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -14,7 +14,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/verify.h" #include "blackmisc/crashhandler.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -28,7 +28,7 @@ using namespace BlackCore; using namespace BlackCore::Db; using namespace BlackGui; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 9be95b5d5..165050a8a 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -16,7 +16,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/processctrl.h" #include "blackmisc/statusmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_dbownmodelscomponent.h" #include @@ -27,7 +27,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackCore::Db; diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp index b84058476..1e016f6ae 100644 --- a/src/blackgui/components/dbquickmappingwizard.cpp +++ b/src/blackgui/components/dbquickmappingwizard.cpp @@ -14,13 +14,13 @@ #include "blackcore/context/contextsimulator.h" #include "blackcore/db/databasewriter.h" #include "blackcore/webdataservices.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include using namespace BlackCore; using namespace BlackCore::Db; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/dbusserveraddressselector.cpp b/src/blackgui/components/dbusserveraddressselector.cpp index da3b984dd..88e5aa26f 100644 --- a/src/blackgui/components/dbusserveraddressselector.cpp +++ b/src/blackgui/components/dbusserveraddressselector.cpp @@ -6,11 +6,11 @@ #include "blackgui/guiapplication.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/dbusserver.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/downloadcomponent.cpp b/src/blackgui/components/downloadcomponent.cpp index e475c1870..0c4152ef3 100644 --- a/src/blackgui/components/downloadcomponent.cpp +++ b/src/blackgui/components/downloadcomponent.cpp @@ -9,7 +9,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/directoryutils.h" #include "blackmisc/fileutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -19,7 +19,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/firstmodelsetcomponent.cpp b/src/blackgui/components/firstmodelsetcomponent.cpp index 677568000..df98c6c58 100644 --- a/src/blackgui/components/firstmodelsetcomponent.cpp +++ b/src/blackgui/components/firstmodelsetcomponent.cpp @@ -13,14 +13,14 @@ #include "blackcore/webdataservices.h" #include "blackmisc/directoryutils.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::Settings; diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 1f92a796e..62077a504 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -28,7 +28,7 @@ #include "blackmisc/directoryutils.h" #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_flightplancomponent.h" @@ -58,7 +58,7 @@ using namespace BlackMisc::Simulation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackGui; using namespace BlackCore; -using namespace BlackConfig; +using namespace swift::config; namespace BlackGui::Components { diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index d3faa3f85..00a37b21a 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -14,7 +14,7 @@ #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/network/server.h" #include "blackmisc/audio/audioutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_infobarstatuscomponent.h" #include @@ -28,7 +28,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore; using namespace BlackCore::Context; using namespace BlackGui; diff --git a/src/blackgui/components/installxswiftbuscomponent.cpp b/src/blackgui/components/installxswiftbuscomponent.cpp index 3ec52ba4e..aa166138e 100644 --- a/src/blackgui/components/installxswiftbuscomponent.cpp +++ b/src/blackgui/components/installxswiftbuscomponent.cpp @@ -10,7 +10,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/directoryutils.h" #include "blackmisc/fileutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -21,7 +21,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 4b30f2f1e..fa62378bf 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/src/blackgui/components/internalscomponent.cpp @@ -19,7 +19,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/statusmessage.h" #include "blackmisc/crashhandler.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_internalscomponent.h" @@ -34,7 +34,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blackgui/components/legalinfocomponent.cpp b/src/blackgui/components/legalinfocomponent.cpp index 18a3e4b76..cac408900 100644 --- a/src/blackgui/components/legalinfocomponent.cpp +++ b/src/blackgui/components/legalinfocomponent.cpp @@ -9,14 +9,14 @@ #include "blackmisc/network/url.h" #include "blackmisc/logmessage.h" #include "blackmisc/statusmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include using namespace BlackMisc; using namespace BlackMisc::Network; using namespace BlackCore::Data; -using namespace BlackConfig; +using namespace swift::config; namespace BlackGui::Components { diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 786b8185e..920eafd7d 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -30,7 +30,7 @@ #include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/statusmessage.h" #include "blackmisc/crashhandler.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -46,7 +46,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Audio; diff --git a/src/blackgui/components/ownaircraftcomponent.cpp b/src/blackgui/components/ownaircraftcomponent.cpp index c0cd155cf..aafa18c79 100644 --- a/src/blackgui/components/ownaircraftcomponent.cpp +++ b/src/blackgui/components/ownaircraftcomponent.cpp @@ -14,11 +14,11 @@ #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/crashhandler.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index d86ee33c8..fe74d3487 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -4,7 +4,7 @@ #include "blackgui/components/audionotificationcomponent.h" #include "blackgui/components/settingscomponent.h" #include "blackgui/guiapplication.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_settingscomponent.h" #include @@ -24,7 +24,7 @@ using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::Settings; using namespace BlackCore; using namespace BlackGui; -using namespace BlackConfig; +using namespace swift::config; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index ab1b411d4..8d3d4aec3 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackcore/context/contextapplication.h" #include "blackcore/data/globalsetup.h" #include "blackgui/editors/serverform.h" @@ -19,7 +19,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore; using namespace BlackCore::Data; using namespace BlackGui; diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp index 3acd0a91e..6bbaeda4f 100644 --- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp +++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp @@ -8,7 +8,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/htmlutils.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -18,7 +18,7 @@ using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::Settings; using namespace BlackMisc::Simulation::XPlane; -using namespace BlackConfig; +using namespace swift::config; namespace BlackGui::Components { diff --git a/src/blackgui/components/simulatorselector.cpp b/src/blackgui/components/simulatorselector.cpp index a95b5527b..7a8b3b05c 100644 --- a/src/blackgui/components/simulatorselector.cpp +++ b/src/blackgui/components/simulatorselector.cpp @@ -7,7 +7,7 @@ #include "blackcore/context/contextsimulator.h" #include "blackmisc/icons.h" #include "blackmisc/mixin/mixincompare.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_simulatorselector.h" #include @@ -16,7 +16,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackCore::Context; diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/blackgui/components/updateinfocomponent.cpp index 70a9bd145..e6d9b9577 100644 --- a/src/blackgui/components/updateinfocomponent.cpp +++ b/src/blackgui/components/updateinfocomponent.cpp @@ -10,12 +10,12 @@ #include "blackmisc/db/distributionlist.h" #include "blackmisc/logmessage.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore::Application; using namespace BlackMisc; using namespace BlackMisc::Db; diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/blackgui/copyxswiftbusdialog.cpp index ce95b31c3..08072fe04 100644 --- a/src/blackgui/copyxswiftbusdialog.cpp +++ b/src/blackgui/copyxswiftbusdialog.cpp @@ -8,9 +8,9 @@ #include "blackmisc/simulation/xplane/xplaneutil.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation::XPlane; using namespace BlackCore::Context; diff --git a/src/blackgui/editors/pilotform.cpp b/src/blackgui/editors/pilotform.cpp index 2f9dbddb2..ddead55b4 100644 --- a/src/blackgui/editors/pilotform.cpp +++ b/src/blackgui/editors/pilotform.cpp @@ -9,11 +9,11 @@ #include "blackgui/guiutility.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/network/user.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 1d781e60b..6ec08fd15 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -24,7 +24,7 @@ #include "blackmisc/metadatautils.h" #include "blackmisc/settingscache.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -52,7 +52,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Network; diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index c22403a63..4114692d3 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -3,7 +3,7 @@ #include "ui_loginmodebuttons.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackgui/loginmodebuttons.h" #include "blackgui/guiapplication.h" #include "blackcore/context/contextsimulator.h" @@ -11,7 +11,7 @@ #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore; using namespace BlackCore::Context; using namespace BlackMisc::Network; diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp index 06160dd79..732a34635 100644 --- a/src/blackgui/menus/aircraftmodelmenus.cpp +++ b/src/blackgui/menus/aircraftmodelmenus.cpp @@ -12,10 +12,10 @@ #include "blackmisc/logmessage.h" #include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/modelconverterx.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackGui; diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 0cef804d0..f79193c75 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackgui/stylesheetutility.h" #include "blackmisc/fileutils.h" #include "blackmisc/logmessage.h" @@ -25,7 +25,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; namespace BlackGui diff --git a/src/blackgui/views/aircraftcategorytreeview.cpp b/src/blackgui/views/aircraftcategorytreeview.cpp index 0413285ee..34ddbee2e 100644 --- a/src/blackgui/views/aircraftcategorytreeview.cpp +++ b/src/blackgui/views/aircraftcategorytreeview.cpp @@ -5,7 +5,7 @@ #include "blackgui/models/aircraftcategorytreemodel.h" #include "blackgui/menus/menuaction.h" #include "blackmisc/icons.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackgui/views/atcstationtreeview.cpp b/src/blackgui/views/atcstationtreeview.cpp index a1b2fca7d..39d93bc37 100644 --- a/src/blackgui/views/atcstationtreeview.cpp +++ b/src/blackgui/views/atcstationtreeview.cpp @@ -7,7 +7,7 @@ #include "blackmisc/aviation/atcstationlist.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/icons.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp index 8fcaed92b..8571dc05e 100644 --- a/src/blackgui/views/atcstationview.cpp +++ b/src/blackgui/views/atcstationview.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackgui/menus/menuaction.h" #include "blackgui/models/atcstationlistmodel.h" #include "blackgui/views/atcstationview.h" @@ -12,7 +12,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackGui::Models; diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp index b34e894c0..73b4bb686 100644 --- a/src/blackgui/views/simulatedaircraftview.cpp +++ b/src/blackgui/views/simulatedaircraftview.cpp @@ -11,13 +11,13 @@ #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/icons.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Aviation; diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 431a1a529..e39c4f066 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -8,7 +8,7 @@ #include "blackgui/models/allmodels.h" #include "blackgui/components/texteditdialog.h" #include "blackmisc/worker.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp index 79b6e66e4..3a2480bad 100644 --- a/src/blackgui/views/viewbasenontemplate.cpp +++ b/src/blackgui/views/viewbasenontemplate.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackgui/components/texteditdialog.h" #include "blackgui/dockwidgetinfoarea.h" #include "blackgui/filters/filterdialog.h" @@ -22,7 +22,7 @@ #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackGui; using namespace BlackGui::Menus; diff --git a/src/blackmisc/CMakeLists.txt b/src/blackmisc/CMakeLists.txt index a83f16580..b7996b041 100644 --- a/src/blackmisc/CMakeLists.txt +++ b/src/blackmisc/CMakeLists.txt @@ -693,7 +693,7 @@ target_compile_definitions(misc PRIVATE BUILD_BLACKMISC_LIB) target_link_libraries(misc PUBLIC - blackconfig + config Qt::Core Qt::Gui Qt::DBus diff --git a/src/blackmisc/applicationinfo.cpp b/src/blackmisc/applicationinfo.cpp index a10db5847..9ba804d06 100644 --- a/src/blackmisc/applicationinfo.cpp +++ b/src/blackmisc/applicationinfo.cpp @@ -4,12 +4,12 @@ #include "blackmisc/applicationinfo.h" #include "blackmisc/iconlist.h" #include "blackmisc/comparefunctions.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo) diff --git a/src/blackmisc/applicationinfolist.cpp b/src/blackmisc/applicationinfolist.cpp index 3674f5a70..b1900f7f1 100644 --- a/src/blackmisc/applicationinfolist.cpp +++ b/src/blackmisc/applicationinfolist.cpp @@ -5,9 +5,9 @@ #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CApplicationInfo, CApplicationInfoList) diff --git a/src/blackmisc/audio/audioutils.cpp b/src/blackmisc/audio/audioutils.cpp index 260aea11d..154f96d66 100644 --- a/src/blackmisc/audio/audioutils.cpp +++ b/src/blackmisc/audio/audioutils.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/audio/audioutils.h" #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Audio { diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 3092678c6..a0810b745 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -11,7 +11,7 @@ #include "blackmisc/comparefunctions.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply #include "QStringBuilder" @@ -19,7 +19,7 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituation) diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp index 97af963ba..46548cdc5 100644 --- a/src/blackmisc/aviation/aircraftsituationchange.cpp +++ b/src/blackmisc/aviation/aircraftsituationchange.cpp @@ -13,14 +13,14 @@ #include "blackmisc/propertyindexref.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "QStringBuilder" #include #include using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Math; -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange) diff --git a/src/blackmisc/compressutils.cpp b/src/blackmisc/compressutils.cpp index 53a4de48f..7e1136412 100644 --- a/src/blackmisc/compressutils.cpp +++ b/src/blackmisc/compressutils.cpp @@ -5,12 +5,12 @@ #include "blackmisc/fileutils.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc { diff --git a/src/blackmisc/crashhandler.cpp b/src/blackmisc/crashhandler.cpp index 21ec58273..0eedb3f40 100644 --- a/src/blackmisc/crashhandler.cpp +++ b/src/blackmisc/crashhandler.cpp @@ -6,7 +6,7 @@ #include "blackmisc/directoryutils.h" #include "blackmisc/logmessage.h" #include "blackmisc/filelogger.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -22,7 +22,7 @@ # include "crashpad/client/simulate_crash.h" #endif -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace crashpad; diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp index 9bcb6bbad..ad6678df8 100644 --- a/src/blackmisc/db/artifact.cpp +++ b/src/blackmisc/db/artifact.cpp @@ -3,11 +3,11 @@ #include "blackmisc/db/artifact.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Network; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact) diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h index 94a8c2c1f..9780c807b 100644 --- a/src/blackmisc/db/datastore.h +++ b/src/blackmisc/db/datastore.h @@ -9,7 +9,7 @@ #include "blackmisc/timestampbased.h" #include "blackmisc/propertyindex.h" #include "blackmisc/blackmiscexport.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include diff --git a/src/blackmisc/db/distribution.cpp b/src/blackmisc/db/distribution.cpp index 53cb98479..5afcbdc64 100644 --- a/src/blackmisc/db/distribution.cpp +++ b/src/blackmisc/db/distribution.cpp @@ -5,7 +5,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackmisc/db/distribution.h b/src/blackmisc/db/distribution.h index 97e6a124f..6ee2c080d 100644 --- a/src/blackmisc/db/distribution.h +++ b/src/blackmisc/db/distribution.h @@ -6,7 +6,7 @@ #ifndef BLACKMISC_DB_DISTRIBUTION_H #define BLACKMISC_DB_DISTRIBUTION_H -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/blackmiscexport.h" #include "blackmisc/network/url.h" #include "blackmisc/db/datastore.h" diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp index 14f570a4e..bed9175de 100644 --- a/src/blackmisc/db/updateinfo.cpp +++ b/src/blackmisc/db/updateinfo.cpp @@ -3,13 +3,13 @@ #include "blackmisc/db/updateinfo.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include #include -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo) diff --git a/src/blackmisc/directoryutils.cpp b/src/blackmisc/directoryutils.cpp index 238e2e47d..6de362ad3 100644 --- a/src/blackmisc/directoryutils.cpp +++ b/src/blackmisc/directoryutils.cpp @@ -8,7 +8,7 @@ #include "blackmisc/stringutils.h" #include "blackmisc/network/ping.h" #include "blackmisc/setbuilder.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include @@ -16,7 +16,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Network; namespace BlackMisc diff --git a/src/blackmisc/filelogger.cpp b/src/blackmisc/filelogger.cpp index 406e5a2b9..87b0929fa 100644 --- a/src/blackmisc/filelogger.cpp +++ b/src/blackmisc/filelogger.cpp @@ -3,7 +3,7 @@ #include "blackmisc/filelogger.h" #include "blackmisc/swiftdirectories.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -14,7 +14,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc { diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp index e05b9d058..900852751 100644 --- a/src/blackmisc/fileutils.cpp +++ b/src/blackmisc/fileutils.cpp @@ -4,7 +4,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/stringutils.h" #include "blackmisc/setbuilder.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -19,7 +19,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc { diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp index 0a54fbcde..fcbf79951 100644 --- a/src/blackmisc/loghandler.cpp +++ b/src/blackmisc/loghandler.cpp @@ -7,7 +7,7 @@ #include "blackmisc/algorithm.h" #include "blackmisc/mixin/mixincompare.h" #include "blackmisc/threadutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #ifdef BLACK_USE_CRASHPAD # include "crashpad/client/simulate_crash.h" @@ -145,7 +145,7 @@ namespace BlackMisc void CLogHandler::logLocalMessage(const CStatusMessage &i_statusMessage) { - using namespace BlackConfig; + using namespace swift::config; CStatusMessage statusMessage = i_statusMessage; if (!CBuildConfig::isLocalDeveloperDebugBuild() && CLogPattern::empty().withSeverity(CStatusMessage::SeverityError).match(statusMessage)) { diff --git a/src/blackmisc/network/networkutils.cpp b/src/blackmisc/network/networkutils.cpp index b2f8e74e2..637f30fe9 100644 --- a/src/blackmisc/network/networkutils.cpp +++ b/src/blackmisc/network/networkutils.cpp @@ -5,7 +5,7 @@ #include "blackmisc/network/server.h" #include "blackmisc/eventloop.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include @@ -22,7 +22,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Network; diff --git a/src/blackmisc/network/ping.cpp b/src/blackmisc/network/ping.cpp index 919574023..f252e8a45 100644 --- a/src/blackmisc/network/ping.cpp +++ b/src/blackmisc/network/ping.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "blackmisc/network/ping.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Network { diff --git a/src/blackmisc/platform.cpp b/src/blackmisc/platform.cpp index 3158075a7..125a2bcf2 100644 --- a/src/blackmisc/platform.cpp +++ b/src/blackmisc/platform.cpp @@ -4,12 +4,12 @@ #include "blackmisc/platform.h" #include "blackmisc/icons.h" #include "blackmisc/comparefunctions.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CPlatform) diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index f2ad8dbc8..bd7024a8f 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -11,7 +11,7 @@ #include "blackmisc/mixin/mixincompare.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -22,7 +22,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Db; diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 5861f5366..77d20b53a 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -14,7 +14,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/stringutils.h" #include "blackmisc/setbuilder.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -24,7 +24,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Network; using namespace BlackMisc::Math; using namespace BlackMisc::Aviation; diff --git a/src/blackmisc/simulation/flightgear/flightgearutil.cpp b/src/blackmisc/simulation/flightgear/flightgearutil.cpp index 3047f5129..27f9147a4 100644 --- a/src/blackmisc/simulation/flightgear/flightgearutil.cpp +++ b/src/blackmisc/simulation/flightgear/flightgearutil.cpp @@ -4,7 +4,7 @@ #include "blackmisc/simulation/flightgear/flightgearutil.h" #include "blackmisc/fileutils.h" #include "blackmisc/directoryutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "qsystemdetection.h" #include #include @@ -14,7 +14,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Simulation::Flightgear { diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp index 7f395c5ca..aba16102a 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp @@ -9,7 +9,7 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/worker.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -28,7 +28,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index f77f981bb..6e66be306 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -9,7 +9,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/stringutils.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -25,7 +25,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Simulation::FsCommon { diff --git a/src/blackmisc/simulation/fscommon/fsdirectories.cpp b/src/blackmisc/simulation/fscommon/fsdirectories.cpp index c012c61b6..216e06bfe 100644 --- a/src/blackmisc/simulation/fscommon/fsdirectories.cpp +++ b/src/blackmisc/simulation/fscommon/fsdirectories.cpp @@ -7,7 +7,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/stringutils.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -23,7 +23,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Simulation::FsCommon { diff --git a/src/blackmisc/simulation/interpolation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolation/interpolationlogger.cpp index 24849608f..1584c1ad2 100644 --- a/src/blackmisc/simulation/interpolation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolation/interpolationlogger.cpp @@ -14,11 +14,11 @@ #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp index 1117356fd..93c4fa828 100644 --- a/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp +++ b/src/blackmisc/simulation/interpolation/interpolationrenderingsetup.cpp @@ -5,11 +5,11 @@ #include "blackmisc/network/client.h" #include "blackmisc/stringutils.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; diff --git a/src/blackmisc/simulation/interpolation/interpolator.cpp b/src/blackmisc/simulation/interpolation/interpolator.cpp index 64528f2e2..2eeea1651 100644 --- a/src/blackmisc/simulation/interpolation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolation/interpolator.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "blackmisc/simulation/interpolation/interpolator.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/simulation/interpolation/interpolationlogger.h" #include "blackmisc/simulation/interpolation/interpolatorlinear.h" #include "blackmisc/simulation/interpolation/interpolatorspline.h" @@ -22,7 +22,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::Math; diff --git a/src/blackmisc/simulation/interpolation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolation/interpolatorlinear.cpp index 3713d735b..f21decbde 100644 --- a/src/blackmisc/simulation/interpolation/interpolatorlinear.cpp +++ b/src/blackmisc/simulation/interpolation/interpolatorlinear.cpp @@ -10,11 +10,11 @@ #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" #include "blackmisc/range.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::Math; diff --git a/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp b/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp index aec4cab9d..5a235620c 100644 --- a/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp +++ b/src/blackmisc/simulation/interpolation/interpolatorlinearpbh.cpp @@ -4,9 +4,9 @@ #include "blackmisc/simulation/interpolation/interpolatorlinearpbh.h" #include "blackmisc/simulation/interpolation/interpolatorfunctions.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/blackmisc/simulation/interpolation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolation/interpolatorspline.cpp index b8965d215..578ff7038 100644 --- a/src/blackmisc/simulation/interpolation/interpolatorspline.cpp +++ b/src/blackmisc/simulation/interpolation/interpolatorspline.cpp @@ -6,9 +6,9 @@ #include "blackmisc/network/fsdsetup.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::Math; diff --git a/src/blackmisc/simulation/modelconverterx.cpp b/src/blackmisc/simulation/modelconverterx.cpp index 45fb99363..a96ae2a47 100644 --- a/src/blackmisc/simulation/modelconverterx.cpp +++ b/src/blackmisc/simulation/modelconverterx.cpp @@ -2,13 +2,13 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "blackmisc/simulation/modelconverterx.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/logmessage.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation::Settings; diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index bdfed6467..c2005225d 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -7,13 +7,13 @@ #include "blackmisc/json.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Geo; using namespace BlackMisc::Json; -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc::Simulation { diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp index b5f7ffd92..41897ee69 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.cpp +++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp @@ -8,10 +8,10 @@ #include "blackmisc/simulation/flightgear/flightgearutil.h" #include "blackmisc/verify.h" #include "blackmisc/stringutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::XPlane; diff --git a/src/blackmisc/simulation/simulationenvironmentprovider.cpp b/src/blackmisc/simulation/simulationenvironmentprovider.cpp index 5a6ba9661..4b977b2ce 100644 --- a/src/blackmisc/simulation/simulationenvironmentprovider.cpp +++ b/src/blackmisc/simulation/simulationenvironmentprovider.cpp @@ -6,11 +6,11 @@ #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 51a76ab9d..79c65fabf 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/simulation/fscommon/fsdirectories.h" #include "blackmisc/simulation/simulatorinfo.h" #include "blackmisc/simulation/xplane/xplaneutil.h" @@ -15,7 +15,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Db; using namespace BlackMisc::Simulation::FsCommon; diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index dc49cc923..bbe125e9a 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorPluginInfo) diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index d352d5b6a..21ddb69fd 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -17,7 +17,7 @@ #include "blackmisc/statusmessage.h" #include "blackmisc/logmessage.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -36,7 +36,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/blackmisc/swiftdirectories.cpp b/src/blackmisc/swiftdirectories.cpp index 4c6b4f011..f194db294 100644 --- a/src/blackmisc/swiftdirectories.cpp +++ b/src/blackmisc/swiftdirectories.cpp @@ -8,7 +8,7 @@ #include "blackmisc/fileutils.h" #include "blackmisc/stringutils.h" #include "blackmisc/range.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include @@ -16,7 +16,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; namespace BlackMisc { diff --git a/src/blackmisc/timestampobjectlist.h b/src/blackmisc/timestampobjectlist.h index 90d56e0d0..bc76a5235 100644 --- a/src/blackmisc/timestampobjectlist.h +++ b/src/blackmisc/timestampobjectlist.h @@ -10,7 +10,7 @@ #include "blackmisc/blackmiscexport.h" #include "blackmisc/predicates.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -274,7 +274,7 @@ namespace BlackMisc } // crosscheck - if (BlackConfig::CBuildConfig::isLocalDeveloperDebugBuild()) + if (swift::config::CBuildConfig::isLocalDeveloperDebugBuild()) { Q_ASSERT_X(this->isSortedLatestFirst(), Q_FUNC_INFO, "Wrong sort order"); } @@ -563,7 +563,7 @@ namespace BlackMisc front.setTimeOffsetMs(os); } - if (BlackConfig::CBuildConfig::isLocalDeveloperDebugBuild()) + if (swift::config::CBuildConfig::isLocalDeveloperDebugBuild()) { BLACK_VERIFY_X(front.isNewerThanAdjusted(second), Q_FUNC_INFO, "Front/second timestamp"); BLACK_VERIFY_X(this->isSortedAdjustedLatestFirst(), Q_FUNC_INFO, "Wrong sort order"); @@ -588,7 +588,7 @@ namespace BlackMisc this->container().clear(); const qint64 osTime = value.getTimeOffsetMs(); const qint64 os = -1 * qAbs(deltaTimeMs < 0 ? osTime : deltaTimeMs); - if (BlackConfig::CBuildConfig::isLocalDeveloperDebugBuild()) + if (swift::config::CBuildConfig::isLocalDeveloperDebugBuild()) { BLACK_VERIFY_X(os < 0, Q_FUNC_INFO, "Need negative offset time to prefill time"); } diff --git a/src/blacksound/CMakeLists.txt b/src/blacksound/CMakeLists.txt index a1dbd2a33..1dfab7825 100644 --- a/src/blacksound/CMakeLists.txt +++ b/src/blacksound/CMakeLists.txt @@ -72,7 +72,7 @@ target_include_directories(sound PUBLIC ${PROJECT_SOURCE_DIR}/src) target_link_libraries(sound PUBLIC Qt::Core - blackconfig + config Qt::Multimedia misc externals_opus diff --git a/src/blacksound/audioutilities.cpp b/src/blacksound/audioutilities.cpp index 68d59c9fa..e795ee929 100644 --- a/src/blacksound/audioutilities.cpp +++ b/src/blacksound/audioutilities.cpp @@ -3,7 +3,7 @@ #include "audioutilities.h" #include "blackmisc/audio/audiodeviceinfolist.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -11,7 +11,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc::Audio; namespace BlackSound diff --git a/src/blacksound/dsp/biquadfilter.cpp b/src/blacksound/dsp/biquadfilter.cpp index a662c5391..74fde9569 100644 --- a/src/blacksound/dsp/biquadfilter.cpp +++ b/src/blacksound/dsp/biquadfilter.cpp @@ -3,13 +3,13 @@ #include "biquadfilter.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include using namespace BlackMisc; -using namespace BlackConfig; +using namespace swift::config; namespace BlackSound::Dsp { diff --git a/src/blacksound/sampleprovider/sampleprovider.h b/src/blacksound/sampleprovider/sampleprovider.h index 68de9f3ec..fa3e033de 100644 --- a/src/blacksound/sampleprovider/sampleprovider.h +++ b/src/blacksound/sampleprovider/sampleprovider.h @@ -6,7 +6,7 @@ #ifndef BLACKSOUND_SAMPLEPROVIDER_H #define BLACKSOUND_SAMPLEPROVIDER_H -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blacksound/blacksoundexport.h" #include #include @@ -33,7 +33,7 @@ namespace BlackSound::SampleProvider protected: //! Verbose logs? - bool static verbose() { return BlackConfig::CBuildConfig::isLocalDeveloperDebugBuild(); } + bool static verbose() { return swift::config::CBuildConfig::isLocalDeveloperDebugBuild(); } }; } // ns diff --git a/src/blackconfig/CMakeLists.txt b/src/config/CMakeLists.txt similarity index 74% rename from src/blackconfig/CMakeLists.txt rename to src/config/CMakeLists.txt index 4351f1159..8b0a44d47 100644 --- a/src/blackconfig/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -4,7 +4,7 @@ configure_file(buildconfig_gen.inc.in buildconfig_gen.inc) configure_file(buildconfig_gen.cpp.in buildconfig_gen.cpp) -add_library(blackconfig STATIC +add_library(config STATIC buildconfig.cpp buildconfig.h buildconfig.inc @@ -12,11 +12,11 @@ add_library(blackconfig STATIC ${CMAKE_CURRENT_BINARY_DIR}/buildconfig_gen.cpp ) -target_link_libraries(blackconfig PUBLIC Qt::Core) +target_link_libraries(config PUBLIC Qt::Core) -target_include_directories(blackconfig +target_include_directories(config PUBLIC ${PROJECT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR} ) -set_property(TARGET blackconfig PROPERTY POSITION_INDEPENDENT_CODE ON) +set_property(TARGET config PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/src/blackconfig/buildconfig.cpp b/src/config/buildconfig.cpp similarity index 91% rename from src/blackconfig/buildconfig.cpp rename to src/config/buildconfig.cpp index c0dd1c6cc..8b3d11669 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/config/buildconfig.cpp @@ -17,7 +17,7 @@ #include #include -namespace BlackConfig +namespace swift::config { const QString &CBuildConfig::swiftGuiExecutableName() { @@ -98,10 +98,10 @@ namespace BlackConfig if (infoShort.isEmpty()) { QStringList sl; - if (CBuildConfig::isCompiledWithBlackCore()) { sl << "BlackCore"; } - if (CBuildConfig::isCompiledWithBlackSound()) { sl << "BlackSound"; } - if (CBuildConfig::isCompiledWithBlackInput()) { sl << "BlackInput"; } - if (CBuildConfig::isCompiledWithGui()) { sl << "BlackGui"; } + if (CBuildConfig::isCompiledWithCore()) { sl << "Core"; } + if (CBuildConfig::isCompiledWithSound()) { sl << "Sound"; } + if (CBuildConfig::isCompiledWithInput()) { sl << "Input"; } + if (CBuildConfig::isCompiledWithGui()) { sl << "Gui"; } if (CBuildConfig::isCompiledWithFs9Support()) { sl << "FS9"; } if (CBuildConfig::isCompiledWithFsxSupport()) { sl << "FSX"; } if (CBuildConfig::isCompiledWithXPlaneSupport()) { sl << "XPlane"; } @@ -117,9 +117,9 @@ namespace BlackConfig static QString infoLong; if (infoLong.isEmpty()) { - infoLong = infoLong.append("BlackCore: ").append(boolToYesNo(isCompiledWithBlackCore())); - infoLong = infoLong.append(" BlackInput: ").append(boolToYesNo(isCompiledWithBlackInput())); - infoLong = infoLong.append(" BlackSound: ").append(boolToYesNo(isCompiledWithBlackSound())); + infoLong = infoLong.append("Core: ").append(boolToYesNo(isCompiledWithCore())); + infoLong = infoLong.append(" Input: ").append(boolToYesNo(isCompiledWithInput())); + infoLong = infoLong.append(" Sound: ").append(boolToYesNo(isCompiledWithSound())); infoLong = infoLong.append(" GUI: ").append(boolToYesNo(isCompiledWithGui())); infoLong = infoLong.append(" FS9: ").append(boolToYesNo(isCompiledWithFs9Support())); diff --git a/src/blackconfig/buildconfig.h b/src/config/buildconfig.h similarity index 92% rename from src/blackconfig/buildconfig.h rename to src/config/buildconfig.h index 15b00d48b..2265178a4 100644 --- a/src/blackconfig/buildconfig.h +++ b/src/config/buildconfig.h @@ -11,20 +11,20 @@ #include #include -namespace BlackConfig +namespace swift::config { //! Build configuration, also used to secure VATSIM key class CBuildConfig { public: - //! with BlackCore? - static constexpr bool isCompiledWithBlackCore(); // defined in buildconfig_gen.inc.in + //! with Core? + static constexpr bool isCompiledWithCore(); // defined in buildconfig_gen.inc.in - //! with BlackSound? - static constexpr bool isCompiledWithBlackSound(); // defined in buildconfig_gen.inc.in + //! with Sound? + static constexpr bool isCompiledWithSound(); // defined in buildconfig_gen.inc.in - //! with BlackInput? - static constexpr bool isCompiledWithBlackInput(); // defined in buildconfig_gen.inc.in + //! with Input? + static constexpr bool isCompiledWithInput(); // defined in buildconfig_gen.inc.in //! with FS9 support? static constexpr bool isCompiledWithFs9Support(); // defined in buildconfig_gen.inc.in diff --git a/src/blackconfig/buildconfig.inc b/src/config/buildconfig.inc similarity index 98% rename from src/blackconfig/buildconfig.inc rename to src/config/buildconfig.inc index 3b3fce855..19b9a8d33 100644 --- a/src/blackconfig/buildconfig.inc +++ b/src/config/buildconfig.inc @@ -10,7 +10,7 @@ //! \cond PRIVATE -namespace BlackConfig +namespace swift::config { constexpr bool CBuildConfig::isCompiledWithMsFlightSimulatorSupport() { diff --git a/src/blackconfig/buildconfig_gen.cpp.in b/src/config/buildconfig_gen.cpp.in similarity index 63% rename from src/blackconfig/buildconfig_gen.cpp.in rename to src/config/buildconfig_gen.cpp.in index c8915f0d0..496e0d146 100644 --- a/src/blackconfig/buildconfig_gen.cpp.in +++ b/src/config/buildconfig_gen.cpp.in @@ -1,35 +1,35 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #ifdef SWIFT_VATSIM_SUPPORT -int BlackConfig::CBuildConfig::vatsimClientId() +int swift::config::CBuildConfig::vatsimClientId() { static const int id { ${SWIFT_VATSIM_ID} }; return id; } -const QString &BlackConfig::CBuildConfig::vatsimPrivateKey() +const QString &swift::config::CBuildConfig::vatsimPrivateKey() { static const auto pk = QString { "${SWIFT_VATSIM_KEY}" }; return pk; } #endif -const QString &BlackConfig::CBuildConfig::backtraceToken() +const QString &swift::config::CBuildConfig::backtraceToken() { static const auto bt = QString { "$ENV{BACKTRACE_MINIDUMP_TOKEN}" }; return bt; } -const QString &BlackConfig::CBuildConfig::gitHeadSha1() +const QString &swift::config::CBuildConfig::gitHeadSha1() { static const QString gitHeadSha1("${swift_git_head}"); Q_ASSERT(!gitHeadSha1.isEmpty()); return gitHeadSha1; } -int BlackConfig::CBuildConfig::versionRevision() { return ${SWIFT_VERSION_REVISION}; } +int swift::config::CBuildConfig::versionRevision() { return ${SWIFT_VERSION_REVISION}; } diff --git a/src/config/buildconfig_gen.inc.in b/src/config/buildconfig_gen.inc.in new file mode 100644 index 000000000..9215abe01 --- /dev/null +++ b/src/config/buildconfig_gen.inc.in @@ -0,0 +1,65 @@ +// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors +// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 + +#ifndef IN_BUILDCONFIG_H +#error This file is only to be included by buildconfig.inc +#endif + +#define SWIFTCONFIG_ON true +#define SWIFTCONFIG_OFF false + +constexpr bool swift::config::CBuildConfig::isCompiledWithCore() +{ + return SWIFTCONFIG_${SWIFT_BUILD_CORE}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithSound() +{ + return SWIFTCONFIG_${SWIFT_BUILD_SOUND}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithInput() +{ + return SWIFTCONFIG_${SWIFT_BUILD_INPUT}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithFs9Support() +{ + return SWIFTCONFIG_${SWIFT_BUILD_FS9_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithP3DSupport() +{ + return SWIFTCONFIG_${SWIFT_BUILD_P3D_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithFsxSupport() +{ + return SWIFTCONFIG_${SWIFT_BUILD_FSX_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithFsuipcSupport() +{ + return isCompiledWithFsxSupport() || isCompiledWithP3DSupport() || isCompiledWithFs9Support() || SWIFTCONFIG_${SWIFT_BUILD_MSFS_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithXPlaneSupport() +{ + return SWIFTCONFIG_${SWIFT_BUILD_XPLANE_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithFGSupport() +{ + return SWIFTCONFIG_${SWIFT_BUILD_FLIGHTGEAR_PLUGIN}; +} + +constexpr bool swift::config::CBuildConfig::isCompiledWithGui() +{ + return SWIFTCONFIG_${SWIFT_BUILD_GUI}; +} + +constexpr int swift::config::CBuildConfig::versionMajor() { return ${SWIFT_VERSION_MAJOR}; } +constexpr int swift::config::CBuildConfig::versionMinor() { return ${SWIFT_VERSION_MINOR}; } + +#undef SWIFTCONFIG_ON +#undef SWIFTCONFIG_OFF diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index b071116fa..ad711c287 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -11,7 +11,7 @@ #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index 2271458d8..b75202db6 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -40,7 +40,7 @@ #include "blackmisc/dbusserver.h" #include "blackmisc/iterator.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "dbus/dbus.h" @@ -52,7 +52,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/plugins/simulator/fs9/CMakeLists.txt b/src/plugins/simulator/fs9/CMakeLists.txt index f445a7f6a..3f51bb7a0 100644 --- a/src/plugins/simulator/fs9/CMakeLists.txt +++ b/src/plugins/simulator/fs9/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(simulatorfs9 misc core fscommon - blackconfig + config externals_dplay ) diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 40fa7f5cb..e8fe346bb 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -15,7 +15,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/propertyindexallclasses.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -31,7 +31,7 @@ using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackCore; using namespace BlackSimPlugin::FsCommon; -using namespace BlackConfig; +using namespace swift::config; namespace BlackSimPlugin::Fs9 { diff --git a/src/plugins/simulator/fsxcommon/CMakeLists.txt b/src/plugins/simulator/fsxcommon/CMakeLists.txt index cb84b5587..fc51e82cf 100644 --- a/src/plugins/simulator/fsxcommon/CMakeLists.txt +++ b/src/plugins/simulator/fsxcommon/CMakeLists.txt @@ -40,7 +40,7 @@ target_link_libraries(fsxcommon PRIVATE gui fscommon - blackconfig + config ) target_compile_definitions(fsxcommon PRIVATE BUILD_FSXCOMMON_LIB) diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp index cbc13ca5a..747356ebe 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp @@ -7,7 +7,7 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/guiapplication.h" #include "blackcore/context/contextsimulator.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -17,7 +17,7 @@ using namespace BlackCore::Context; using namespace BlackGui; using namespace BlackMisc; using namespace BlackMisc::Simulation; -using namespace BlackConfig; +using namespace swift::config; namespace BlackSimPlugin::FsxCommon { diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index 3a81d26a6..1da3650fa 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -7,9 +7,9 @@ #include "blackcore/simulator.h" #include "blackcore/simulator.h" #include "blackmisc/simulation/interpolation/interpolatormulti.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index 7f743f1c3..b4a80f3dc 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -9,7 +9,7 @@ #include "blackmisc/simulation/fsx/simconnectutilities.h" #include "blackmisc/network/networkutils.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include #include @@ -17,7 +17,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation::Fsx; diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index f2150dce2..3dc87fdff 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -22,7 +22,7 @@ #include "blackmisc/statusmessagelist.h" #include "blackmisc/threadutils.h" #include "blackmisc/verify.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -30,7 +30,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index f93e6013b..74b89e824 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -23,7 +23,7 @@ #include "blackmisc/network/client.h" #include "blackmisc/pixmap.h" #include "blackmisc/pq/frequency.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -295,8 +295,8 @@ namespace BlackSimPlugin::FsxCommon //! @{ //! Word size - static bool is32bit() { return (BlackConfig::CBuildConfig::buildWordSize() == 32); } - static bool is64bit() { return (BlackConfig::CBuildConfig::buildWordSize() == 64); } + static bool is32bit() { return (swift::config::CBuildConfig::buildWordSize() == 32); } + static bool is64bit() { return (swift::config::CBuildConfig::buildWordSize() == 64); } //! @} //! Format conversion diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 36730791c..50659ce67 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -9,12 +9,12 @@ #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/aviation/airportlist.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include using namespace BlackCore; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Simulation; using namespace BlackMisc::Aviation; diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index bdee10e57..5e4c4d1f5 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.cpp +++ b/src/plugins/simulator/p3d/simulatorp3d.cpp @@ -6,9 +6,9 @@ #include "../fscommon/simulatorfscommonfunctions.h" #include "blackmisc/threadutils.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 20943ab83..16561fcfd 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -42,7 +42,7 @@ #include "blackmisc/iterator.h" #include "blackmisc/logmessage.h" #include "blackmisc/setbuilder.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "dbus/dbus.h" @@ -55,7 +55,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index 36ad95572..01f1ecfb9 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -18,7 +18,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/logpattern.h" #include "blackmisc/network/url.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "ui_swiftdata.h" #include @@ -36,7 +36,7 @@ using namespace BlackCore::Data; using namespace BlackCore::Db; using namespace BlackGui; using namespace BlackGui::Components; -using namespace BlackConfig; +using namespace swift::config; CSwiftData::CSwiftData(QWidget *parent) : QMainWindow(parent), CIdentifiable(this), diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 5ad3f85cf..32058c824 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -24,7 +24,7 @@ #include "blackmisc/logcategories.h" #include "blackmisc/logmessage.h" #include "blackmisc/threadutils.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #if defined(Q_OS_MACOS) # include "blackinput/macos/macosinpututils.h" @@ -70,7 +70,7 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::Audio; using namespace BlackMisc::Input; using namespace BlackMisc::Simulation; -using namespace BlackConfig; +using namespace swift::config; // Constructor SwiftGuiStd::SwiftGuiStd(BlackGui::CEnableForFramelessWindow::WindowMode windowMode, QWidget *parent) : QMainWindow(parent, CEnableForFramelessWindow::modeToWindowFlags(windowMode)), diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index dd95b4676..e8a3898dd 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -34,7 +34,7 @@ #include "blackmisc/logpattern.h" #include "blackmisc/slot.h" #include "blackmisc/statusmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -47,7 +47,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore; using namespace BlackCore::Context; using namespace BlackMisc; diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp index 56b4f05ce..b484e0829 100644 --- a/src/swiftguistandard/swiftguistdmenus.cpp +++ b/src/swiftguistandard/swiftguistdmenus.cpp @@ -11,7 +11,7 @@ #include "blackmisc/aviation/altitude.h" #include "blackmisc/pq/units.h" #include "blackmisc/logmessage.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "swiftguistd.h" #include "ui_swiftguistd.h" @@ -24,7 +24,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackGui; using namespace BlackGui::Components; using namespace BlackCore; diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index be0abcb5d..41b963f1b 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -21,7 +21,7 @@ #include "blackmisc/logmessage.h" #include "blackmisc/loghandler.h" #include "blackmisc/sharedstate/datalinkdbus.h" -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include #include @@ -35,7 +35,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackGui; using namespace BlackGui::Components; using namespace BlackCore; diff --git a/tests/blackcore/fsd/CMakeLists.txt b/tests/blackcore/fsd/CMakeLists.txt index 86479825a..13f868908 100644 --- a/tests/blackcore/fsd/CMakeLists.txt +++ b/tests/blackcore/fsd/CMakeLists.txt @@ -12,5 +12,5 @@ add_swift_test( add_swift_test( NAME core_fsdmessages SOURCES testfsdmessages/testfsdmessages.cpp - LINK_LIBRARIES blackconfig core tests_test Qt::Core Qt::Test + LINK_LIBRARIES config core tests_test Qt::Core Qt::Test ) diff --git a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp index 153444924..7b5ceea5e 100644 --- a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp +++ b/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp @@ -8,7 +8,7 @@ * \ingroup testblackfsd */ -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackcore/fsd/fsdclient.h" #include "blackmisc/aviation/flightplan.h" #include "blackmisc/network/clientprovider.h" @@ -30,7 +30,7 @@ using namespace BlackMisc::Geo; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Network; using namespace BlackMisc::Simulation; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore::Fsd; namespace BlackFsdTest diff --git a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp b/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp index 8e384d54a..76a6032b3 100644 --- a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp +++ b/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp @@ -8,7 +8,7 @@ * \ingroup testblackfsd */ -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackcore/fsd/addatc.h" #include "blackcore/fsd/addpilot.h" #include "blackcore/fsd/atcdataupdate.h" @@ -45,7 +45,7 @@ using namespace BlackMisc::Aviation; using namespace BlackMisc::Network; -using namespace BlackConfig; +using namespace swift::config; using namespace BlackCore::Fsd; namespace BlackMiscTest diff --git a/tests/blackmisc/CMakeLists.txt b/tests/blackmisc/CMakeLists.txt index 4becd8591..96ee8934c 100644 --- a/tests/blackmisc/CMakeLists.txt +++ b/tests/blackmisc/CMakeLists.txt @@ -15,7 +15,7 @@ add_swift_test( add_swift_test( NAME misc_aviation_aircraftsituation SOURCES aviation/testaircraftsituation/testaircraftsituation.cpp - LINK_LIBRARIES blackconfig misc tests_test Qt::Core + LINK_LIBRARIES config misc tests_test Qt::Core ) add_swift_test( diff --git a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp b/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp index 334f2a41e..9ca16b08b 100644 --- a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp +++ b/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.cpp @@ -5,7 +5,7 @@ //! \file //! \ingroup testblackmisc -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/aviation/aircraftsituationchange.h" #include "blackmisc/aviation/aircraftsituationlist.h" #include "blackmisc/network/fsdsetup.h" @@ -19,7 +19,7 @@ #include #include -using namespace BlackConfig; +using namespace swift::config; using namespace BlackMisc; using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; diff --git a/tests/blackmisc/testcompress/testcompress.cpp b/tests/blackmisc/testcompress/testcompress.cpp index 5c2f492c9..03012a063 100644 --- a/tests/blackmisc/testcompress/testcompress.cpp +++ b/tests/blackmisc/testcompress/testcompress.cpp @@ -8,7 +8,7 @@ * \ingroup testblackmisc */ -#include "blackconfig/buildconfig.h" +#include "config/buildconfig.h" #include "blackmisc/compressutils.h" #include "blackmisc/swiftdirectories.h" #include "blackmisc/directoryutils.h" @@ -21,7 +21,7 @@ #include using namespace BlackMisc; -using namespace BlackConfig; +using namespace swift::config; namespace BlackMiscTest {