flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +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

2
samples/afvclient/afvclientbridge.cpp
View File

@@ -3,7 +3,7 @@
#include "afvclientbridge.h"
using namespace BlackCore::Afv::Clients;
using namespace swift::core::afv::clients;
CAfvClientBridge::CAfvClientBridge(CAfvClient *afvClient, QObject *parent) : QObject(parent),
m_afvClient(afvClient)

34
samples/afvclient/afvclientbridge.h
View File

@@ -6,7 +6,7 @@
#ifndef SAMPLES_AFVCLIENTBRIDGE_H
#define SAMPLES_AFVCLIENTBRIDGE_H
#include "blackcore/afv/clients/afvclient.h"
#include "core/afv/clients/afvclient.h"
#include <QObject>
//! Bridge, running in main thread -> voice client in own thread
@@ -18,14 +18,14 @@ class CAfvClientBridge : public QObject
//! @{
Q_PROPERTY(double inputVolumePeakVU READ getInputVolumePeakVU NOTIFY inputVolumePeakVU)
Q_PROPERTY(double outputVolumePeakVU READ getOutputVolumePeakVU NOTIFY outputVolumePeakVU)
Q_PROPERTY(BlackCore::Afv::Clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged)
Q_PROPERTY(swift::core::afv::clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged)
Q_PROPERTY(QString receivingCallsignsCom1 READ getReceivingCallsignsCom1 NOTIFY receivingCallsignsChanged)
Q_PROPERTY(QString receivingCallsignsCom2 READ getReceivingCallsignsCom2 NOTIFY receivingCallsignsChanged)
//! @}
public:
//! Ctor
CAfvClientBridge(BlackCore::Afv::Clients::CAfvClient *afvClient, QObject *parent = nullptr);
CAfvClientBridge(swift::core::afv::clients::CAfvClient *afvClient, QObject *parent = nullptr);
//! VU values, 0..1
//! @{
@@ -33,8 +33,8 @@ public:
double getOutputVolumePeakVU() const { return m_afvClient->getOutputVolumePeakVU(); }
//! @}
//! \copydoc BlackCore::Afv::Clients::CAfvClient::getConnectionStatus
BlackCore::Afv::Clients::CAfvClient::ConnectionStatus getConnectionStatus() const
//! \copydoc swift::core::afv::clients::CAfvClient::getConnectionStatus
swift::core::afv::clients::CAfvClient::ConnectionStatus getConnectionStatus() const
{
return m_afvClient->getConnectionStatus();
}
@@ -45,14 +45,14 @@ public:
QString getReceivingCallsignsCom2() { return m_afvClient->getReceivingCallsignsStringCom2(); }
//! @}
//! \copydoc BlackCore::Afv::Clients::CAfvClient::connectTo
//! \copydoc swift::core::afv::clients::CAfvClient::connectTo
Q_INVOKABLE void connectTo(const QString &cid, const QString &password, const QString &callsign)
{
const QString client = "swift " % swift::config::CBuildConfig::getShortVersionString();
m_afvClient->connectTo(cid, password, callsign, client);
}
//! \copydoc BlackCore::Afv::Clients::CAfvClient::disconnectFrom
//! \copydoc swift::core::afv::clients::CAfvClient::disconnectFrom
Q_INVOKABLE void disconnectFrom() { m_afvClient->disconnectFrom(); }
//! Audio devices
@@ -64,22 +64,22 @@ public:
//! Enable/disable VHF simulation, true means effects are NOT used
Q_INVOKABLE void setBypassEffects(bool value) { m_afvClient->setBypassEffects(value); }
//! \copydoc BlackCore::Afv::Clients::CAfvClient::startAudio
//! \copydoc swift::core::afv::clients::CAfvClient::startAudio
Q_INVOKABLE void startAudio(const QString &inputDeviceName, const QString &outputDeviceName) { m_afvClient->startAudio(inputDeviceName, outputDeviceName); }
//! \copydoc BlackCore::Afv::Clients::CAfvClient::enableTransceiver
//! \copydoc swift::core::afv::clients::CAfvClient::enableTransceiver
Q_INVOKABLE void enableTransceiver(quint16 id, bool enable) { m_afvClient->enableTransceiver(id, enable); }
//! \copydoc BlackCore::Afv::Clients::CAfvClient::updateComFrequency
//! \copydoc swift::core::afv::clients::CAfvClient::updateComFrequency
Q_INVOKABLE void updateComFrequency(quint16 id, quint32 frequencyHz) { m_afvClient->updateComFrequency(id, frequencyHz); }
//! \copydoc BlackCore::Afv::Clients::CAfvClient::updatePosition
//! \copydoc swift::core::afv::clients::CAfvClient::updatePosition
Q_INVOKABLE void updatePosition(double latitudeDeg, double longitudeDeg, double heightMeters)
{
m_afvClient->updatePosition(latitudeDeg, longitudeDeg, heightMeters);
}
//! \copydoc BlackCore::Afv::Clients::CAfvClient::setPtt
//! \copydoc swift::core::afv::clients::CAfvClient::setPtt
Q_INVOKABLE void setPtt(bool active) { m_afvClient->setPtt(active); }
//! Loopback
@@ -88,19 +88,19 @@ public:
Q_INVOKABLE bool isLoopback() const { return m_afvClient->isLoopback(); }
//! @}
//! \copydoc BlackCore::Afv::Clients::CAfvClient::setInputVolumeDb
//! \copydoc swift::core::afv::clients::CAfvClient::setInputVolumeDb
Q_INVOKABLE void setInputVolumeDb(double valueDb) { m_afvClient->setInputVolumeDb(valueDb); }
//! \copydoc BlackCore::Afv::Clients::CAfvClient::setNormalizedMasterOutputVolume
//! \copydoc swift::core::afv::clients::CAfvClient::setNormalizedMasterOutputVolume
Q_INVOKABLE void setNormalizedMasterOutputVolume(double valueDb) { m_afvClient->setNormalizedMasterOutputVolume(valueDb); }
signals:
//! Receiving callsigns have been changed
//! \remark callsigns I do receive
void receivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args);
void receivingCallsignsChanged(const swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs &args);
//! Connection status has been changed
void connectionStatusChanged(BlackCore::Afv::Clients::CAfvClient::ConnectionStatus status);
void connectionStatusChanged(swift::core::afv::clients::CAfvClient::ConnectionStatus status);
//! Client updated from own aicraft data
void updatedFromOwnAircraftCockpit();
@@ -115,7 +115,7 @@ signals:
//! @}
private:
BlackCore::Afv::Clients::CAfvClient *m_afvClient = nullptr;
swift::core::afv::clients::CAfvClient *m_afvClient = nullptr;
};
#endif // guard

