flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-12 04:35:41 +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/emulated/simulatoremulated.cpp
View File

@@ -24,7 +24,7 @@ using namespace swift::misc::simulation::settings;
using namespace swift::core;
using namespace swift::core::context;
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
CSimulatorEmulated::CSimulatorEmulated(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,
@@ -248,7 +248,7 @@ namespace BlackSimPlugin::Emulated
void CSimulatorEmulated::registerHelp()
{
if (CSimpleCommandParser::registered("BlackSimPlugin::Swift::CSimulatorEmulated")) { return; }
if (CSimpleCommandParser::registered("swift::simplugin::emulated::CSimulatorEmulated")) { return; }
CSimpleCommandParser::registerCommand({ ".drv", "alias: .driver .plugin" });
CSimpleCommandParser::registerCommand({ ".drv show", "show emulated driver window" });
CSimpleCommandParser::registerCommand({ ".drv hide", "hide emulated driver window" });

24
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATED_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATED_H
#ifndef SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATED_H
#define SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATED_H
#include "../plugincommon/simulatorplugincommon.h"
#include "misc/aviation/comsystem.h"
@@ -21,10 +21,10 @@
#include <QTimer>
#include <QPointer>
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
//! swift simulator implementation
class CSimulatorEmulated : public Common::CSimulatorPluginCommon
class CSimulatorEmulated : public common::CSimulatorPluginCommon
{
Q_OBJECT
Q_INTERFACES(swift::core::ISimulator)
@@ -75,8 +75,8 @@ namespace BlackSimPlugin::Emulated
// functions logged and used
//! \ingroup swiftdotcommands
//! <pre>
//! .drv show show emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated
//! .drv hide hide emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated
//! .drv show show emulated driver window swift::simplugin::emulated::CSimulatorEmulated
//! .drv hide hide emulated driver window swift::simplugin::emulated::CSimulatorEmulated
//! </pre>
//! \copydoc swift::core::ISimulator::parseCommandLine
virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override;
@@ -88,27 +88,27 @@ namespace BlackSimPlugin::Emulated
swift::misc::simulation::CSimulatorInfo getEmulatedSimulator() const;
//! Internal own aircraft
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
const swift::misc::simulation::CSimulatedAircraft &getInternalOwnAircraft() const { return m_myAircraft; }
//! Simulator internal change of COM values
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
bool changeInternalCom(const swift::misc::simulation::CSimulatedAircraft &aircraft);
//! Simulator internal change of COM values
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
bool changeInternalCom(const swift::misc::aviation::CComSystem &comSystem, swift::misc::aviation::CComSystem::ComUnit unit);
//! Simulator internal change of SELCAL
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
bool changeInternalSelcal(const swift::misc::aviation::CSelcal &selcal);
//! Simulator internal change of situation
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
bool changeInternalSituation(const swift::misc::aviation::CAircraftSituation &situation);
//! Simulator internal change of parts
//! \remark normally used by corresponding BlackSimPlugin::Emulated::CSimulatorEmulatedMonitorDialog
//! \remark normally used by corresponding swift::simplugin::emulated::CSimulatorEmulatedMonitorDialog
bool changeInternalParts(const swift::misc::aviation::CAircraftParts &parts);
//! Interpolator fetch time, <=0 stops

2
src/plugins/simulator/emulated/simulatoremulatedfactory.cpp
View File

@@ -9,7 +9,7 @@
using namespace swift::misc;
using namespace swift::misc::simulation;
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
swift::core::ISimulator *CSimulatorEmulatedFactory::create(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

12
src/plugins/simulator/emulated/simulatoremulatedfactory.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H
#ifndef SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H
#define SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H
#include "core/simulator.h"
#include "misc/simulation/simulatorplugininfo.h"
@@ -12,7 +12,7 @@
#include <QObject>
#include <QtPlugin>
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
//! Factory implementation to create CSimulatorEmulated instances
class CSimulatorEmulatedFactory :
@@ -26,9 +26,9 @@ namespace BlackSimPlugin::Emulated
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override;

2
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp
View File

@@ -19,7 +19,7 @@ using namespace swift::gui;
using namespace swift::gui::components;
using namespace swift::gui::editors;
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
const QStringList &CSimulatorEmulatedMonitorDialog::getLogCategories()
{

6
src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H
#ifndef SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H
#define SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDMONITORDIALOG_H
#include "misc/simulation/simulatedaircraft.h"
#include "misc/network/textmessage.h"
@@ -20,7 +20,7 @@ namespace Ui
{
class CSimulatorEmulatedMonitorDialog;
}
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
class CSimulatorEmulated;

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp
View File

@@ -4,7 +4,7 @@
#include "simulatoremulatedconfig.h"
#include "simulatoremulatedconfigwidget.h"
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
CSimulatorEmulatedConfig::CSimulatorEmulatedConfig(QObject *parent) : QObject(parent)
{

6
src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
View File

@@ -3,12 +3,12 @@
//! \file
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#ifndef SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#define SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIG_H
#include "gui/pluginconfig.h"
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
/*!
* Window for setting up the FSX plugin.

2
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp
View File

@@ -6,7 +6,7 @@
using namespace swift::gui;
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
CSimulatorEmulatedConfigWidget::CSimulatorEmulatedConfigWidget(QWidget *parent) : swift::gui::CPluginConfigWindow(parent),
ui(new Ui::CSimulatorEmulatedConfigWidget)

6
src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#ifndef SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#define SWIFT_SIMPLUGIN_EMULATED_SIMULATOREMULATEDCONFIGWIDGET_H
#include "gui/pluginconfigwindow.h"
#include <QScopedPointer>
@@ -13,7 +13,7 @@ namespace Ui
{
class CSimulatorEmulatedConfigWidget;
}
namespace BlackSimPlugin::Emulated
namespace swift::simplugin::emulated
{
/*!
* Configuration window for CSimulatorEmulatedConfig

2
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp
View File

@@ -11,7 +11,7 @@ class QDBusConnection;
#define FGSWIFTBUS_SERVICE_SERVICENAME "org.swift-project.fgswiftbus"
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
CFGSwiftBusServiceProxy::CFGSwiftBusServiceProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent)
{

8
src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H
#define BLACKSIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H
#ifndef SWIFT_SIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H
#define SWIFT_SIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H
#include "misc/genericdbusinterface.h"
@@ -26,7 +26,7 @@ class QDBusPendingCallWatcher;
#define FGSWIFTBUS_SERVICE_OBJECTPATH "/fgswiftbus/service"
//! \endcond
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
struct FlightgearData;
@@ -95,7 +95,7 @@ namespace BlackSimPlugin::Flightgear
signals:
//! Emitted if an asynchronous method call caused a DBus error
BLACK_NO_RELAY void asyncMethodError(QDBusError error);
SWIFT_NO_RELAY void asyncMethodError(QDBusError error);
//! Own aircraft model changed
void aircraftModelChanged(

2
src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp
View File

@@ -11,7 +11,7 @@ using namespace swift::misc::aviation;
using namespace swift::misc::geo;
using namespace swift::misc::physical_quantities;
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
CFGSwiftBusTrafficProxy::CFGSwiftBusTrafficProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent)
{

12
src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H
#define BLACKSIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H
#ifndef SWIFT_SIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H
#define SWIFT_SIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H
#include "misc/genericdbusinterface.h"
#include "misc/aviation/aircraftsituation.h"
@@ -25,7 +25,7 @@ class QDBusConnection;
#define FGSWIFTBUS_TRAFFIC_OBJECTPATH "/fgswiftbus/traffic"
//! \endcond
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
//! List of doubles
using QDoubleList = QList<double>;
@@ -205,13 +205,13 @@ namespace BlackSimPlugin::Flightgear
void removeAllPlanes();
//! Set the position of multiple traffic aircrafts
void setPlanesPositions(const BlackSimPlugin::Flightgear::PlanesPositions &planesPositions);
void setPlanesPositions(const swift::simplugin::flightgear::PlanesPositions &planesPositions);
//! Set the surfaces of multiple traffic aircrafts
void setPlanesSurfaces(const BlackSimPlugin::Flightgear::PlanesSurfaces &planesSurfaces);
void setPlanesSurfaces(const swift::simplugin::flightgear::PlanesSurfaces &planesSurfaces);
//! Set the transponders of multiple traffic aircrafts
void setPlanesTransponders(const BlackSimPlugin::Flightgear::PlanesTransponders &planesTransponders);
void setPlanesTransponders(const swift::simplugin::flightgear::PlanesTransponders &planesTransponders);
//! Get remote aircrafts data (lat, lon, elevation and CG)
void getRemoteAircraftData(const QStringList &callsigns, const RemoteAircraftDataCallback &setter) const;

2
src/plugins/simulator/flightgear/flightgearmpaircraft.cpp
View File

@@ -10,7 +10,7 @@ using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace swift::misc::simulation;
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
CFlightgearMPAircraft::CFlightgearMPAircraft()
{}

6
src/plugins/simulator/flightgear/flightgearmpaircraft.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
#define BLACKSIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
#ifndef SWIFT_SIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
#define SWIFT_SIMPLUGIN_FLIGHTGEAR_FGPLANEMPAIRCRAFT_H
#include "misc/simulation/simulatedaircraft.h"
#include "misc/simulation/interpolation/interpolatormulti.h"
@@ -15,7 +15,7 @@ namespace swift::core
{
class ISimulator;
}
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
//! Class representing a Flightgear multiplayer aircraft
class CFlightgearMPAircraft

14
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -72,7 +72,7 @@ namespace
}
}
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
int FGSWIFTBUS_API_VERSION = -1;
QList<int> incompatibleVersions = { 1, 2 };
@@ -152,7 +152,7 @@ namespace BlackSimPlugin::Flightgear
u++;
}
if (parts.isNull() && Flightgear::FGSWIFTBUS_API_VERSION >= 2)
if (parts.isNull() && flightgear::FGSWIFTBUS_API_VERSION >= 2)
{
PlanesSurfaces surfaces;
surfaces.push_back(callsign, parts);
@@ -539,7 +539,7 @@ namespace BlackSimPlugin::Flightgear
PlanesPositions pos;
pos.push_back(newRemoteAircraft.getSituation());
m_trafficProxy->setPlanesPositions(pos);
if (Flightgear::FGSWIFTBUS_API_VERSION >= 2)
if (flightgear::FGSWIFTBUS_API_VERSION >= 2)
{
PlanesSurfaces surfaces;
surfaces.push_back(newRemoteAircraft.getCallsign(), newRemoteAircraft.getParts());
@@ -693,7 +693,7 @@ namespace BlackSimPlugin::Flightgear
} // all callsigns
if (!planesTransponders.isEmpty() && Flightgear::FGSWIFTBUS_API_VERSION >= 2)
if (!planesTransponders.isEmpty() && flightgear::FGSWIFTBUS_API_VERSION >= 2)
{
m_trafficProxy->setPlanesTransponders(planesTransponders);
}
@@ -707,7 +707,7 @@ namespace BlackSimPlugin::Flightgear
m_trafficProxy->setPlanesPositions(planesPositions);
}
if (!planesSurfaces.isEmpty() && Flightgear::FGSWIFTBUS_API_VERSION >= 2)
if (!planesSurfaces.isEmpty() && flightgear::FGSWIFTBUS_API_VERSION >= 2)
{
m_trafficProxy->setPlanesSurfaces(planesSurfaces);
}
@@ -1083,9 +1083,9 @@ namespace BlackSimPlugin::Flightgear
bool result = service.isValid() && traffic.isValid();
if (!result) { return; }
Flightgear::FGSWIFTBUS_API_VERSION = service.getVersionNumber();
flightgear::FGSWIFTBUS_API_VERSION = service.getVersionNumber();
if (Flightgear::incompatibleVersions.contains(Flightgear::FGSWIFTBUS_API_VERSION))
if (flightgear::incompatibleVersions.contains(flightgear::FGSWIFTBUS_API_VERSION))
{
CLogMessage(this).error(u"This version of swift is not compatible with this Flightgear version. For further information check http://wiki.flightgear.org/Swift.");
return;

14
src/plugins/simulator/flightgear/simulatorflightgear.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_H
#define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_H
#include "flightgearmpaircraft.h"
#include "plugins/simulator/flightgearconfig/simulatorflightgearconfig.h"
@@ -57,7 +57,7 @@ namespace swift::misc
}
}
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
extern int FGSWIFTBUS_API_VERSION;
extern QList<int> incompatibleVersions;
@@ -106,7 +106,7 @@ namespace BlackSimPlugin::Flightgear
};
//! Flightgear ISimulator implementation
class CSimulatorFlightgear : public Common::CSimulatorPluginCommon
class CSimulatorFlightgear : public common::CSimulatorPluginCommon
{
Q_OBJECT
@@ -291,9 +291,9 @@ namespace BlackSimPlugin::Flightgear
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorFlightgearListener(info); }

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp
View File

@@ -6,7 +6,7 @@
class QWidget;
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
CSimulatorFlightgearConfig::CSimulatorFlightgearConfig(QObject *parent) : QObject(parent)
{

6
src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_H
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
@@ -18,7 +18,7 @@ namespace swift::gui
{
class CPluginConfigWindow;
}
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
/*!
* Config plugin for the Flightgear plugin.

2
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp
View File

@@ -14,7 +14,7 @@ using namespace swift::misc;
using namespace swift::misc::simulation::settings;
// using namespace swift::misc::simulation::Flightgear;
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
CSimulatorFlightgearConfigWindow::CSimulatorFlightgearConfigWindow(QWidget *parent) : CPluginConfigWindow(parent),
ui(new Ui::CSimulatorFlightgearConfigWindow)

6
src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#define BLACKSIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FLIGHTGEAR_CONFIG_WINDOW_H
#include "gui/pluginconfigwindow.h"
#include "misc/simulation/settings/fgswiftbussettings.h"
@@ -16,7 +16,7 @@ namespace Ui
{
class CSimulatorFlightgearConfigWindow;
}
namespace BlackSimPlugin::Flightgear
namespace swift::simplugin::flightgear
{
/*!
* A window that shows all the Flightgear plugin options.

6
src/plugins/simulator/fs9/callbackwrapper.h
View File

@@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_CALLBACK_WRAPPER_H
#define BLACKSIMPLUGIN_FS9_CALLBACK_WRAPPER_H
#ifndef SWIFT_SIMPLUGIN_FS9_CALLBACK_WRAPPER_H
#define SWIFT_SIMPLUGIN_FS9_CALLBACK_WRAPPER_H
#include <QObject>
#include <QPointer>
#include <dplay8.h>
#include <functional>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Template, wrapping the C-style DirectPlay handler callback to a class member
template <class Object, class ReturnType, class Argument1, class Argument2>

2
src/plugins/simulator/fs9/directplayerror.cpp
View File

@@ -4,7 +4,7 @@
#include "directplayerror.h"
#include "misc/logmessage.h"
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
HRESULT logDirectPlayError(HRESULT error)
{

6
src/plugins/simulator/fs9/directplayerror.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FS9_DIRECTPLAYERROR_H
#define BLACKSIMPLUGIN_FS9_DIRECTPLAYERROR_H
#ifndef SWIFT_SIMPLUGIN_FS9_DIRECTPLAYERROR_H
#define SWIFT_SIMPLUGIN_FS9_DIRECTPLAYERROR_H
#ifndef NOMINMAX
# define NOMINMAX
@@ -12,7 +12,7 @@
#include <dplay8.h>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Print the direct play error
HRESULT logDirectPlayError(HRESULT error);

2
src/plugins/simulator/fs9/directplaypeer.cpp
View File

@@ -15,7 +15,7 @@
using namespace swift::misc;
using namespace swift::misc::aviation;
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
const QStringList &CDirectPlayPeer::getLogCategories()
{

6
src/plugins/simulator/fs9/directplaypeer.h
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_DIRECTPLAY_PEER_H
#define BLACKSIMPLUGIN_FS9_DIRECTPLAY_PEER_H
#ifndef SWIFT_SIMPLUGIN_FS9_DIRECTPLAY_PEER_H
#define SWIFT_SIMPLUGIN_FS9_DIRECTPLAY_PEER_H
#include "fs9.h"
#include "hostnode.h"
@@ -16,7 +16,7 @@
#include <functional>
#include <atomic>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
HRESULT inline s_success_pending() { return DPNSUCCESS_PENDING; }
bool inline isPending(HRESULT hr) { return hr == s_success_pending(); }

6
src/plugins/simulator/fs9/directplayutils.h
View File

@@ -3,10 +3,10 @@
//! \file
#ifndef BLACKSIMPLUGIN_FS9_DIRECTPLAYUTILS_H
#define BLACKSIMPLUGIN_FS9_DIRECTPLAYUTILS_H
#ifndef SWIFT_SIMPLUGIN_FS9_DIRECTPLAYUTILS_H
#define SWIFT_SIMPLUGIN_FS9_DIRECTPLAYUTILS_H
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Safely release a COM allocated object
template <class T>

6
src/plugins/simulator/fs9/fs9.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FS9_FS9SDK_H
#define BLACKSIMPLUGIN_FS9_FS9SDK_H
#ifndef SWIFT_SIMPLUGIN_FS9_FS9SDK_H
#define SWIFT_SIMPLUGIN_FS9_FS9SDK_H
#include <QByteArray>
#include <QString>
@@ -15,7 +15,7 @@
#endif
#include <dplay8.h>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! FS9 SDK
class CFs9Sdk

4
src/plugins/simulator/fs9/fs9client.cpp
View File

@@ -21,9 +21,9 @@ using namespace swift::misc::simulation;
using namespace swift::misc::physical_quantities;
using namespace swift::misc::geo;
using namespace swift::core;
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
CFs9Client::CFs9Client(const CSimulatedAircraft &remoteAircraft,
const CTime &updateInterval,

6
src/plugins/simulator/fs9/fs9client.h
View File

@@ -18,7 +18,7 @@ namespace swift::core
{
class ISimulator;
}
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Class faking a FS9 multiplayer client connection
class CFs9Client : public CDirectPlayPeer
@@ -68,7 +68,7 @@ namespace BlackSimPlugin::Fs9
signals:
//! Client status changed
void statusChanged(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
void statusChanged(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft, swift::simplugin::fs9::CFs9Client::ClientStatus);
protected:
//! \copydoc QObject::timerEvent
@@ -112,6 +112,6 @@ namespace BlackSimPlugin::Fs9
};
} // ns
Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Client::ClientStatus)
Q_DECLARE_METATYPE(swift::simplugin::fs9::CFs9Client::ClientStatus)
#endif // guard

2
src/plugins/simulator/fs9/fs9host.cpp
View File

@@ -15,7 +15,7 @@
using namespace swift::misc;
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
CFs9Host::CFs9Host(QObject *parent) : CDirectPlayPeer(sApp->swiftVersionString(), parent)
{

6
src/plugins/simulator/fs9/fs9host.h
View File

@@ -8,7 +8,7 @@
//! \file
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Class encapsulating a FS9 host
class CFs9Host : public CDirectPlayPeer
@@ -41,7 +41,7 @@ namespace BlackSimPlugin::Fs9
signals:
//! Hosting status changed
void statusChanged(BlackSimPlugin::Fs9::CFs9Host::HostStatus);
void statusChanged(swift::simplugin::fs9::CFs9Host::HostStatus);
private:
//! Start host session
@@ -54,6 +54,6 @@ namespace BlackSimPlugin::Fs9
};
} // ns
Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Host::HostStatus)
Q_DECLARE_METATYPE(swift::simplugin::fs9::CFs9Host::HostStatus)
#endif // guard

2
src/plugins/simulator/fs9/hostnode.cpp
View File

@@ -4,7 +4,7 @@
#include "hostnode.h"
#include "directplayutils.h"
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
CHostNode::CHostNode()
{

6
src/plugins/simulator/fs9/hostnode.h
View File

@@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_HOST_NODE_H
#define BLACKSIMPLUGIN_FS9_HOST_NODE_H
#ifndef SWIFT_SIMPLUGIN_FS9_HOST_NODE_H
#define SWIFT_SIMPLUGIN_FS9_HOST_NODE_H
#include <QString>
#include <dplay8.h>
//! \file
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Class representing a enumerated host node
struct CHostNode

2
src/plugins/simulator/fs9/lobbyclient.cpp
View File

@@ -21,7 +21,7 @@
using namespace swift::misc;
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
CLobbyClient::CLobbyClient(QObject *parent)
: QObject(parent),

6
src/plugins/simulator/fs9/lobbyclient.h
View File

@@ -1,15 +1,15 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_LOBBYCLIENT_H
#define BLACKSIMPLUGIN_FS9_LOBBYCLIENT_H
#ifndef SWIFT_SIMPLUGIN_FS9_LOBBYCLIENT_H
#define SWIFT_SIMPLUGIN_FS9_LOBBYCLIENT_H
#include "callbackwrapper.h"
#include <QDebug>
#include <dplay8.h>
#include <dplobby8.h>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Lobby client launching and connecting FS9
class CLobbyClient : public QObject

2
src/plugins/simulator/fs9/multiplayerpacketparser.cpp
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "multiplayerpacketparser.h"
namespace BlackSimPlugin::Fs9::Private
namespace swift::simplugin::fs9::private_ns
{
QByteArray readValue(const QByteArray &data, QString &val)
{

8
src/plugins/simulator/fs9/multiplayerpacketparser.h
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_MP_PACKET_PARSER_H
#define BLACKSIMPLUGIN_FS9_MP_PACKET_PARSER_H
#ifndef SWIFT_SIMPLUGIN_FS9_MP_PACKET_PARSER_H
#define SWIFT_SIMPLUGIN_FS9_MP_PACKET_PARSER_H
#include "fs9.h"
#include <QtGlobal>
@@ -13,7 +13,7 @@
//! \file
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
namespace Private
{
@@ -131,4 +131,4 @@ namespace BlackSimPlugin::Fs9
};
}
#endif // BLACKSIMPLUGIN_FS9_MP_PACKET_PARSER_H
#endif // SWIFT_SIMPLUGIN_FS9_MP_PACKET_PARSER_H

8
src/plugins/simulator/fs9/multiplayerpackets.h
View File

@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#ifndef BLACKSIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H
#define BLACKSIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H
#ifndef SWIFT_SIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H
#define SWIFT_SIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H
#include "fs9.h"
#include <QString>
@@ -11,7 +11,7 @@
//! \file
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Multiplayer param packet - aircraft configuration
struct MPParam : public MULTIPLAYER_PACKET_PARAMS
@@ -127,4 +127,4 @@ namespace BlackSimPlugin::Fs9
};
}
#endif // BLACKSIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H
#endif // SWIFT_SIMPLUGIN_FS9_MULTIPLAYER_PACKETS_H

2
src/plugins/simulator/fs9/registermetadata.cpp
View File

@@ -5,7 +5,7 @@
#include "fs9host.h"
#include "fs9client.h"
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
void registerMetadata()
{

6
src/plugins/simulator/fs9/registermetadata.h
View File

@@ -3,10 +3,10 @@
//! \file
#ifndef BLACKSIMPLUGIN_REGISTERMETADATA_H
#define BLACKSIMPLUGIN_REGISTERMETADATA_H
#ifndef SWIFT_SIMPLUGIN_REGISTERMETADATA_H
#define SWIFT_SIMPLUGIN_REGISTERMETADATA_H
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! Register all relevant metadata in plugin
void registerMetadata();

4
src/plugins/simulator/fs9/simulatorfs9.cpp
View File

@@ -30,10 +30,10 @@ using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::core;
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
using namespace swift::config;
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
CSimulatorFs9::CSimulatorFs9(const CSimulatorPluginInfo &info,
const QSharedPointer<CFs9Host> &fs9Host,

10
src/plugins/simulator/fs9/simulatorfs9.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FS9_H
#define BLACKSIMPLUGIN_SIMULATOR_FS9_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FS9_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FS9_H
#include "fs9host.h"
#include "fs9client.h"
@@ -23,7 +23,7 @@
#include <QThread>
#include <QHash>
namespace BlackSimPlugin::Fs9
namespace swift::simplugin::fs9
{
//! FS9 Simulator Implementation
class CSimulatorFs9 : public FsCommon::CSimulatorFsCommon
@@ -87,7 +87,7 @@ namespace BlackSimPlugin::Fs9
void updateOwnAircraftFromSimulator(const swift::misc::simulation::CSimulatedAircraft &ownAircraft);
//! Render status
void updateRenderStatus(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
void updateRenderStatus(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft, swift::simplugin::fs9::CFs9Client::ClientStatus);
//! Disconnect all clients
void disconnectAllClients();
@@ -95,7 +95,7 @@ namespace BlackSimPlugin::Fs9
//! Sync time with user's computer
void synchronizeTime();
BlackSimPlugin::FsCommon::CFsuipc *m_fsuipc = nullptr; //!< FSUIPC
swift::simplugin::fscommon::CFsuipc *m_fsuipc = nullptr; //!< FSUIPC
QHash<swift::misc::aviation::CCallsign, QPointer<CFs9Client>> m_hashFs9Clients;
QMetaObject::Connection m_connectionHostMessages;
bool m_simConnected = false; //!< Is simulator connected?

4
src/plugins/simulator/fscommon/fscommonexport.h
View File

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

6
src/plugins/simulator/fscommon/fsuipc.h
View File

@@ -3,14 +3,14 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSUIPC_H
#define BLACKSIMPLUGIN_FSUIPC_H
#ifndef SWIFT_SIMPLUGIN_FSUIPC_H
#define SWIFT_SIMPLUGIN_FSUIPC_H
#include "plugins/simulator/fscommon/fscommonexport.h"
#include "misc/simulation/simulatedaircraft.h"
#include <QStringList>
namespace BlackSimPlugin::FsCommon
namespace swift::simplugin::fscommon
{
//! Class representing a FSUIPC "interface"
class FSCOMMON_EXPORT CFsuipc : public QObject

4
src/plugins/simulator/fscommon/fsuipcdummy.cpp
View File

@@ -8,9 +8,9 @@
using namespace swift::misc::simulation;
using namespace swift::misc::aviation;
namespace BlackSimPlugin
namespace swift::simplugin
{
namespace FsCommon
namespace fscommon
{
CFsuipc::CFsuipc(QObject *parent)
: QObject(parent)

2
src/plugins/simulator/fscommon/fsuipcimpl.cpp
View File

@@ -43,7 +43,7 @@ using namespace swift::misc::geo;
using namespace swift::misc::simulation;
using namespace swift::misc::physical_quantities;
namespace BlackSimPlugin::FsCommon
namespace swift::simplugin::fscommon
{
CFsuipc::CFsuipc(QObject *parent) : QObject(parent)
{

6
src/plugins/simulator/fscommon/simulatorfscommon.cpp
View File

@@ -15,9 +15,9 @@ using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::core;
using namespace BlackSimPlugin::Common;
using namespace swift::simplugin::common;
namespace BlackSimPlugin::FsCommon
namespace swift::simplugin::fscommon
{
CSimulatorFsCommon::CSimulatorFsCommon(
const CSimulatorPluginInfo &info,
@@ -47,7 +47,7 @@ namespace BlackSimPlugin::FsCommon
void CSimulatorFsCommon::registerHelp()
{
if (CSimpleCommandParser::registered("BlackSimPlugin::FsCommon::CSimulatorFsCommon")) { return; }
if (CSimpleCommandParser::registered("swift::simplugin::fscommon::CSimulatorFsCommon")) { return; }
CSimpleCommandParser::registerCommand({ ".drv", "alias: .driver .plugin" });
}

8
src/plugins/simulator/fscommon/simulatorfscommon.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
#define BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
#ifndef SWIFT_SIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
#define SWIFT_SIMPLUGIN_FSCOMMON_SIMULATORFSCOMMON_H
#include "plugins/simulator/plugincommon/simulatorplugincommon.h"
#include "misc/simulation/interpolation/interpolator.h"
@@ -14,10 +14,10 @@
#include <QObject>
#include <memory>
namespace BlackSimPlugin::FsCommon
namespace swift::simplugin::fscommon
{
//! Common base class for MS flight simulators
class FSCOMMON_EXPORT CSimulatorFsCommon : public Common::CSimulatorPluginCommon
class FSCOMMON_EXPORT CSimulatorFsCommon : public common::CSimulatorPluginCommon
{
Q_OBJECT
Q_INTERFACES(swift::core::ISimulator)

6
src/plugins/simulator/fscommon/simulatorfscommonfunctions.h
View File

@@ -3,13 +3,13 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMONFUNCTIONS_H
#define BLACKSIMPLUGIN_FSCOMMON_SIMULATORFSCOMMONFUNCTIONS_H
#ifndef SWIFT_SIMPLUGIN_FSCOMMON_SIMULATORFSCOMMONFUNCTIONS_H
#define SWIFT_SIMPLUGIN_FSCOMMON_SIMULATORFSCOMMONFUNCTIONS_H
#include <Windows.h>
#include <QtGlobal>
namespace BlackSimPlugin::FsCommon
namespace swift::simplugin::fscommon
{
//! @{
//! Correctly casted values/checks

2
src/plugins/simulator/fsx/simulatorfsx.cpp
View File

@@ -13,7 +13,7 @@ using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::core;
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
CSimulatorFsx::CSimulatorFsx(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

8
src/plugins/simulator/fsx/simulatorfsx.h
View File

@@ -3,15 +3,15 @@
//! \file
#ifndef BLACKSIMPLUGIN_FSX_SIMULATORFSX_H
#define BLACKSIMPLUGIN_FSX_SIMULATORFSX_H
#ifndef SWIFT_SIMPLUGIN_FSX_SIMULATORFSX_H
#define SWIFT_SIMPLUGIN_FSX_SIMULATORFSX_H
#include "../fsxcommon/simulatorfsxcommon.h"
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
//! FSX simulator implementation
class CSimulatorFsx : public BlackSimPlugin::FsxCommon::CSimulatorFsxCommon
class CSimulatorFsx : public namespace swift::simplugin::fsxcommon::CSimulatorFsxCommon
{
Q_OBJECT

2
src/plugins/simulator/fsx/simulatorfsxfactory.cpp
View File

@@ -9,7 +9,7 @@ using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::core;
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
ISimulator *CSimulatorFsxFactory::create(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

12
src/plugins/simulator/fsx/simulatorfsxfactory.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FSXFACTORY_H
#define BLACKSIMPLUGIN_SIMULATOR_FSXFACTORY_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FSXFACTORY_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FSXFACTORY_H
#include "core/simulator.h"
#include "misc/simulation/simulatorplugininfo.h"
@@ -12,7 +12,7 @@
#include <QObject>
#include <QtPlugin>
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
//! Factory implementation to create CSimulatorFsx instances
class CSimulatorFsxFactory :
@@ -26,9 +26,9 @@ namespace BlackSimPlugin::Fsx
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override;

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

4
src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp
View File

@@ -5,9 +5,9 @@
#include "../fsxcommon/simulatorfsxconfigwindow.h"
using namespace swift::gui;
using namespace BlackSimPlugin::FsxCommon;
using namespace swift::simplugin::fsxcommon;
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
CSimulatorFsxConfig::CSimulatorFsxConfig(QObject *parent) : QObject(parent)
{

6
src/plugins/simulator/fsxconfig/simulatorfsxconfig.h
View File

@@ -3,13 +3,13 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#define SWIFT_SIMPLUGIN_SIMULATOR_FSX_CONFIG_H
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
namespace BlackSimPlugin::Fsx
namespace swift::simplugin::fsx
{
/*!
* Window for setting up the FSX plugin.

4
src/plugins/simulator/msfs/simulatormsfs.cpp
View File

@@ -12,9 +12,9 @@ using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::core;
using namespace BlackSimPlugin::FsxCommon;
using namespace swift::simplugin::fsxcommon;
namespace BlackSimPlugin::Msfs
namespace swift::simplugin::msfs
{
CSimulatorMsFs::CSimulatorMsFs(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

12
src/plugins/simulator/msfs/simulatormsfs.h
View File

@@ -3,15 +3,15 @@
//! \file
#ifndef BLACKSIMPLUGIN_MSFS_SIMULATORMSFS_H
#define BLACKSIMPLUGIN_MSFS_SIMULATORMSFS_H
#ifndef SWIFT_SIMPLUGIN_MSFS_SIMULATORMSFS_H
#define SWIFT_SIMPLUGIN_MSFS_SIMULATORMSFS_H
#include "../fsxcommon/simulatorfsxcommon.h"
namespace BlackSimPlugin::Msfs
namespace swift::simplugin::msfs
{
//! FSX simulator implementation
class CSimulatorMsFs : public BlackSimPlugin::FsxCommon::CSimulatorFsxCommon
class CSimulatorMsFs : public swift::simplugin::fsxcommon::CSimulatorFsxCommon
{
Q_OBJECT
@@ -28,11 +28,11 @@ namespace BlackSimPlugin::Msfs
virtual bool connectTo() override;
//! @}
virtual void setTrueAltitude(swift::misc::aviation::CAircraftSituation &aircraftSituation, const BlackSimPlugin::FsxCommon::DataDefinitionOwnAircraft &simulatorOwnAircraft) override;
virtual void setTrueAltitude(swift::misc::aviation::CAircraftSituation &aircraftSituation, const swift::simplugin::fsxcommon::DataDefinitionOwnAircraft &simulatorOwnAircraft) override;
};
//! Listener for MSFS
class CSimulatorMsFsListener : public FsxCommon::CSimulatorFsxCommonListener
class CSimulatorMsFsListener : public fsxcommon::CSimulatorFsxCommonListener
{
Q_OBJECT

2
src/plugins/simulator/msfs/simulatormsfsfactory.cpp
View File

@@ -9,7 +9,7 @@ using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::core;
namespace BlackSimPlugin::Msfs
namespace swift::simplugin::msfs
{
ISimulator *CSimulatorMsFsFactory::create(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

12
src/plugins/simulator/msfs/simulatormsfsfactory.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_MSFSFACTORY_H
#define BLACKSIMPLUGIN_SIMULATOR_MSFSFACTORY_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_MSFSFACTORY_H
#define SWIFT_SIMPLUGIN_SIMULATOR_MSFSFACTORY_H
#include "core/simulator.h"
#include "misc/simulation/simulatorplugininfo.h"
@@ -12,7 +12,7 @@
#include <QObject>
#include <QtPlugin>
namespace BlackSimPlugin::Msfs
namespace swift::simplugin::msfs
{
//! Factory implementation to create CSimulatorFsx instances
class CSimulatorMsFsFactory :
@@ -26,9 +26,9 @@ namespace BlackSimPlugin::Msfs
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override;

8
src/plugins/simulator/p3d/simulatorp3d.cpp
View File

@@ -16,11 +16,11 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace BlackSimPlugin::FsxCommon;
using namespace swift::simplugin::fsxcommon;
using namespace swift::core;
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
CSimulatorP3D::CSimulatorP3D(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,
@@ -238,7 +238,7 @@ namespace BlackSimPlugin::P3D
return hr;
}
void CSimulatorP3D::removeCamera(FsxCommon::CSimConnectObject &simObject)
void CSimulatorP3D::removeCamera(fsxcommon::CSimConnectObject &simObject)
{
if (!simObject.hasCamera()) { return; }
simObject.removeCamera();

20
src/plugins/simulator/p3d/simulatorp3d.h
View File

@@ -3,24 +3,24 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_P3D_H
#define BLACKSIMPLUGIN_SIMULATOR_P3D_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_P3D_H
#define SWIFT_SIMPLUGIN_SIMULATOR_P3D_H
#include "../fsxcommon/simulatorfsxcommon.h"
#include "../fsxcommon/simconnectobject.h"
#include "misc/simulation/settings/simulatorsettings.h"
#include "misc/settingscache.h"
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
//! P3D specific events
enum EventsIdsP3D
{
EventP3dFoo = FsxCommon::EventFSXEndMarker + 1
EventP3dFoo = fsxcommon::EventFSXEndMarker + 1
};
//! P3D Simulator Implementation
class CSimulatorP3D : public FsxCommon::CSimulatorFsxCommon
class CSimulatorP3D : public fsxcommon::CSimulatorFsxCommon
{
Q_OBJECT
Q_INTERFACES(swift::core::ISimulator)
@@ -54,14 +54,14 @@ namespace BlackSimPlugin::P3D
#ifdef Q_OS_WIN64
//! \copydoc FsxCommon::CSimulatorFsxCommon::removeCamera
virtual void removeCamera(FsxCommon::CSimConnectObject &simObject) override;
virtual void removeCamera(fsxcommon::CSimConnectObject &simObject) override;
//! \copydoc FsxCommon::CSimulatorFsxCommon::removeObserver
virtual void removeObserver(FsxCommon::CSimConnectObject &simObject) override;
virtual void removeObserver(fsxcommon::CSimConnectObject &simObject) override;
//! \copydoc FsxCommon::CSimulatorFsxCommon::releaseAIControl
//! \remark P3D API release of control
virtual bool releaseAIControl(const FsxCommon::CSimConnectObject &simObject, SIMCONNECT_DATA_REQUEST_ID requestId) override;
virtual bool releaseAIControl(const fsxcommon::CSimConnectObject &simObject, SIMCONNECT_DATA_REQUEST_ID requestId) override;
#endif
//! SimConnect Callback
static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
@@ -71,7 +71,7 @@ namespace BlackSimPlugin::P3D
};
//! Listener for P3D
class CSimulatorP3DListener : public FsxCommon::CSimulatorFsxCommonListener
class CSimulatorP3DListener : public fsxcommon::CSimulatorFsxCommonListener
{
Q_OBJECT
@@ -79,7 +79,7 @@ namespace BlackSimPlugin::P3D
//! Constructor
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67054 - Constructor inheritance with non-default constructible members
// using CSimulatorFsxCommonListener::CSimulatorFsxCommonListener;
CSimulatorP3DListener(const swift::misc::simulation::CSimulatorPluginInfo &info) : FsxCommon::CSimulatorFsxCommonListener(info) {}
CSimulatorP3DListener(const swift::misc::simulation::CSimulatorPluginInfo &info) : fsxcommon::CSimulatorFsxCommonListener(info) {}
protected:
virtual void startImpl() override;

2
src/plugins/simulator/p3d/simulatorp3dfactory.cpp
View File

@@ -8,7 +8,7 @@
using namespace swift::misc::simulation;
using namespace swift::misc::network;
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
swift::core::ISimulator *CSimulatorP3DFactory::create(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

12
src/plugins/simulator/p3d/simulatorp3dfactory.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_P3DFACTORY_H
#define BLACKSIMPLUGIN_SIMULATOR_P3DFACTORY_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_P3DFACTORY_H
#define SWIFT_SIMPLUGIN_SIMULATOR_P3DFACTORY_H
#include "core/simulator.h"
#include "misc/simulation/simulatorplugininfo.h"
@@ -12,7 +12,7 @@
#include <QObject>
#include <QtPlugin>
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
//! Factory implementation to create CSimulatorP3D instances
class CSimulatorP3DFactory :
@@ -26,9 +26,9 @@ namespace BlackSimPlugin::P3D
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override;

4
src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp
View File

@@ -4,7 +4,7 @@
#include "simulatorp3dconfig.h"
#include "../fsxcommon/simulatorfsxconfigwindow.h"
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
CSimulatorP3DConfig::CSimulatorP3DConfig(QObject *parent) : QObject(parent)
{
@@ -13,6 +13,6 @@ namespace BlackSimPlugin::P3D
swift::gui::CPluginConfigWindow *CSimulatorP3DConfig::createConfigWindow(QWidget *parent)
{
return new FsxCommon::CSimulatorFsxConfigWindow("P3D", parent);
return new fsxcommon::CSimulatorFsxConfigWindow("P3D", parent);
}
}

6
src/plugins/simulator/p3dconfig/simulatorp3dconfig.h
View File

@@ -3,12 +3,12 @@
//! \file
#ifndef BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#define BLACKSIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#ifndef SWIFT_SIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#define SWIFT_SIMPLUGIN_P3D_SIMULATORP3DCONFIG_H
#include "gui/pluginconfig.h"
namespace BlackSimPlugin::P3D
namespace swift::simplugin::p3d
{
/*!
* Window for setting up the P3D plugin.

4
src/plugins/simulator/plugincommon/simulatorplugincommon.cpp
View File

@@ -13,7 +13,7 @@ using namespace swift::misc;
using namespace swift::misc::network;
using namespace swift::misc::simulation;
namespace BlackSimPlugin::Common
namespace swift::simplugin::common
{
CSimulatorPluginCommon::CSimulatorPluginCommon(
const CSimulatorPluginInfo &info,
@@ -81,7 +81,7 @@ namespace BlackSimPlugin::Common
void CSimulatorPluginCommon::registerHelp()
{
if (CSimpleCommandParser::registered("BlackSimPlugin::Common::CSimulatorPluginCommon")) { return; }
if (CSimpleCommandParser::registered("swift::simplugin::common::CSimulatorPluginCommon")) { return; }
CSimpleCommandParser::registerCommand({ ".drv intdisplay", "interpolation display" });
}
} // namespace

6
src/plugins/simulator/plugincommon/simulatorplugincommon.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#define BLACKSIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#ifndef SWIFT_SIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#define SWIFT_SIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H
#include "plugins/simulator/plugincommon/simulatorplugincommonexport.h"
#include "core/simulator.h"
@@ -15,7 +15,7 @@ namespace swift::gui::components
{
class CInterpolationLogDisplayDialog;
}
namespace BlackSimPlugin::Common
namespace swift::simplugin::common
{
//! Common base class for simulator plugins
class SIMULATORPLUGINCOMMON_EXPORT CSimulatorPluginCommon : public swift::core::ISimulator

4
src/plugins/simulator/plugincommon/simulatorplugincommonexport.h
View File

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

2
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -80,7 +80,7 @@ namespace
}
}
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
CSimulatorXPlane::CSimulatorXPlane(const CSimulatorPluginInfo &info,
IOwnAircraftProvider *ownAircraftProvider,

14
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_H
#define SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_H
#include "xplanempaircraft.h"
#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h"
@@ -57,7 +57,7 @@ namespace swift::misc
}
}
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
class CXSwiftBusServiceProxy;
class CXSwiftBusTrafficProxy;
@@ -110,7 +110,7 @@ namespace BlackSimPlugin::XPlane
};
//! X-Plane ISimulator implementation
class CSimulatorXPlane : public Common::CSimulatorPluginCommon
class CSimulatorXPlane : public common::CSimulatorPluginCommon
{
Q_OBJECT
@@ -333,9 +333,9 @@ namespace BlackSimPlugin::XPlane
public:
//! \copydoc swift::core::ISimulatorFactory::create
virtual swift::core::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info,
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
swift::misc::network::IClientProvider *clientProvider) override;
//! \copydoc swift::core::ISimulatorFactory::createListener
virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); }

2
src/plugins/simulator/xplane/xplanempaircraft.cpp
View File

@@ -10,7 +10,7 @@ using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace swift::misc::simulation;
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
CXPlaneMPAircraft::CXPlaneMPAircraft()
{}

6
src/plugins/simulator/xplane/xplanempaircraft.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
#define BLACKSIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
#ifndef SWIFT_SIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
#define SWIFT_SIMPLUGIN_XPLANE_XPLANEMPAIRCRAFT_H
#include "misc/simulation/simulatedaircraft.h"
#include "misc/simulation/interpolation/interpolatormulti.h"
@@ -15,7 +15,7 @@ namespace swift::core
{
class ISimulator;
}
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
//! Class representing a X-Plane multiplayer aircraft
class CXPlaneMPAircraft

2
src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp
View File

@@ -11,7 +11,7 @@ class QDBusConnection;
#define XSWIFTBUS_SERVICE_SERVICENAME "org.swift-project.xswiftbus"
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
CXSwiftBusServiceProxy::CXSwiftBusServiceProxy(QDBusConnection &connection, QObject *parent, bool dummy) : QObject(parent)
{

24
src/plugins/simulator/xplane/xswiftbusserviceproxy.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H
#define BLACKSIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H
#ifndef SWIFT_SIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H
#define SWIFT_SIMPLUGIN_XSWIFTBUS_SERVICE_PROXY_H
#include "misc/genericdbusinterface.h"
@@ -26,7 +26,7 @@ class QDBusPendingCallWatcher;
#define XSWIFTBUS_SERVICE_OBJECTPATH "/xswiftbus/service"
//! \endcond
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
struct XPlaneData;
@@ -78,7 +78,7 @@ namespace BlackSimPlugin::XPlane
signals:
//! Emitted if an asynchronous method call caused a DBus error
BLACK_NO_RELAY void asyncMethodError(QDBusError error);
SWIFT_NO_RELAY void asyncMethodError(QDBusError error);
//! Own aircraft model changed
void aircraftModelChanged(
@@ -99,28 +99,28 @@ namespace BlackSimPlugin::XPlane
QString getCommitHash();
//! Get own aircraft situation data
void getOwnAircraftSituationDataAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftSituationDataAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own aircraft velocity data
void getOwnAircraftVelocityDataAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftVelocityDataAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own aircraft COM1 data
void getOwnAircraftCom1DataAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftCom1DataAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own aircraft COM2 data
void getOwnAircraftCom2DataAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftCom2DataAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own XPDR data
void getOwnAircraftXpdrAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftXpdrAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own lights data
void getOwnAircraftLightsAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftLightsAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own parts such as gear, flaps
void getOwnAircraftPartsAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftPartsAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! Get own model data
void getOwnAircraftModelDataAsync(BlackSimPlugin::XPlane::XPlaneData *o_xplaneData);
void getOwnAircraftModelDataAsync(swift::simplugin::xplane::XPlaneData *o_xplaneData);
//! \copydoc XSwiftBus::CService::addTextMessage
void addTextMessage(const QString &text, double red, double green, double blue);

2
src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp
View File

@@ -15,7 +15,7 @@ using namespace swift::misc::aviation;
using namespace swift::misc::geo;
using namespace swift::misc::physical_quantities;
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
const QStringList &CXSwiftBusTrafficProxy::getLogCategories()
{

12
src/plugins/simulator/xplane/xswiftbustrafficproxy.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_XSWIFTBUS_TRAFFIC_PROXY_H
#define BLACKSIMPLUGIN_XSWIFTBUS_TRAFFIC_PROXY_H
#ifndef SWIFT_SIMPLUGIN_XSWIFTBUS_TRAFFIC_PROXY_H
#define SWIFT_SIMPLUGIN_XSWIFTBUS_TRAFFIC_PROXY_H
#include "misc/genericdbusinterface.h"
#include "misc/aviation/aircraftsituation.h"
@@ -26,7 +26,7 @@ class QDBusConnection;
#define XSWIFTBUS_TRAFFIC_OBJECTPATH "/xswiftbus/traffic"
//! \endcond
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
//! List of doubles
using QDoubleList = QList<double>;
@@ -222,13 +222,13 @@ namespace BlackSimPlugin::XPlane
void removeAllPlanes();
//! \copydoc XSwiftBus::CTraffic::setPlanesPositions
void setPlanesPositions(const BlackSimPlugin::XPlane::PlanesPositions &planesPositions);
void setPlanesPositions(const swift::simplugin::xplane::PlanesPositions &planesPositions);
//! \copydoc XSwiftBus::CTraffic::setPlanesSurfaces
void setPlanesSurfaces(const BlackSimPlugin::XPlane::PlanesSurfaces &planesSurfaces);
void setPlanesSurfaces(const swift::simplugin::xplane::PlanesSurfaces &planesSurfaces);
//! \copydoc XSwiftBus::CTraffic::setPlanesTransponders
void setPlanesTransponders(const BlackSimPlugin::XPlane::PlanesTransponders &planesTransponders);
void setPlanesTransponders(const swift::simplugin::xplane::PlanesTransponders &planesTransponders);
//! \deprecated XSwiftBus::CTraffic::setInterpolatorMode
void setInterpolatorMode(const QString &callsign, bool spline);

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp
View File

@@ -6,7 +6,7 @@
class QWidget;
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
CSimulatorXPlaneConfig::CSimulatorXPlaneConfig(QObject *parent) : QObject(parent)
{

6
src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#define SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_CONFIG_H
#include "gui/pluginconfig.h"
#include "misc/settingscache.h"
@@ -18,7 +18,7 @@ namespace swift::gui
{
class CPluginConfigWindow;
}
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
/*!
* Config plugin for the X-Plane plugin.

2
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -17,7 +17,7 @@ using namespace swift::misc;
using namespace swift::misc::simulation::settings;
using namespace swift::misc::simulation::xplane;
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
CSimulatorXPlaneConfigWindow::CSimulatorXPlaneConfigWindow(QWidget *parent) : CPluginConfigWindow(parent),
ui(new Ui::CSimulatorXPlaneConfigWindow)

6
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#define BLACKSIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#ifndef SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#define SWIFT_SIMPLUGIN_SIMULATOR_XPLANE_CONFIG_WINDOW_H
#include "gui/pluginconfigwindow.h"
#include "misc/simulation/settings/xswiftbussettings.h"
@@ -16,7 +16,7 @@ namespace Ui
{
class CSimulatorXPlaneConfigWindow;
}
namespace BlackSimPlugin::XPlane
namespace swift::simplugin::xplane
{
/*!
* A window that shows all the X-Plane plugin options.