flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-25 10:15:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Rename blackcore to swift::core

Browse Source
This commit is contained in:
Lars Toenning
2024-11-10 20:21:07 +01:00
parent 9142a3649b
commit 3a2447770f
482 changed files with 2611 additions and 2611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/swiftlauncher/main.cpp
View File

@@ -3,10 +3,10 @@
#include "swiftlauncher.h"
#include "blackgui/guiapplication.h"
#include "blackcore/db/databasereaderconfig.h"
#include "core/db/databasereaderconfig.h"
#include "misc/directoryutils.h"
#include "misc/icons.h"
#include "blackcore/webdataservices.h"
#include "core/webdataservices.h"
#include <QtGlobal>
#include <QApplication>
@@ -15,8 +15,8 @@
using namespace BlackGui;
using namespace swift::misc;
using namespace BlackCore;
using namespace BlackCore::Db;
using namespace swift::core;
using namespace swift::core::db;
//! Init the DB cache from local resource files if the cache has no timestamp or the cache was not updated since 2 years
void initDbCacheFromResourceFileIfRequired(CGuiApplication &a)
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") };
a.addParserOption(installerOption);
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
a.initAndStartWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
a.initAndStartWebDataServices(swift::core::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
const bool installMode = a.isParserOptionSet(installerOption);
if (installMode) initDbCacheFromResourceFileIfRequired(a);

14
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -8,11 +8,11 @@
#include "blackgui/components/texteditdialog.h"
#include "blackgui/guiapplication.h"
#include "blackgui/stylesheetutility.h"
#include "blackcore/context/contextapplicationproxy.h"
#include "blackcore/setupreader.h"
#include "core/context/contextapplicationproxy.h"
#include "core/setupreader.h"
#include "sound/audioutilities.h"
#include "misc/simulation/fscommon/fsdirectories.h"
#include "blackcore/context/contextnetwork.h"
#include "core/context/contextnetwork.h"
#include "misc/network/networkutils.h"
#include "misc/dbusserver.h"
#include "misc/swiftdirectories.h"
@@ -38,10 +38,10 @@
using namespace swift::config;
using namespace BlackGui;
using namespace BlackGui::Components;
using namespace BlackCore;
using namespace BlackCore::Context;
using namespace BlackCore::Data;
using namespace BlackCore::Vatsim;
using namespace swift::core;
using namespace swift::core::context;
using namespace swift::core::data;
using namespace swift::core::vatsim;
using namespace swift::sound;
using namespace swift::misc;
using namespace swift::misc::db;

10
src/swiftlauncher/swiftlauncher.h
View File

@@ -9,9 +9,9 @@
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/overlaymessagesframe.h"
#include "blackgui/mainwindowaccess.h"
#include "blackcore/data/globalsetup.h"
#include "blackcore/data/launchersetup.h"
#include "blackcore/coremodeenums.h"
#include "core/data/globalsetup.h"
#include "core/data/launchersetup.h"
#include "core/coremodeenums.h"
#include "misc/simulation/data/modelcaches.h"
#include "misc/db/artifact.h"
#include "misc/identifiable.h"
@@ -100,7 +100,7 @@ private:
QScopedPointer<Ui::CSwiftLauncher> ui;
QScopedPointer<BlackGui::Components::CConfigurationWizard> m_wizard;
QScopedPointer<BlackGui::Components::CTextEditDialog> m_textEditDialog;
swift::misc::CData<BlackCore::Data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
swift::misc::CData<swift::core::data::TLauncherSetup> m_setup { this }; //!< setup, i.e. last user selection
swift::misc::CLogHistoryReplica m_logHistory { this }; //!< for the overlay
#ifdef Q_OS_MAC
swift::misc::CMacOSMicrophoneAccess m_micAccess;
@@ -114,7 +114,7 @@ private:
int m_startGuiWaitCycles = 0;
//! Get core mode
BlackCore::CoreModes::CoreMode getCoreMode() const;
swift::core::CoreModes::CoreMode getCoreMode() const;
//! Selected window mode
BlackGui::CEnableForFramelessWindow::WindowMode getWindowMode() const;