refactor: Rename BlackConfig to swift::config

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)
 

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)

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);
     }
 

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 <QGuiApplication>
 #include <QQmlApplicationEngine>
@@ -19,7 +19,7 @@
 #include <QThread>
 #include <QTimer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 using namespace BlackCore;

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)

src/blackconfig/buildconfig_gen.inc.in

@@ -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

src/blackcore/CMakeLists.txt

@@ -256,7 +256,7 @@ target_link_libraries(core
             sound
             externals_sodium
             msgpack-cxx
-            blackconfig
+            config
         PRIVATE
             Qt::Qml
             Qt::Xml

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 <QtMath>
 #include <QDebug>
@@ -18,7 +18,7 @@
 
 using namespace BlackMisc;
 using namespace BlackSound::SampleProvider;
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackCore::Afv::Audio
 {

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;
 

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 <QJsonObject>
 #include <QJsonArray>
@@ -19,7 +19,7 @@
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackCore::Afv::Connection
 {

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 <QNetworkDatagram>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackCore::Afv::Crypto;
 

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 <QCoreApplication>
 #include <QDateTime>
@@ -43,7 +43,7 @@
 #include <QWriteLocker>
 #include <Qt>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;

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 <QSysInfo>
 #include <cstdlib>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;

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 <QStringList>
 

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 <QStringList>

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

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;
 

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 <stdbool.h>
 #include <QStringBuilder>
 #include <QTimer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackcore/context/contextsimulator.cpp

@@ -10,7 +10,7 @@
 
 #include <QFlag>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::PhysicalQuantities;

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 <QObject>
 #include <QString>

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 <QMetaObject>
 #include <QStringBuilder>
@@ -36,7 +36,7 @@
 #include <QtGlobal>
 #include <QPointer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore::Db;
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;

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 <QStringList>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Json;
 using namespace BlackMisc::Network;

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;
 

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;

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 <QHostAddress>
 #include <QStringBuilder>
 #include <QStringView>
 #include <QNetworkReply>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore::Vatsim;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

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;

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 <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
@@ -13,7 +13,7 @@
 #include <QUrl>
 
 using namespace BlackMisc::Db;
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackCore
 {

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 <QStringBuilder>
 #include <QByteArray>
@@ -25,7 +25,7 @@
 #include <QUrl>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;

src/blackcore/simulator.cpp

@@ -26,7 +26,7 @@
 #include <QDesktopServices>
 #include <functional>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;

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 <QFlags>
 #include <QObject>

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 <QDir>
 #include <QJsonDocument>
@@ -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;

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
 {

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 <QLabel>
 #include <QLineEdit>
@@ -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;
 

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 <QAction>
@@ -27,7 +27,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore::Db;

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 <QStringBuilder>
 
 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;

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 <QIntValidator>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 

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 <QProcess>
 #include <QMessageBox>
@@ -19,7 +19,7 @@
 #include <QPointer>
 #include <QDesktopServices>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;

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 <QStringList>
 #include <QFileDialog>
 #include <QPointer>
 #include <QMessageBox>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Simulation::Settings;

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
 {

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 <QLabel>
@@ -28,7 +28,7 @@
 #include <QStringBuilder>
 #include <QTimer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore;
 using namespace BlackCore::Context;
 using namespace BlackGui;

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 <QMessageBox>
 #include <QFileDialog>
@@ -21,7 +21,7 @@
 #include <QPointer>
 #include <QDesktopServices>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;

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 <QDateTime>
 #include <QMessageBox>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;

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 <QPointer>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 using namespace BlackCore::Data;
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackGui::Components
 {

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 <QDialogButtonBox>
 #include <QMessageBox>
@@ -46,7 +46,7 @@
 #include <QtGlobal>
 #include <QPointer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Audio;

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 <QPushButton>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;

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 <QAction>
@@ -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
 {

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 <QString>
 #include <QTableView>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore;
 using namespace BlackCore::Data;
 using namespace BlackGui;

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 <QMessageBox>
 #include <QRegularExpression>
@@ -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
 {

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 <QCheckBox>
@@ -16,7 +16,7 @@
 #include <QtGlobal>
 #include <QPointer>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore::Context;

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 <QDesktopServices>
 #include <QMessageBox>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore::Application;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;

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;

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 <QCompleter>
 #include <QStyledItemDelegate>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;

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 <QAction>
 #include <QCloseEvent>
@@ -52,7 +52,7 @@
 #include <QWhatsThis>
 #include <Qt>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;

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 <QRadioButton>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackCore;
 using namespace BlackCore::Context;
 using namespace BlackMisc::Network;

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 <QDesktopServices>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackGui;

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 <QtGlobal>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 
 namespace BlackGui

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 <QFlags>
 #include <QMenu>

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 <QFlags>
 #include <QMenu>

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 <QFlags>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackGui::Models;

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 <QStringBuilder>
 #include <QPointer>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

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 <QApplication>
 #include <QClipboard>

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 <algorithm>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackGui;
 using namespace BlackGui::Menus;

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

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 <QDir>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo)
 

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)
 

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 <QProcess>
 #include <QMediaDevices>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc::Audio
 {

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)
 

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 <QtGlobal>
 #include <QPair>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
-using namespace BlackConfig;
+using namespace swift::config;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange)
 

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 <QFileInfo>
 #include <QProcess>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc
 {

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 <QCoreApplication>
 #include <QFileInfo>
@@ -22,7 +22,7 @@
 #    include "crashpad/client/simulate_crash.h"
 #endif
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace crashpad;
 

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 <QRegularExpression>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Network;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact)

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 <QJsonObject>
 #include <QJsonValue>

src/blackmisc/db/distribution.cpp

@@ -5,7 +5,7 @@
 #include <QRegularExpression>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 

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"

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 <QStringBuilder>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo)
 

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 <QCoreApplication>
 #include <QDir>
 #include <QUrl>
@@ -16,7 +16,7 @@
 #include <QDateTime>
 #include <QRegularExpression>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Network;
 
 namespace BlackMisc

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 <QCoreApplication>
 #include <QDateTime>
@@ -14,7 +14,7 @@
 #include <QStringBuilder>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc
 {

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 <QCoreApplication>
 #include <QDateTime>
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc
 {

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))
         {

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 <QAbstractSocket>
 #include <QDateTime>
 #include <QMetaEnum>
@@ -22,7 +22,7 @@
 #include <QVariant>
 #include <QRegularExpression>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 

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 <QProcess>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc::Network
 {

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 <QJsonValue>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CPlatform)
 

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 <QJsonDocument>
 #include <QJsonObject>
@@ -22,7 +22,7 @@
 #include <QStringBuilder>
 #include <QFileInfo>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Db;

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 <QStringBuilder>
 #include <QJsonValue>
@@ -24,7 +24,7 @@
 #include <QDir>
 #include <tuple>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Math;
 using namespace BlackMisc::Aviation;

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 <QDir>
 #include <QFile>
@@ -14,7 +14,7 @@
 #include <QSettings>
 #include <QStandardPaths>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc::Simulation::Flightgear
 {

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 <QDateTime>
 #include <QDir>
@@ -28,7 +28,7 @@
 #include <tuple>
 #include <QStringView>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Simulation::FsCommon;

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 <QDir>
 #include <QList>
@@ -25,7 +25,7 @@
 #include <QSettings>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc::Simulation::FsCommon
 {

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 <QDir>
 #include <QList>
@@ -23,7 +23,7 @@
 #include <QSettings>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 
 namespace BlackMisc::Simulation::FsCommon
 {

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 <QDateTime>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;

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 <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Network;

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 <QDateTime>
 #include <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Math;

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 <array>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Math;

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;
 

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;

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 <QFile>
 #include <QDir>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation::Settings;
 

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
 {

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 <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Simulation::FsCommon;
 using namespace BlackMisc::Simulation::XPlane;

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 <QStringBuilder>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;

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 <QStringBuilder>
 #include <algorithm>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::Simulation::FsCommon;

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 <QJsonValue>
 #include <QtGlobal>
 
-using namespace BlackConfig;
+using namespace swift::config;
 using namespace BlackMisc;
 
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorPluginInfo)