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

refactor: Rename remaining "black" identifiers

Browse Source
This commit is contained in:
Lars Toenning
2024-11-10 21:50:35 +01:00
parent 6d1812b164
commit cc1e41fc59
579 changed files with 1758 additions and 1869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/fsxcommon/fsxcommonexport.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_MACROS_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_MACROS_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_MACROS_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_MACROS_H
#include <QtGlobal>

2
src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp
View File

@@ -19,7 +19,7 @@ using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::config;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
CFsxSettingsComponent::CFsxSettingsComponent(QWidget *parent) : QFrame(parent),
ui(new Ui::CFsxSettingsComponent)

6
src/plugins/simulator/fsxcommon/fsxsettingscomponent.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
#define BLACKSIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "misc/simulation/simulatorinfo.h"
@@ -20,7 +20,7 @@ namespace swift::gui
{
class COverlayMessagesFrame;
}
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
class CSimulatorFsxCommon;

4
src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp
View File

@@ -13,9 +13,9 @@
using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
const QString &CSimConnectDefinitions::requestToString(Request request)
{

6
src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "plugins/simulator/fsxcommon/simconnectwindows.h"
@@ -18,7 +18,7 @@ namespace swift::misc::aviation
{
class CAircraftParts;
}
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
//! Data struct of our own aircraft
//! \sa SimConnect variables http://msdn.microsoft.com/en-us/library/cc526981.aspx

2
src/plugins/simulator/fsxcommon/simconnectobject.cpp
View File

@@ -15,7 +15,7 @@ using namespace swift::misc::aviation;
using namespace swift::misc::simulation;
using namespace swift::core;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
CSimConnectObject::CSimConnectObject()
{

6
src/plugins/simulator/fsxcommon/simconnectobject.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
@@ -14,7 +14,7 @@
#include <QStringList>
#include <QByteArray>
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
//! Class representing a SimConnect object
class FSXCOMMON_EXPORT CSimConnectObject

4
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
View File

@@ -20,11 +20,11 @@
using namespace swift::config;
using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::Fsx;
using namespace swift::misc::simulation::fsx;
using namespace swift::misc::network;
using namespace swift::gui;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
CSimConnectSettingsComponent::CSimConnectSettingsComponent(QWidget *parent) : COverlayMessagesFrame(parent),
ui(new Ui::CSimConnectSettingsComponent)

6
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "gui/overlaymessagesframe.h"
@@ -18,7 +18,7 @@ namespace Ui
{
class CSimConnectSettingsComponent;
}
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
/*!
* A component that gathers all SimConnect related settings.

4
src/plugins/simulator/fsxcommon/simconnectsymbols.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"

4
src/plugins/simulator/fsxcommon/simconnectwindows.h
View File

@@ -4,8 +4,8 @@
// in P3Dv4 the simconnect.h does not include windows.h
// here we include windows.h first
#ifndef BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#define BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#ifndef SWIFT_SIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#define SWIFT_SIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#ifndef NOMINMAX
# define NOMINMAX

8
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -39,12 +39,12 @@ using namespace swift::misc::network;
using namespace swift::misc::math;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::simulation::Fsx;
using namespace swift::misc::simulation::fsx;
using namespace swift::misc::simulation::settings;
using namespace swift::core;
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
CSimulatorFsxCommon::CSimulatorFsxCommon(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,
@@ -1393,7 +1393,7 @@ namespace BlackSimPlugin::FsxCommon
void CSimulatorFsxCommon::registerHelp()
{
if (CSimpleCommandParser::registered("BlackSimPlugin::CSimulatorFsxCommon::CSimulatorFsxCommon")) { return; }
if (CSimpleCommandParser::registered("swift::simplugin::fsxcommon::CSimulatorFsxCommon::CSimulatorFsxCommon")) { return; }
CSimpleCommandParser::registerCommand({ ".drv", "alias: .driver .plugin" });
CSimpleCommandParser::registerCommand({ ".drv sendid on|off", "Trace simConnect sendId on|off" });
CSimpleCommandParser::registerCommand({ ".drv sboffsets on|off", "SB offsets via simConnect on|off" });

10
src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
@@ -31,7 +31,7 @@
#include <QList>
#include <QFutureWatcher>
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
//! SimConnect Event IDs
enum EventIds
@@ -115,7 +115,7 @@ namespace BlackSimPlugin::FsxCommon
};
//! FSX Simulator Implementation
class FSXCOMMON_EXPORT CSimulatorFsxCommon : public FsCommon::CSimulatorFsCommon
class FSXCOMMON_EXPORT CSimulatorFsxCommon : public fscommon::CSimulatorFsCommon
{
Q_OBJECT
Q_INTERFACES(swift::core::ISimulator)
@@ -469,7 +469,7 @@ namespace BlackSimPlugin::FsxCommon
void updateProbeFromSimulator(const swift::misc::aviation::CCallsign &callsign, const DataDefinitionPosData &remoteAircraftData);
//! Customization point for adjusting altitude to compensate for temperature effect
virtual void setTrueAltitude(swift::misc::aviation::CAircraftSituation &aircraftSituation, const BlackSimPlugin::FsxCommon::DataDefinitionOwnAircraft &simulatorOwnAircraft);
virtual void setTrueAltitude(swift::misc::aviation::CAircraftSituation &aircraftSituation, const swift::simplugin::fsxcommon::DataDefinitionOwnAircraft &simulatorOwnAircraft);
//! Called when data about our own aircraft are received
void updateOwnAircraftFromSimulator(const DataDefinitionOwnAircraft &simulatorOwnAircraft);

2
src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp
View File

@@ -6,7 +6,7 @@
using namespace swift::gui;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
CSimulatorFsxConfigWindow::CSimulatorFsxConfigWindow(const QString &simulator, QWidget *parent) : CPluginConfigWindow(parent),
m_simulator(simulator),

6
src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
#define BLACKSIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
#ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
#define SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
#include "gui/pluginconfigwindow.h"
@@ -15,7 +15,7 @@ namespace Ui
{
class CSimulatorFsxConfigWindow;
}
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
/*!
* A window that lets user set up the FSX plugin.

8
src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.ui
View File

@@ -55,7 +55,7 @@
<number>0</number>
</property>
<item>
<widget class="BlackSimPlugin::FsxCommon::CSimConnectSettingsComponent" name="comp_SimConnectSettings"/>
<widget class="swift::simplugin::fsxcommon::CSimConnectSettingsComponent" name="comp_SimConnectSettings"/>
</item>
</layout>
</widget>
@@ -77,7 +77,7 @@
<number>0</number>
</property>
<item alignment="Qt::AlignTop">
<widget class="BlackSimPlugin::FsxCommon::CFsxSettingsComponent" name="comp_FsxSettings">
<widget class="swift::simplugin::fsxcommon::CFsxSettingsComponent" name="comp_FsxSettings">
<property name="minimumSize">
<size>
<width>0</width>
@@ -101,13 +101,13 @@
</widget>
<customwidgets>
<customwidget>
<class>BlackSimPlugin::FsxCommon::CSimConnectSettingsComponent</class>
<class>swift::simplugin::fsxcommon::CSimConnectSettingsComponent</class>
<extends>QFrame</extends>
<header>simconnectsettingscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackSimPlugin::FsxCommon::CFsxSettingsComponent</class>
<class>swift::simplugin::fsxcommon::CFsxSettingsComponent</class>
<extends>QFrame</extends>
<header>fsxsettingscomponent.h</header>
<container>1</container>

4
src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp
View File

@@ -23,9 +23,9 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::simulation::Fsx;
using namespace swift::misc::simulation::fsx;
namespace BlackSimPlugin::FsxCommon
namespace swift::simplugin::fsxcommon
{
void CALLBACK CSimulatorFsxCommon::SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext)
{