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

3
.clang-format
View File

@@ -82,6 +82,5 @@ WhitespaceSensitiveMacros:
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
- BLACK_METACLASS
- SWIFT_METACLASS
...

2
CMakeLists.txt
View File

@@ -121,7 +121,7 @@ endif()
add_compile_definitions(QT_NO_DEPRECATED_WARNINGS)
if(SWIFT_USE_CRASHPAD)
add_compile_definitions(BLACK_USE_CRASHPAD)
add_compile_definitions(SWIFT_USE_CRASHPAD)
endif()
if(APPLE)

4
samples/hotkey/samplehotkey.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 BLACKSAMPLE_WEATHERDATA_H
#define BLACKSAMPLE_WEATHERDATA_H
#ifndef SWIFT_SAMPLE_WEATHERDATA_H
#define SWIFT_SAMPLE_WEATHERDATA_H
// just a dummy header, documentation will go here

2
samples/misc/main.cpp
View File

@@ -20,7 +20,7 @@
//! \ingroup samplekmisc
using namespace swift::misc;
using namespace BlackSample;
using namespace swift::sample;
using namespace swift::core;
//! main

4
samples/misc/samplemisc.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 BLACKSAMPLE_BLACKMISC_H
#define BLACKSAMPLE_BLACKMISC_H
#ifndef SWIFT_SAMPLE_SWIFT_MISC_H
#define SWIFT_SAMPLE_SWIFT_MISC_H
// just a dummy header, documentation will go here

2
samples/misc/samplesalgorithm.cpp
View File

@@ -22,7 +22,7 @@
#include <ctime>
#include <numeric>
namespace BlackSample
namespace swift::sample
{
int CSamplesAlgorithm::samples()
{

6
samples/misc/samplesalgorithm.h
View File

@@ -4,10 +4,10 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESALGORITHM_H
#define BLACKSAMPLE_SAMPLESALGORITHM_H
#ifndef SWIFT_SAMPLE_SAMPLESALGORITHM_H
#define SWIFT_SAMPLE_SAMPLESALGORITHM_H
namespace BlackSample
namespace swift::sample
{
//! Samples for our algorithms
class CSamplesAlgorithm

2
samples/misc/sampleschangeobject.cpp
View File

@@ -26,7 +26,7 @@ using namespace swift::misc::physical_quantities;
using namespace swift::misc::geo;
using namespace swift::misc::network;
namespace BlackSample
namespace swift::sample
{
int CSamplesChangeObject::samples()
{

6
samples/misc/sampleschangeobject.h
View File

@@ -4,10 +4,10 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESCHANGEDATA_H
#define BLACKSAMPLE_SAMPLESCHANGEDATA_H
#ifndef SWIFT_SAMPLE_SAMPLESCHANGEDATA_H
#define SWIFT_SAMPLE_SAMPLESCHANGEDATA_H
namespace BlackSample
namespace swift::sample
{
//! Samples for metadata
class CSamplesChangeObject

2
samples/misc/samplescontainer.cpp
View File

@@ -32,7 +32,7 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::test;
namespace BlackSample
namespace swift::sample
{
int CSamplesContainer::samples()
{

6
samples/misc/samplescontainer.h
View File

@@ -4,10 +4,10 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESCONTAINER_H
#define BLACKSAMPLE_SAMPLESCONTAINER_H
#ifndef SWIFT_SAMPLE_SAMPLESCONTAINER_H
#define SWIFT_SAMPLE_SAMPLESCONTAINER_H
namespace BlackSample
namespace swift::sample
{
//! Samples for our containers
class CSamplesContainer

2
samples/misc/samplesfile.cpp
View File

@@ -10,7 +10,7 @@
using namespace swift::misc;
namespace BlackSample
namespace swift::sample
{
int CSamplesFile::samples(QTextStream &out)
{

6
samples/misc/samplesfile.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESFILE_H
#define BLACKSAMPLE_SAMPLESFILE_H
#ifndef SWIFT_SAMPLE_SAMPLESFILE_H
#define SWIFT_SAMPLE_SAMPLESFILE_H
#include <QTextStream>
namespace BlackSample
namespace swift::sample
{
//! Samples for file/directory
class CSamplesFile

2
samples/misc/samplesjson.cpp
View File

@@ -42,7 +42,7 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::test;
namespace BlackSample
namespace swift::sample
{
int CSamplesJson::samples()
{

6
samples/misc/samplesjson.h
View File

@@ -4,10 +4,10 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESJSON_H
#define BLACKSAMPLE_SAMPLESJSON_H
#ifndef SWIFT_SAMPLE_SAMPLESJSON_H
#define SWIFT_SAMPLE_SAMPLESJSON_H
namespace BlackSample
namespace swift::sample
{
//! Samples for metadata

2
samples/misc/samplesmetadata.cpp
View File

@@ -11,7 +11,7 @@
#include <stdio.h>
#include <QTextStream>
namespace BlackSample
namespace swift::sample
{
int CSamplesMetadata::samples()
{

6
samples/misc/samplesmetadata.h
View File

@@ -4,10 +4,10 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESMETADATA_H
#define BLACKSAMPLE_SAMPLESMETADATA_H
#ifndef SWIFT_SAMPLE_SAMPLESMETADATA_H
#define SWIFT_SAMPLE_SAMPLESMETADATA_H
namespace BlackSample
namespace swift::sample
{
//! Samples for metadata

2
samples/misc/samplesperformance.cpp
View File

@@ -50,7 +50,7 @@ using namespace swift::misc::simulation;
using namespace swift::misc::test;
using namespace swift::core::db;
namespace BlackSample
namespace swift::sample
{
int CSamplesPerformance::samplesMisc(QTextStream &out)
{

6
samples/misc/samplesperformance.h
View File

@@ -4,8 +4,8 @@
//! \file
//! \ingroup samplemisc
#ifndef BLACKSAMPLE_SAMPLESPERFORMANCE_H
#define BLACKSAMPLE_SAMPLESPERFORMANCE_H
#ifndef SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
#define SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
#include "misc/simulation/aircraftmodellist.h"
#include "misc/aviation/aircraftsituationlist.h"
@@ -18,7 +18,7 @@
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for our containers
class CSamplesPerformance

6
samples/miscdbus/main.cpp
View File

@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
// run tests
if (cmdlineArgs.contains("testservice", Qt::CaseInsensitive))
{
BlackSample::ServiceTool::dataTransferTestClient(address);
swift::sample::ServiceTool::dataTransferTestClient(address);
}
// loop
@@ -175,14 +175,14 @@ int main(int argc, char *argv[])
// run tests
if (mode == "testservice")
{
BlackSample::ServiceTool::dataTransferTestServer(dBusServer, verbose);
swift::sample::ServiceTool::dataTransferTestServer(dBusServer, verbose);
}
// testing in new process
CProcessCtrl::startDetached(executable, args, true);
// testing in same process
// BlackSample::ServiceTool::dataTransferTestClient(address);
// swift::sample::ServiceTool::dataTransferTestClient(address);
// loop
return a.exec();

4
samples/miscdbus/readme.txt
View File

@@ -12,8 +12,8 @@ qdbuscpp2xml datacontext.h -x misc_cpp2xml.dll -o MiscTest.Datacontext.xml
Set search path for plugins: env.var. QT_PLUGIN_PATH
Done automatically (qmake), but if required manually
Interface: qdbusxml2cpp blackbus.testservice.xml -p itestservice
Adaptor: qdbusxml2cpp blackbus.testservice.xml -a atestservice
Interface: qdbusxml2cpp swiftbus.testservice.xml -p itestservice
Adaptor: qdbusxml2cpp swiftbus.testservice.xml -a atestservice
-- Removed after changing to "handwritten" interface

4
samples/miscdbus/samplemiscdbus.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 BLACKSAMPLE_BLACKMISCDBUS_H
#define BLACKSAMPLE_BLACKMISCDBUS_H
#ifndef SWIFT_SAMPLE_SWIFT_MISCDBUS_H
#define SWIFT_SAMPLE_SWIFT_MISCDBUS_H
// just a dummy header, documentation will go here

2
samples/miscdbus/servicetool.cpp
View File

@@ -48,7 +48,7 @@ using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::test;
using namespace swift::core;
namespace BlackSample
namespace swift::sample
{
void ServiceTool::dataTransferTestServer(CDBusServer *dBusServer, bool verbose)
{

6
samples/miscdbus/servicetool.h
View File

@@ -4,8 +4,8 @@
//! \file
//! \ingroup samplemiscdbus
#ifndef BLACKSAMPLE_SERVICETOOL_H
#define BLACKSAMPLE_SERVICETOOL_H
#ifndef SWIFT_SAMPLE_SERVICETOOL_H
#define SWIFT_SAMPLE_SERVICETOOL_H
#include <QCoreApplication>
#include <QDBusArgument>
@@ -21,7 +21,7 @@ namespace swift::misc
{
class CDBusServer;
}
namespace BlackSample
namespace swift::sample
{
class Testservice; // forward declaration

2
samples/miscquantities/main.cpp
View File

@@ -17,7 +17,7 @@
#include <QtGlobal>
using namespace swift::misc;
using namespace BlackSample;
using namespace swift::sample;
using namespace swift::core;
//! main

4
samples/miscquantities/samplemiscquantities.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 BLACKSAMPLE_BLACKMISCQUANTITIES_H
#define BLACKSAMPLE_BLACKMISCQUANTITIES_H
#ifndef SWIFT_SAMPLE_SWIFT_MISCQUANTITIES_H
#define SWIFT_SAMPLE_SWIFT_MISCQUANTITIES_H
// just a dummy header, documentation will go here

2
samples/miscquantities/samplesaviation.cpp
View File

@@ -35,7 +35,7 @@ using namespace swift::misc::geo;
using namespace swift::misc::network;
using namespace swift::misc::test;
namespace BlackSample
namespace swift::sample
{
int CSamplesAviation::samples(QTextStream &out)
{

6
samples/miscquantities/samplesaviation.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscquantities
#ifndef BLACKSAMPLE_SAMPLESAVIATION_H
#define BLACKSAMPLE_SAMPLESAVIATION_H
#ifndef SWIFT_SAMPLE_SAMPLESAVIATION_H
#define SWIFT_SAMPLE_SAMPLESAVIATION_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for aviation

2
samples/miscquantities/samplesgeo.cpp
View File

@@ -23,7 +23,7 @@ using namespace swift::misc::aviation;
using namespace swift::misc::physical_quantities;
using namespace swift::misc::geo;
namespace BlackSample
namespace swift::sample
{
int CSamplesGeo::samples(QTextStream &out)
{

6
samples/miscquantities/samplesgeo.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscquantities
#ifndef BLACKSAMPLE_SAMPLESGEO_H
#define BLACKSAMPLE_SAMPLESGEO_H
#ifndef SWIFT_SAMPLE_SAMPLESGEO_H
#define SWIFT_SAMPLE_SAMPLESGEO_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for physical quantities
class CSamplesGeo

2
samples/miscquantities/samplesphysicalquantities.cpp
View File

@@ -26,7 +26,7 @@ using namespace swift::misc;
using namespace swift::misc::aviation;
using namespace swift::misc::physical_quantities;
namespace BlackSample
namespace swift::sample
{
int CSamplesPhysicalQuantities::samples(QTextStream &out)
{

6
samples/miscquantities/samplesphysicalquantities.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscquantities
#ifndef BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
#define BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
#ifndef SWIFT_SAMPLE_SAMPLESPHYSICALQUANTITIES_H
#define SWIFT_SAMPLE_SAMPLESPHYSICALQUANTITIES_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for physical quantities

2
samples/miscsim/main.cpp
View File

@@ -22,7 +22,7 @@
#include <QtGlobal>
using namespace swift::misc;
using namespace BlackSample;
using namespace swift::sample;
//! main
int main(int argc, char *argv[])

4
samples/miscsim/samplemiscsim.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 BLACKSAMPLE_BLACKMISCSIM_H
#define BLACKSAMPLE_BLACKMISCSIM_H
#ifndef SWIFT_SAMPLE_SWIFT_MISCSIM_H
#define SWIFT_SAMPLE_SWIFT_MISCSIM_H
// just a dummy header, documentation will go here

2
samples/miscsim/samplesfscommon.cpp
View File

@@ -25,7 +25,7 @@ using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::simulation::settings;
namespace BlackSample
namespace swift::sample
{
void CSamplesFsCommon::samples(QTextStream &streamOut, QTextStream &streamIn)
{

6
samples/miscsim/samplesfscommon.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESFSCOMMON_H
#define BLACKSAMPLE_SAMPLESFSCOMMON_H
#ifndef SWIFT_SAMPLE_SAMPLESFSCOMMON_H
#define SWIFT_SAMPLE_SAMPLESFSCOMMON_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for FsCommon classes
class CSamplesFsCommon

4
samples/miscsim/samplesfsuipc.cpp
View File

@@ -15,12 +15,12 @@
using namespace swift::misc;
using namespace swift::misc::simulation;
namespace BlackSample
namespace swift::sample
{
#ifdef Q_OS_WIN
void CSamplesFsuipc::samplesFsuipc(QTextStream &streamOut)
{
using namespace BlackSimPlugin::FsCommon;
using namespace swift::simplugin::fscommon;
swift::misc::registerMetadata();
QScopedPointer<CFsuipc> fsuipc(new CFsuipc());

6
samples/miscsim/samplesfsuipc.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESFSUIPC_H
#define BLACKSAMPLE_SAMPLESFSUIPC_H
#ifndef SWIFT_SAMPLE_SAMPLESFSUIPC_H
#define SWIFT_SAMPLE_SAMPLESFSUIPC_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for FSUIPC
class CSamplesFsuipc

2
samples/miscsim/samplesfsx.cpp
View File

@@ -12,7 +12,7 @@
using namespace swift::misc::simulation::fsx;
namespace BlackSample
namespace swift::sample
{
void CSamplesFsx::samplesMisc(QTextStream &streamOut)
{

6
samples/miscsim/samplesfsx.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESFSX_H
#define BLACKSAMPLE_SAMPLESFSX_H
#ifndef SWIFT_SAMPLE_SAMPLESFSX_H
#define SWIFT_SAMPLE_SAMPLESFSX_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for FSX classes
class CSamplesFsx

2
samples/miscsim/samplesmodelmapping.cpp
View File

@@ -30,7 +30,7 @@ using namespace swift::misc::simulation::fscommon;
using namespace swift::misc::simulation::settings;
using namespace swift::misc::aviation;
namespace BlackSample
namespace swift::sample
{
void CSamplesModelMapping::samples(QTextStream &streamOut, QTextStream &streamIn)
{

6
samples/miscsim/samplesmodelmapping.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESMODELMAPPING_H
#define BLACKSAMPLE_SAMPLESMODELMAPPING_H
#ifndef SWIFT_SAMPLE_SAMPLESMODELMAPPING_H
#define SWIFT_SAMPLE_SAMPLESMODELMAPPING_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for model mapping classes
class CSamplesModelMapping

2
samples/miscsim/samplesp3d.cpp
View File

@@ -11,7 +11,7 @@
using namespace swift::misc::simulation::fscommon;
namespace BlackSample
namespace swift::sample
{
void CSamplesP3D::samplesMisc(QTextStream &streamOut)
{

6
samples/miscsim/samplesp3d.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESP3D_H
#define BLACKSAMPLE_SAMPLESP3D_H
#ifndef SWIFT_SAMPLE_SAMPLESP3D_H
#define SWIFT_SAMPLE_SAMPLESP3D_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for P3D classes
class CSamplesP3D

2
samples/miscsim/samplesvpilotrules.cpp
View File

@@ -19,7 +19,7 @@ using namespace swift::misc;
using namespace swift::misc::simulation;
using namespace swift::misc::simulation::fscommon;
namespace BlackSample
namespace swift::sample
{
/*

6
samples/miscsim/samplesvpilotrules.h
View File

@@ -4,12 +4,12 @@
//! \file
//! \ingroup samplemiscsim
#ifndef BLACKSAMPLE_SAMPLESVPILOTRULES_H
#define BLACKSAMPLE_SAMPLESVPILOTRULES_H
#ifndef SWIFT_SAMPLE_SAMPLESVPILOTRULES_H
#define SWIFT_SAMPLE_SAMPLESVPILOTRULES_H
class QTextStream;
namespace BlackSample
namespace swift::sample
{
//! Samples for vPilot rules
class CSamplesVPilotRules

4
samples/miscsim/sampleutils.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKSAMPLE_SAMPLEUTILS_H
#define BLACKSAMPLE_SAMPLEUTILS_H
#ifndef SWIFT_SAMPLE_SAMPLEUTILS_H
#define SWIFT_SAMPLE_SAMPLEUTILS_H
#include <QStringList>

4
src/config/buildconfig.h
View File

@@ -3,8 +3,8 @@
//! \file
#ifndef BLACKCONFIG_BUILDCONFIG_H
#define BLACKCONFIG_BUILDCONFIG_H
#ifndef SWIFT_CONFIG_BUILDCONFIG_H
#define SWIFT_CONFIG_BUILDCONFIG_H
#include <QList>
#include <QStringList>

28
src/core/aircraftmatcher.h
View File

@@ -109,11 +109,11 @@ namespace swift::core
//! \remarks model list could be the model set
//! \threadsafe
static swift::misc::aviation::CAirlineIcaoCode failoverValidAirlineIcaoDesignatorModelsFirst(const swift::misc::aviation::CCallsign &callsign,
const QString &primaryIcao, const QString &secondaryIcao,
bool airlineFromCallsign,
const QString &airlineName, const QString &airlineTelephony,
const swift::misc::simulation::CAircraftModelList &models,
swift::misc::CStatusMessageList *log = nullptr);
const QString &primaryIcao, const QString &secondaryIcao,
bool airlineFromCallsign,
const QString &airlineName, const QString &airlineTelephony,
const swift::misc::simulation::CAircraftModelList &models,
swift::misc::CStatusMessageList *log = nullptr);
//! Run the network reverse lookup script
//! \threadsafe
@@ -127,21 +127,21 @@ namespace swift::core
//! Run the matching script
//! \threadsafe
static swift::misc::simulation::MatchingScriptReturnValues matchingScript(const QString &js,
const swift::misc::simulation::CAircraftModel &inModel, const swift::misc::simulation::CAircraftModel &matchedModel, const swift::misc::simulation::CAircraftMatcherSetup &setup,
const swift::misc::simulation::CAircraftModelList &modelSet, swift::misc::simulation::MatchingScript ms,
swift::misc::CStatusMessageList *log);
const swift::misc::simulation::CAircraftModel &inModel, const swift::misc::simulation::CAircraftModel &matchedModel, const swift::misc::simulation::CAircraftMatcherSetup &setup,
const swift::misc::simulation::CAircraftModelList &modelSet, swift::misc::simulation::MatchingScript ms,
swift::misc::CStatusMessageList *log);
//! Try to find the corresponding data in DB and get best information for given data
//! \threadsafe
//! \ingroup reverselookup
//! \remark NOT running matching script
static swift::misc::simulation::CAircraftModel reverseLookupModel(const swift::misc::aviation::CCallsign &callsign,
const swift::misc::aviation::CAircraftIcaoCode &networkAircraftIcao,
const swift::misc::aviation::CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString,
const swift::misc::simulation::CAircraftMatcherSetup &setup,
const swift::misc::simulation::CAircraftModelList &modelSet,
swift::misc::simulation::CAircraftModel::ModelType type,
swift::misc::CStatusMessageList *log);
const swift::misc::aviation::CAircraftIcaoCode &networkAircraftIcao,
const swift::misc::aviation::CAirlineIcaoCode &networkAirlineIcao, const QString &networkLiveryInfo, const QString &networkModelString,
const swift::misc::simulation::CAircraftMatcherSetup &setup,
const swift::misc::simulation::CAircraftModelList &modelSet,
swift::misc::simulation::CAircraftModel::ModelType type,
swift::misc::CStatusMessageList *log);
//! Try to find the corresponding data in DB and get best information for following matching
//! \threadsafe

2
src/core/application.cpp
View File

@@ -1384,7 +1384,7 @@ namespace swift::core
bool CApplication::isSupportingCrashpad() const
{
#ifdef BLACK_USE_CRASHPAD
#ifdef SWIFT_USE_CRASHPAD
return true;
#else
return false;

2
src/core/data/globalsetup.cpp
View File

@@ -23,7 +23,7 @@ using namespace swift::misc;
using namespace swift::misc::json;
using namespace swift::misc::network;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup)
namespace swift::core::data
{

39
src/core/data/globalsetup.h
View File

@@ -19,7 +19,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup)
namespace swift::core::data
{
@@ -179,26 +179,25 @@ namespace swift::core::data
swift::misc::network::CUrl m_vatsimAuthUrl; //!< VATSIM Auth URL
bool m_dbDebugFlag = false; //!< can trigger DEBUG on the server, so you need to know what you are doing. Only works with CBuildConfig::isLocalDeveloperDebugBuild
BLACK_METACLASS(
SWIFT_METACLASS(
CGlobalSetup,
BLACK_METAMEMBER(dbRootDirectoryUrl, 0, RequiredForJson),
BLACK_METAMEMBER(dbHttpsPort, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimStatusFileUrl, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimDataFileUrl, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimServerFileUrl, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimFsdHttpUrl, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimMetarsUrl, 0, RequiredForJson),
BLACK_METAMEMBER(sharedUrl, 0, RequiredForJson),
BLACK_METAMEMBER(onlineHelpUrl, 0, RequiredForJson),
BLACK_METAMEMBER(predefinedServers, 0, RequiredForJson),
BLACK_METAMEMBER(mappingMinimumVersion, 0, RequiredForJson),
BLACK_METAMEMBER(comNavEquipmentHelpUrl, 0, RequiredForJson),
BLACK_METAMEMBER(ssrEquipmentHelpUrl, 0, RequiredForJson),
BLACK_METAMEMBER(dbDebugFlag, 0, RequiredForJson),
BLACK_METAMEMBER(afvApiServerUrl, 0, RequiredForJson),
BLACK_METAMEMBER(afvMapUrl, 0, RequiredForJson),
BLACK_METAMEMBER(vatsimAuthUrl, 0, RequiredForJson)
);
SWIFT_METAMEMBER(dbRootDirectoryUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(dbHttpsPort, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimStatusFileUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimDataFileUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimServerFileUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimFsdHttpUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimMetarsUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(sharedUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(onlineHelpUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(predefinedServers, 0, RequiredForJson),
SWIFT_METAMEMBER(mappingMinimumVersion, 0, RequiredForJson),
SWIFT_METAMEMBER(comNavEquipmentHelpUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(ssrEquipmentHelpUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(dbDebugFlag, 0, RequiredForJson),
SWIFT_METAMEMBER(afvApiServerUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(afvMapUrl, 0, RequiredForJson),
SWIFT_METAMEMBER(vatsimAuthUrl, 0, RequiredForJson));
};
} // ns

2
src/core/data/launchersetup.cpp
View File

@@ -6,7 +6,7 @@
using namespace swift::misc;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup)
namespace swift::core::data
{

13
src/core/data/launchersetup.h
View File

@@ -12,7 +12,7 @@
#include "misc/valueobject.h"
#include "misc/variant.h"
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup)
namespace swift::core::data
{
@@ -91,13 +91,12 @@ namespace swift::core::data
int m_coreMode = static_cast<int>(Standalone); //!< core
int m_audioMode = static_cast<int>(AudioNothingDisabled);
BLACK_METACLASS(
SWIFT_METACLASS(
CLauncherSetup,
BLACK_METAMEMBER(dBusAddress),
BLACK_METAMEMBER(windowFrameless),
BLACK_METAMEMBER(coreMode),
BLACK_METAMEMBER(audioMode)
);
SWIFT_METAMEMBER(dBusAddress),
SWIFT_METAMEMBER(windowFrameless),
SWIFT_METAMEMBER(coreMode),
SWIFT_METAMEMBER(audioMode));
};
//! Trait for global setup data

2
src/core/data/vatsimsetup.cpp
View File

@@ -7,7 +7,7 @@
using namespace swift::misc;
using namespace swift::misc::network;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup)
namespace swift::core::data
{

17
src/core/data/vatsimsetup.h
View File

@@ -20,7 +20,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup)
namespace swift::core::data
{
@@ -98,15 +98,14 @@ namespace swift::core::data
swift::misc::network::CServerList m_fsdServers; //!< FSD test servers
swift::misc::network::CServerList m_voiceServers; //!< voice servers
BLACK_METACLASS(
SWIFT_METACLASS(
CVatsimSetup,
BLACK_METAMEMBER(serverFileUrl),
BLACK_METAMEMBER(dataFileUrl),
BLACK_METAMEMBER(metarFileUrl),
BLACK_METAMEMBER(fsdServers),
BLACK_METAMEMBER(voiceServers),
BLACK_METAMEMBER(timestampMSecsSinceEpoch)
);
SWIFT_METAMEMBER(serverFileUrl),
SWIFT_METAMEMBER(dataFileUrl),
SWIFT_METAMEMBER(metarFileUrl),
SWIFT_METAMEMBER(fsdServers),
SWIFT_METAMEMBER(voiceServers),
SWIFT_METAMEMBER(timestampMSecsSinceEpoch));
};
//! Trait for global setup data

4
src/core/db/databasereaderconfig.cpp
View File

@@ -12,8 +12,8 @@ using namespace swift::misc::db;
using namespace swift::misc::network;
using namespace swift::misc::physical_quantities;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig)
BLACK_DEFINE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList)
namespace swift::core::db
{

12
src/core/db/databasereaderconfig.h
View File

@@ -21,7 +21,7 @@
#include <QTimer>
#include <QtGlobal>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig)
namespace swift::core::db
{
@@ -76,15 +76,15 @@ namespace swift::core::db
int m_retrievalMode = swift::misc::db::CDbFlags::DbReading; //!< swift::misc::db::CDbFlags::DataRetrievalMode
swift::misc::physical_quantities::CTime m_cacheLifetime;
BLACK_METACLASS(
SWIFT_METACLASS(
CDatabaseReaderConfig,
BLACK_METAMEMBER(entities),
BLACK_METAMEMBER(retrievalMode),
BLACK_METAMEMBER(cacheLifetime));
SWIFT_METAMEMBER(entities),
SWIFT_METAMEMBER(retrievalMode),
SWIFT_METAMEMBER(cacheLifetime));
};
}
BLACK_DECLARE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList)
namespace swift::core::db
{

28
src/core/fsd/euroscopesimdata.cpp
View File

@@ -16,20 +16,20 @@ namespace swift::core::fsd
EuroscopeSimData::EuroscopeSimData(const QString &sender, const QString &model, const QString &livery, quint64 timestamp,
double latitude, double longitude, double altitude, double heading, int bank, int pitch,
int groundSpeed, bool onGround, double gearPercent, double thrustPercent, const swift::misc::aviation::CAircraftLights &lights) : MessageBase(sender, {}),
m_model(model),
m_livery(livery),
m_timestamp(timestamp),
m_latitude(latitude),
m_longitude(longitude),
m_altitude(altitude),
m_heading(heading),
m_bank(bank),
m_pitch(pitch),
m_groundSpeed(groundSpeed),
m_onGround(onGround),
m_gearPercent(gearPercent),
m_thrustPercent(thrustPercent),
m_lights(lights)
m_model(model),
m_livery(livery),
m_timestamp(timestamp),
m_latitude(latitude),
m_longitude(longitude),
m_altitude(altitude),
m_heading(heading),
m_bank(bank),
m_pitch(pitch),
m_groundSpeed(groundSpeed),
m_onGround(onGround),
m_gearPercent(gearPercent),
m_thrustPercent(thrustPercent),
m_lights(lights)
{}
QStringList EuroscopeSimData::toTokens() const

4
src/core/fsd/fsdclient.h
View File

@@ -57,7 +57,7 @@
class QNetworkReply;
namespace BlackFsdTest
namespace SwiftFsdTest
{
class CTestFSDClient;
}
@@ -321,7 +321,7 @@ namespace swift::core::fsd
private:
//! \cond
friend BlackFsdTest::CTestFSDClient;
friend SwiftFsdTest::CTestFSDClient;
//! \endcond
//! @{

2
src/core/simulator.h
View File

@@ -267,7 +267,7 @@ namespace swift::core
//! .drv aircraft readd callsign re-add (add again) aircraft swift::core::ISimulator
//! .drv aircraft readd all re-add all aircraft swift::core::ISimulator
//! .drv aircraft rm callsign remove aircraft swift::core::ISimulator
//! .drv fsuipc on|off enable/disable FSUIPC (if applicable) BlackSimPlugin::FsCommon::CSimulatorFsCommon
//! .drv fsuipc on|off enable/disable FSUIPC (if applicable) swift::simplugin::fscommon::CSimulatorFsCommon
//! </pre>
//! Parse command line for simulator drivers, derived classes can add specific parsing by overriding ISimulator::parseDetails
virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator);

4
src/core/vatsim/vatsimsettings.cpp
View File

@@ -6,8 +6,8 @@
using namespace swift::misc;
using namespace swift::misc::physical_quantities;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings)
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings)
namespace swift::core::vatsim
{

22
src/core/vatsim/vatsimsettings.h
View File

@@ -15,8 +15,8 @@
#include "misc/directoryutils.h"
#include "misc/fileutils.h"
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings)
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings)
namespace swift::core::vatsim
{
@@ -72,12 +72,11 @@ namespace swift::core::vatsim
swift::misc::physical_quantities::CTime m_periodicTime { 30.0, swift::misc::physical_quantities::CTimeUnit::s() };
bool m_neverUpdate = false;
BLACK_METACLASS(
SWIFT_METACLASS(
CReaderSettings,
BLACK_METAMEMBER(initialTime),
BLACK_METAMEMBER(periodicTime),
BLACK_METAMEMBER(neverUpdate)
);
SWIFT_METAMEMBER(initialTime),
SWIFT_METAMEMBER(periodicTime),
SWIFT_METAMEMBER(neverUpdate));
};
//! Reader settings
@@ -172,12 +171,11 @@ namespace swift::core::vatsim
QString m_FileDir;
FileWriteMode m_fileWriteMode = None;
BLACK_METACLASS(
SWIFT_METACLASS(
CRawFsdMessageSettings,
BLACK_METAMEMBER(rawFsdMessagesEnabled),
BLACK_METAMEMBER(FileDir),
BLACK_METAMEMBER(fileWriteMode)
);
SWIFT_METAMEMBER(rawFsdMessagesEnabled),
SWIFT_METAMEMBER(FileDir),
SWIFT_METAMEMBER(fileWriteMode));
};
//! Raw FSD message settings

2
src/gui/components/interpolationlogdisplay.h
View File

@@ -137,7 +137,7 @@ namespace swift::gui::components
//! \copydoc swift::core::ISimulator::resetAircraftStatistics
void resetStatistics();
//! \copydoc Blackswift::coreCore::ISimulator::resetLastSentValues
//! \copydoc swift::core::ISimulator::resetLastSentValues
void resetLastSentValues();
//! Clear

8
src/gui/models/liveryfilter.cpp
View File

@@ -12,10 +12,10 @@ namespace swift::gui::models
CLiveryFilter::CLiveryFilter(int id, const QString &combinedCode, const QString &descriptiom,
const QString &airlineDesignator,
const swift::misc::CRgbColor &fuselageColor, const swift::misc::CRgbColor &tailColor, double maxColorDistance, bool colorLiveries, bool airlineLiveries) : m_id(id),
m_combinedCode(combinedCode.trimmed().toUpper()), m_description(descriptiom),
m_airlineIcaoDesignator(airlineDesignator.trimmed().toUpper()),
m_fuselageColor(fuselageColor), m_tailColor(tailColor), m_maxColorDistance(maxColorDistance),
m_colorLiveries(colorLiveries), m_airlineLiveries(airlineLiveries)
m_combinedCode(combinedCode.trimmed().toUpper()), m_description(descriptiom),
m_airlineIcaoDesignator(airlineDesignator.trimmed().toUpper()),
m_fuselageColor(fuselageColor), m_tailColor(tailColor), m_maxColorDistance(maxColorDistance),
m_colorLiveries(colorLiveries), m_airlineLiveries(airlineLiveries)
{
m_valid = valid();
}

2
src/gui/settings/dockwidgetsettings.cpp
View File

@@ -9,7 +9,7 @@
using namespace swift::misc;
using namespace swift::gui;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
namespace swift::gui::settings
{

17
src/gui/settings/dockwidgetsettings.h
View File

@@ -16,7 +16,7 @@
#include <QString>
#include <QMetaType>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings)
namespace swift::gui::settings
{
@@ -100,15 +100,14 @@ namespace swift::gui::settings
bool m_floating = false; //!< floating
bool m_frameless = false; //!< frameless
BLACK_METACLASS(
SWIFT_METACLASS(
CDockWidgetSettings,
BLACK_METAMEMBER(floatingMargins),
BLACK_METAMEMBER(floatingFramelessMargins),
BLACK_METAMEMBER(dockedMargins),
BLACK_METAMEMBER(floating),
BLACK_METAMEMBER(frameless),
BLACK_METAMEMBER(geometry)
);
SWIFT_METAMEMBER(floatingMargins),
SWIFT_METAMEMBER(floatingFramelessMargins),
SWIFT_METAMEMBER(dockedMargins),
SWIFT_METAMEMBER(floating),
SWIFT_METAMEMBER(frameless),
SWIFT_METAMEMBER(geometry));
};
//! Trait for settings for dock widget

2
src/gui/settings/guisettings.cpp
View File

@@ -6,7 +6,7 @@
using namespace swift::misc;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
namespace swift::gui::settings
{

9
src/gui/settings/guisettings.h
View File

@@ -13,7 +13,7 @@
#include <QString>
#include <QAbstractItemView>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings)
namespace swift::gui::settings
{
@@ -60,11 +60,10 @@ namespace swift::gui::settings
QString m_widgetStyle { "Fusion" };
int m_preferredSelection = static_cast<int>(QAbstractItemView::ExtendedSelection);
BLACK_METACLASS(
SWIFT_METACLASS(
CGeneralGuiSettings,
BLACK_METAMEMBER(widgetStyle),
BLACK_METAMEMBER(preferredSelection)
);
SWIFT_METAMEMBER(widgetStyle),
SWIFT_METAMEMBER(preferredSelection));
};
//! General GUI settings

2
src/gui/settings/navigatorsettings.cpp
View File

@@ -9,7 +9,7 @@
using namespace swift::misc;
using namespace swift::gui;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
namespace swift::gui::settings
{

13
src/gui/settings/navigatorsettings.h
View File

@@ -15,7 +15,7 @@
#include <QString>
#include <QMetaType>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings)
namespace swift::gui::settings
{
@@ -83,13 +83,12 @@ namespace swift::gui::settings
bool m_frameless = false; //!< frameless
int m_columns = 1; //!< number of columns
BLACK_METACLASS(
SWIFT_METACLASS(
CNavigatorSettings,
BLACK_METAMEMBER(margins),
BLACK_METAMEMBER(frameless),
BLACK_METAMEMBER(columns),
BLACK_METAMEMBER(geometry)
);
SWIFT_METAMEMBER(margins),
SWIFT_METAMEMBER(frameless),
SWIFT_METAMEMBER(columns),
SWIFT_METAMEMBER(geometry));
};
//! Trait for settings for navigator

2
src/gui/settings/textmessagesettings.cpp
View File

@@ -9,7 +9,7 @@ using namespace swift::misc;
using namespace swift::misc::network;
using namespace swift::misc::simulation;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
namespace swift::gui::settings
{

21
src/gui/settings/textmessagesettings.h
View File

@@ -10,7 +10,7 @@
#include "misc/settingscache.h"
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings)
namespace swift::misc
{
@@ -137,17 +137,16 @@ namespace swift::gui::settings
bool m_latestFirst = false; //!< latest messages first
QString m_styleSheet;
BLACK_METACLASS(
SWIFT_METACLASS(
CTextMessageSettings,
BLACK_METAMEMBER(popupPrivateMessages),
BLACK_METAMEMBER(popupSupervisorMessages),
BLACK_METAMEMBER(popupFrequencyMessages),
BLACK_METAMEMBER(popupAllMessages),
BLACK_METAMEMBER(popupSelcalMessages),
BLACK_METAMEMBER(focus),
BLACK_METAMEMBER(latestFirst),
BLACK_METAMEMBER(styleSheet)
);
SWIFT_METAMEMBER(popupPrivateMessages),
SWIFT_METAMEMBER(popupSupervisorMessages),
SWIFT_METAMEMBER(popupFrequencyMessages),
SWIFT_METAMEMBER(popupAllMessages),
SWIFT_METAMEMBER(popupSelcalMessages),
SWIFT_METAMEMBER(focus),
SWIFT_METAMEMBER(latestFirst),
SWIFT_METAMEMBER(styleSheet));
};
//! Text message settings

2
src/gui/settings/viewupdatesettings.cpp
View File

@@ -10,7 +10,7 @@ using namespace swift::misc;
using namespace swift::misc::physical_quantities;
using namespace swift::gui;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
namespace swift::gui::settings
{

13
src/gui/settings/viewupdatesettings.h
View File

@@ -16,7 +16,7 @@
#include <QString>
#include <QMetaType>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings)
namespace swift::gui::settings
{
@@ -82,13 +82,12 @@ namespace swift::gui::settings
swift::misc::physical_quantities::CTime m_updateRendering { 10.0, swift::misc::physical_quantities::CTimeUnit::s() };
swift::misc::physical_quantities::CTime m_updateUser { 10.0, swift::misc::physical_quantities::CTimeUnit::s() };
BLACK_METACLASS(
SWIFT_METACLASS(
CViewUpdateSettings,
BLACK_METAMEMBER(updateAtc),
BLACK_METAMEMBER(updateAircraft),
BLACK_METAMEMBER(updateRendering),
BLACK_METAMEMBER(updateUser)
);
SWIFT_METAMEMBER(updateAtc),
SWIFT_METAMEMBER(updateAircraft),
SWIFT_METAMEMBER(updateRendering),
SWIFT_METAMEMBER(updateUser));
};
//! Trait for settings about update rates

2
src/misc/applicationinfo.cpp
View File

@@ -11,7 +11,7 @@
using namespace swift::config;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo)
namespace swift::misc
{

21
src/misc/applicationinfo.h
View File

@@ -11,7 +11,7 @@
#include <QMetaType>
#include <QFlags>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo)
namespace swift::misc
{
@@ -176,17 +176,16 @@ namespace swift::misc
//! Guess Application
static Application guessApplication();
BLACK_METACLASS(
SWIFT_METACLASS(
CApplicationInfo,
BLACK_METAMEMBER(app),
BLACK_METAMEMBER(wordSize),
BLACK_METAMEMBER(exePath),
BLACK_METAMEMBER(applicationDataDir),
BLACK_METAMEMBER(version),
BLACK_METAMEMBER(compileInfo),
BLACK_METAMEMBER(platform),
BLACK_METAMEMBER(process)
);
SWIFT_METAMEMBER(app),
SWIFT_METAMEMBER(wordSize),
SWIFT_METAMEMBER(exePath),
SWIFT_METAMEMBER(applicationDataDir),
SWIFT_METAMEMBER(version),
SWIFT_METAMEMBER(compileInfo),
SWIFT_METAMEMBER(platform),
SWIFT_METAMEMBER(process));
};
} // ns

2
src/misc/applicationinfolist.cpp
View File

@@ -9,7 +9,7 @@
using namespace swift::config;
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CApplicationInfo, CApplicationInfoList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CApplicationInfo, CApplicationInfoList)
namespace swift::misc
{

2
src/misc/applicationinfolist.h
View File

@@ -10,7 +10,7 @@
#include "misc/sequence.h"
#include "misc/collection.h"
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CApplicationInfo, CApplicationInfoList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CApplicationInfo, CApplicationInfoList)
namespace swift::misc
{

2
src/misc/audio/audiodeviceinfo.cpp
View File

@@ -12,7 +12,7 @@
#include <QAudioDevice>
#include <QMediaDevices>
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
namespace swift::misc::audio
{

11
src/misc/audio/audiodeviceinfo.h
View File

@@ -14,7 +14,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo)
namespace swift::misc::audio
{
@@ -108,12 +108,11 @@ namespace swift::misc::audio
QString m_deviceName; //!< Device name
CIdentifier m_identifier; //!< We use a DBus based system. Hence an audio device can reside on a different computers, this here is its name
BLACK_METACLASS(
SWIFT_METACLASS(
CAudioDeviceInfo,
BLACK_METAMEMBER(type),
BLACK_METAMEMBER(deviceName),
BLACK_METAMEMBER(identifier)
);
SWIFT_METAMEMBER(type),
SWIFT_METAMEMBER(deviceName),
SWIFT_METAMEMBER(identifier));
};
} // namespace

2
src/misc/audio/audiodeviceinfolist.cpp
View File

@@ -8,7 +8,7 @@
#include <QMediaDevices>
#include <algorithm>
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
namespace swift::misc::audio
{

2
src/misc/audio/audiodeviceinfolist.h
View File

@@ -16,7 +16,7 @@
#include <QAudioDevice>
#include <QStringList>
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList)
namespace swift::misc::audio
{

2
src/misc/audio/audiosettings.cpp
View File

@@ -10,7 +10,7 @@
using namespace swift::misc::audio;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
namespace swift::misc::audio
{

21
src/misc/audio/audiosettings.h
View File

@@ -16,7 +16,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings)
namespace swift::misc::audio
{
@@ -131,17 +131,16 @@ namespace swift::misc::audio
int m_inVolume = 50; //!< AFV range
bool m_audioEffects = true; //!< Audio effects en
BLACK_METACLASS(
SWIFT_METACLASS(
CSettings,
BLACK_METAMEMBER(notificationSoundDir),
BLACK_METAMEMBER(notification),
BLACK_METAMEMBER(notificationVolume),
BLACK_METAMEMBER(outVolume),
BLACK_METAMEMBER(outVolumeCom1),
BLACK_METAMEMBER(outVolumeCom2),
BLACK_METAMEMBER(inVolume),
BLACK_METAMEMBER(audioEffects)
);
SWIFT_METAMEMBER(notificationSoundDir),
SWIFT_METAMEMBER(notification),
SWIFT_METAMEMBER(notificationVolume),
SWIFT_METAMEMBER(outVolume),
SWIFT_METAMEMBER(outVolumeCom1),
SWIFT_METAMEMBER(outVolumeCom2),
SWIFT_METAMEMBER(inVolume),
SWIFT_METAMEMBER(audioEffects));
};
//! Audio related settings

2
src/misc/aviation/aircraftcategory.cpp
View File

@@ -17,7 +17,7 @@
using namespace swift::misc;
using namespace swift::misc::db;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory)
namespace swift::misc::aviation
{

23
src/misc/aviation/aircraftcategory.h
View File

@@ -19,7 +19,7 @@
#include <QString>
#include <QMetaType>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory)
namespace swift::misc::aviation
{
@@ -160,18 +160,17 @@ namespace swift::misc::aviation
int m_l1 = 0;
int m_l2 = 0;
int m_l3 = 0;
BLACK_METACLASS(
SWIFT_METACLASS(
CAircraftCategory,
BLACK_METAMEMBER(dbKey),
BLACK_METAMEMBER(timestampMSecsSinceEpoch),
BLACK_METAMEMBER(name),
BLACK_METAMEMBER(l1),
BLACK_METAMEMBER(l2),
BLACK_METAMEMBER(l3),
BLACK_METAMEMBER(description),
BLACK_METAMEMBER(path),
BLACK_METAMEMBER(assignable)
);
SWIFT_METAMEMBER(dbKey),
SWIFT_METAMEMBER(timestampMSecsSinceEpoch),
SWIFT_METAMEMBER(name),
SWIFT_METAMEMBER(l1),
SWIFT_METAMEMBER(l2),
SWIFT_METAMEMBER(l3),
SWIFT_METAMEMBER(description),
SWIFT_METAMEMBER(path),
SWIFT_METAMEMBER(assignable));
};
//! Category/id map

2
src/misc/aviation/aircraftcategorylist.cpp
View File

@@ -8,7 +8,7 @@
#include <Qt>
#include <QMap>
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircraftcategorylist.h
View File

@@ -18,7 +18,7 @@
#include <QList>
#include <tuple>
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircraftengine.cpp
View File

@@ -6,7 +6,7 @@
#include <QtGlobal>
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine)
namespace swift::misc::aviation
{

9
src/misc/aviation/aircraftengine.h
View File

@@ -13,7 +13,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine)
namespace swift::misc::aviation
{
@@ -49,11 +49,10 @@ namespace swift::misc::aviation
int m_number = 1;
bool m_on = true;
BLACK_METACLASS(
SWIFT_METACLASS(
CAircraftEngine,
BLACK_METAMEMBER(number, 0, DisabledForJson),
BLACK_METAMEMBER(on)
);
SWIFT_METAMEMBER(number, 0, DisabledForJson),
SWIFT_METAMEMBER(on));
};
} // namespace

2
src/misc/aviation/aircraftenginelist.cpp
View File

@@ -6,7 +6,7 @@
#include <QString>
#include <QtGlobal>
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircraftenginelist.h
View File

@@ -18,7 +18,7 @@
#include <initializer_list>
#include <tuple>
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircrafticaocode.cpp
View File

@@ -21,7 +21,7 @@ using namespace swift::misc;
using namespace swift::misc::db;
using namespace swift::misc::physical_quantities;
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode)
namespace swift::misc::aviation
{

37
src/misc/aviation/aircrafticaocode.h
View File

@@ -21,7 +21,7 @@
#include <QString>
#include <QStringList>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode)
namespace swift::misc::aviation
{
@@ -390,25 +390,24 @@ namespace swift::misc::aviation
//! Create a combined string like L2J
static QString createdCombinedString(const QString &type, int engineCount, const QString &engine);
BLACK_METACLASS(
SWIFT_METACLASS(
CAircraftIcaoCode,
BLACK_METAMEMBER(dbKey),
BLACK_METAMEMBER(timestampMSecsSinceEpoch),
BLACK_METAMEMBER(designator),
BLACK_METAMEMBER(iataCode),
BLACK_METAMEMBER(family),
BLACK_METAMEMBER(combinedType),
BLACK_METAMEMBER(manufacturer),
BLACK_METAMEMBER(modelDescription),
BLACK_METAMEMBER(modelIataDescription),
BLACK_METAMEMBER(modelSwiftDescription),
BLACK_METAMEMBER(category),
BLACK_METAMEMBER(wtc),
BLACK_METAMEMBER(military),
BLACK_METAMEMBER(realWorld),
BLACK_METAMEMBER(legacy),
BLACK_METAMEMBER(rank)
);
SWIFT_METAMEMBER(dbKey),
SWIFT_METAMEMBER(timestampMSecsSinceEpoch),
SWIFT_METAMEMBER(designator),
SWIFT_METAMEMBER(iataCode),
SWIFT_METAMEMBER(family),
SWIFT_METAMEMBER(combinedType),
SWIFT_METAMEMBER(manufacturer),
SWIFT_METAMEMBER(modelDescription),
SWIFT_METAMEMBER(modelIataDescription),
SWIFT_METAMEMBER(modelSwiftDescription),
SWIFT_METAMEMBER(category),
SWIFT_METAMEMBER(wtc),
SWIFT_METAMEMBER(military),
SWIFT_METAMEMBER(realWorld),
SWIFT_METAMEMBER(legacy),
SWIFT_METAMEMBER(rank));
};
//! Id/CAircraftIcaoCode map

2
src/misc/aviation/aircrafticaocodelist.cpp
View File

@@ -8,7 +8,7 @@
#include <QJsonValue>
#include <Qt>
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList)
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircrafticaocodelist.h
View File

@@ -17,7 +17,7 @@
#include <QStringList>
#include <tuple>
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList)
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList)
namespace swift::misc::aviation
{

2
src/misc/aviation/aircraftlights.cpp
View File

@@ -6,7 +6,7 @@
#include "misc/comparefunctions.h"
#include <QStringBuilder>
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights)
namespace swift::misc::aviation
{

22
src/misc/aviation/aircraftlights.h
View File

@@ -14,7 +14,7 @@
#include <QMetaType>
#include <QString>
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights)
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights)
namespace swift::misc::aviation
{
@@ -137,17 +137,17 @@ namespace swift::misc::aviation
bool m_recognition = false; //!< not supported by aircraft config (VATSIM)
bool m_cabin = false; //!< not supported by aircraft config (VATSIM)
BLACK_METACLASS(
SWIFT_METACLASS(
CAircraftLights,
BLACK_METAMEMBER(isNull, 0, DisabledForJson), // disable since JSON is used for network
BLACK_METAMEMBER_NAMED(strobeOn, "strobe_on"),
BLACK_METAMEMBER_NAMED(landingOn, "landing_on"),
BLACK_METAMEMBER_NAMED(taxiOn, "taxi_on"),
BLACK_METAMEMBER_NAMED(beaconOn, "beacon_on"),
BLACK_METAMEMBER_NAMED(navOn, "nav_on"),
BLACK_METAMEMBER_NAMED(logoOn, "logo_on"),
BLACK_METAMEMBER(recognition, 0, DisabledForJson), // disable since JSON is used for network
BLACK_METAMEMBER(cabin, 0, DisabledForJson) // disable since JSON is used for network
SWIFT_METAMEMBER(isNull, 0, DisabledForJson), // disable since JSON is used for network
SWIFT_METAMEMBER_NAMED(strobeOn, "strobe_on"),
SWIFT_METAMEMBER_NAMED(landingOn, "landing_on"),
SWIFT_METAMEMBER_NAMED(taxiOn, "taxi_on"),
SWIFT_METAMEMBER_NAMED(beaconOn, "beacon_on"),
SWIFT_METAMEMBER_NAMED(navOn, "nav_on"),
SWIFT_METAMEMBER_NAMED(logoOn, "logo_on"),
SWIFT_METAMEMBER(recognition, 0, DisabledForJson), // disable since JSON is used for network
SWIFT_METAMEMBER(cabin, 0, DisabledForJson) // disable since JSON is used for network
);
};
} // namespace

2
src/misc/aviation/aircraftparts.cpp
View File

@@ -10,7 +10,7 @@
#include "QStringBuilder"
#include <QtGlobal>
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts)
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts)
namespace swift::misc::aviation
{

Some files were not shown because too many files have changed in this diff Show More