mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-04 00:45:46 +08:00
refactor: Rename blackcore to swift::core
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
using namespace BlackGui;
|
||||
using namespace swift::misc;
|
||||
using namespace swift::misc::audio;
|
||||
using namespace BlackCore;
|
||||
using namespace swift::core;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "blackgui/guiutility.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackcore/context/contextapplication.h"
|
||||
#include "blackcore/context/contextaudio.h"
|
||||
#include "blackcore/context/contextnetwork.h"
|
||||
#include "blackcore/context/contextsimulator.h"
|
||||
#include "blackcore/webdataservices.h"
|
||||
#include "blackcore/corefacadeconfig.h"
|
||||
#include "core/context/contextapplication.h"
|
||||
#include "core/context/contextaudio.h"
|
||||
#include "core/context/contextnetwork.h"
|
||||
#include "core/context/contextsimulator.h"
|
||||
#include "core/webdataservices.h"
|
||||
#include "core/corefacadeconfig.h"
|
||||
#include "misc/audio/notificationsounds.h"
|
||||
#include "misc/icons.h"
|
||||
#include "misc/logcategories.h"
|
||||
@@ -58,8 +58,8 @@ namespace swift::misc
|
||||
class CIdentifiable;
|
||||
}
|
||||
|
||||
using namespace BlackCore;
|
||||
using namespace BlackCore::Context;
|
||||
using namespace swift::core;
|
||||
using namespace swift::core::context;
|
||||
using namespace BlackGui;
|
||||
using namespace BlackGui::Components;
|
||||
using namespace swift::misc;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "blackgui/mainwindowaccess.h"
|
||||
#include "blackgui/managedstatusbar.h"
|
||||
#include "blackgui/guiactionbind.h"
|
||||
#include "blackcore/actionbind.h"
|
||||
#include "core/actionbind.h"
|
||||
#include "misc/network/connectionstatus.h"
|
||||
#include "misc/simulation/simulatedaircraft.h"
|
||||
#include "misc/simulation/autopublishdata.h"
|
||||
@@ -124,8 +124,8 @@ private:
|
||||
QScopedPointer<BlackGui::Components::CModelBrowserDialog> m_modelBrower; //!< model browser
|
||||
QScopedPointer<BlackGui::Components::CAircraftModelSetValidationDialog> m_validationDialog; //!< aircraft model validation dialog
|
||||
swift::misc::CData<swift::misc::simulation::data::TLastAutoPublish> m_lastAutoPublish { this };
|
||||
BlackCore::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
|
||||
BlackCore::CActionBindings m_menuHotkeyHandlers;
|
||||
swift::core::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged };
|
||||
swift::core::CActionBindings m_menuHotkeyHandlers;
|
||||
BlackGui::CManagedStatusBar m_statusBar;
|
||||
swift::misc::CLogHistoryReplica m_logHistoryForLogButtons { this };
|
||||
swift::misc::CLogHistoryReplica m_logHistoryForOverlay { this };
|
||||
|
||||
@@ -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 "blackcore/context/contextownaircraft.h"
|
||||
#include "core/context/contextownaircraft.h"
|
||||
#include "blackgui/guiapplication.h"
|
||||
#include "misc/mixin/mixincompare.h"
|
||||
#include "misc/geo/coordinategeodetic.h"
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <QString>
|
||||
|
||||
using namespace BlackCore;
|
||||
using namespace swift::core;
|
||||
using namespace swift::misc;
|
||||
using namespace BlackGui;
|
||||
using namespace swift::misc::network;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
|
||||
|
||||
#include "swiftguistdapplication.h"
|
||||
#include "blackcore/application.h"
|
||||
#include "blackcore/corefacadeconfig.h"
|
||||
#include "blackcore/coremodeenums.h"
|
||||
#include "core/application.h"
|
||||
#include "core/corefacadeconfig.h"
|
||||
#include "core/coremodeenums.h"
|
||||
#include "misc/dbusserver.h"
|
||||
#include "misc/icons.h"
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
using namespace swift::misc;
|
||||
using namespace BlackCore;
|
||||
using namespace swift::core;
|
||||
|
||||
CSwiftGuiStdApplication::CSwiftGuiStdApplication() : CGuiApplication(CApplicationInfo::swiftPilotClientGui(), CApplicationInfo::PilotClientGui, CIcons::swift1024())
|
||||
{
|
||||
|
||||
@@ -22,10 +22,10 @@
|
||||
#include "blackgui/managedstatusbar.h"
|
||||
#include "blackgui/overlaymessagesframe.h"
|
||||
#include "blackgui/stylesheetutility.h"
|
||||
#include "blackcore/webdataservices.h"
|
||||
#include "blackcore/context/contextnetwork.h"
|
||||
#include "blackcore/context/contextsimulator.h"
|
||||
#include "blackcore/context/contextaudio.h"
|
||||
#include "core/webdataservices.h"
|
||||
#include "core/context/contextnetwork.h"
|
||||
#include "core/context/contextsimulator.h"
|
||||
#include "core/context/contextaudio.h"
|
||||
#include "sound/audioutilities.h"
|
||||
#include "misc/network/networkutils.h"
|
||||
#include "misc/sharedstate/datalinkdbus.h"
|
||||
@@ -48,8 +48,8 @@
|
||||
#include <QHBoxLayout>
|
||||
|
||||
using namespace swift::config;
|
||||
using namespace BlackCore;
|
||||
using namespace BlackCore::Context;
|
||||
using namespace swift::core;
|
||||
using namespace swift::core::context;
|
||||
using namespace swift::misc;
|
||||
using namespace swift::misc::aviation;
|
||||
using namespace swift::misc::network;
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
using namespace swift::config;
|
||||
using namespace BlackGui;
|
||||
using namespace BlackGui::Components;
|
||||
using namespace BlackCore;
|
||||
using namespace swift::core;
|
||||
using namespace swift::misc;
|
||||
using namespace swift::misc::physical_quantities;
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
Reference in New Issue
Block a user