20
samples/afvclient/main.cpp
View File

@@ -2,12 +2,12 @@
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
#include "afvclientbridge.h"
#include "blackcore/afv/model/atcstationmodel.h"
#include "blackcore/afv/model/afvmapreader.h"
#include "blackcore/afv/clients/afvclient.h"
#include "blackcore/registermetadata.h"
#include "core/afv/model/atcstationmodel.h"
#include "core/afv/model/afvmapreader.h"
#include "core/afv/clients/afvclient.h"
#include "core/registermetadata.h"
#include "blackcore/application.h"
#include "core/application.h"
#include "misc/network/user.h"
#include "misc/obfuscation.h"
#include "config/buildconfig.h"
@@ -22,17 +22,17 @@
using namespace swift::config;
using namespace swift::misc;
using namespace swift::misc::network;
using namespace BlackCore;
using namespace BlackCore::Afv::Clients;
using namespace BlackCore::Afv::Model;
using namespace swift::core;
using namespace swift::core::afv::clients;
using namespace swift::core::afv::model;
int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication qa(argc, argv);
BlackCore::registerMetadata();
BlackCore::CApplication a("sampleafvclient", CApplicationInfo::Sample);
swift::core::registerMetadata();
swift::core::CApplication a("sampleafvclient", CApplicationInfo::Sample);
CAfvMapReader *afvMapReader = new CAfvMapReader(&a);
afvMapReader->updateFromMap();

4
samples/fsd/main.cpp
View File

@@ -4,7 +4,7 @@
//! \file
//! \ingroup samplefsd
#include "blackcore/fsd/fsdclient.h"
#include "core/fsd/fsdclient.h"
#include "misc/network/clientprovider.h"
#include "misc/simulation/ownaircraftproviderdummy.h"
#include "misc/simulation/remoteaircraftproviderdummy.h"
@@ -13,7 +13,7 @@
using namespace swift::misc::network;
using namespace swift::misc::simulation;
using namespace BlackCore::Fsd;
using namespace swift::core::fsd;
//! main
int main(int argc, char *argv[])

4
samples/misc/main.cpp
View File

@@ -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/application.h"
#include "core/application.h"
#include "misc/directoryutils.h"
#include "samplesalgorithm.h"
#include "sampleschangeobject.h"
@@ -21,7 +21,7 @@
using namespace swift::misc;
using namespace BlackSample;
using namespace BlackCore;
using namespace swift::core;
//! main
int main(int argc, char *argv[])

4
samples/misc/samplesperformance.cpp
View File

@@ -5,7 +5,7 @@
//! \ingroup samplemisc
#include "samplesperformance.h"
#include "blackcore/db/databasereader.h"
#include "core/db/databasereader.h"
#include "misc/simulation/aircraftmodellist.h"
#include "misc/simulation/distributorlist.h"
#include "misc/aviation/aircrafticaocodelist.h"
@@ -48,7 +48,7 @@ using namespace swift::misc::network;
using namespace swift::misc::physical_quantities;
using namespace swift::misc::simulation;
using namespace swift::misc::test;
using namespace BlackCore::Db;
using namespace swift::core::db;
namespace BlackSample
{

4
samples/miscdbus/servicetool.cpp
View File

@@ -5,7 +5,7 @@
//! \ingroup samplemiscdbus
#include "servicetool.h"
#include "blackcore/application.h"
#include "core/application.h"
#include "misc/test/testservice.h"
#include "misc/test/testserviceinterface.h"
#include "misc/dbusserver.h"
@@ -46,7 +46,7 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::test;
using namespace BlackCore;
using namespace swift::core;
namespace BlackSample
{

4
samples/miscquantities/main.cpp
View File

@@ -7,7 +7,7 @@
#include "samplesaviation.h"
#include "samplesgeo.h"
#include "samplesphysicalquantities.h"
#include "blackcore/application.h"
#include "core/application.h"
#include "misc/directoryutils.h"
#include <stdio.h>
@@ -18,7 +18,7 @@
using namespace swift::misc;
using namespace BlackSample;
using namespace BlackCore;
using namespace swift::core;
//! main
int main(int argc, char *argv[])

4
samples/miscsim/main.cpp
View File

@@ -10,7 +10,7 @@
#include "samplesfsuipc.h"
#include "samplesmodelmapping.h"
#include "samplesvpilotrules.h"
#include "blackcore/application.h"
#include "core/application.h"
#include "misc/directoryutils.h"
#include <stdio.h>
@@ -28,7 +28,7 @@ using namespace BlackSample;
int main(int argc, char *argv[])
{
QCoreApplication qa(argc, argv);
BlackCore::CApplication a;
swift::core::CApplication a;
Q_UNUSED(a);
Q_UNUSED(qa);

4
samples/miscsim/samplesmodelmapping.cpp
View File

@@ -6,7 +6,7 @@
#include "samplesmodelmapping.h"
#include "sampleutils.h"
#include "blackcore/aircraftmatcher.h"
#include "core/aircraftmatcher.h"
#include "misc/aviation/aircrafticaocode.h"
#include "misc/aviation/airlineicaocode.h"
#include "misc/simulation/aircraftmodellist.h"
@@ -23,7 +23,7 @@
#include <QStringList>
#include <QTextStream>
using namespace BlackCore;
using namespace swift::core;
using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;