From 4d40a0f7ce0c13aff807aa9c798bf789dcc3d950 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 10 Nov 2024 21:50:35 +0100 Subject: [PATCH] refactor: Rename remaining "black" identifiers --- CMakeLists.txt | 2 +- samples/misc/main.cpp | 2 +- samples/misc/samplesalgorithm.cpp | 2 +- samples/misc/samplesalgorithm.h | 2 +- samples/misc/sampleschangeobject.cpp | 2 +- samples/misc/sampleschangeobject.h | 2 +- samples/misc/samplescontainer.cpp | 2 +- samples/misc/samplescontainer.h | 2 +- samples/misc/samplesfile.cpp | 2 +- samples/misc/samplesfile.h | 2 +- samples/misc/samplesjson.cpp | 2 +- samples/misc/samplesjson.h | 2 +- samples/misc/samplesmetadata.cpp | 2 +- samples/misc/samplesmetadata.h | 2 +- samples/misc/samplesperformance.cpp | 2 +- samples/misc/samplesperformance.h | 2 +- samples/miscdbus/main.cpp | 6 +- samples/miscdbus/readme.txt | 4 +- samples/miscdbus/servicetool.cpp | 2 +- samples/miscdbus/servicetool.h | 2 +- samples/miscquantities/main.cpp | 2 +- samples/miscquantities/samplesaviation.cpp | 2 +- samples/miscquantities/samplesaviation.h | 2 +- samples/miscquantities/samplesgeo.cpp | 2 +- samples/miscquantities/samplesgeo.h | 2 +- .../samplesphysicalquantities.cpp | 2 +- .../samplesphysicalquantities.h | 2 +- samples/miscsim/main.cpp | 2 +- samples/miscsim/samplesfscommon.cpp | 2 +- samples/miscsim/samplesfscommon.h | 2 +- samples/miscsim/samplesfsuipc.cpp | 4 +- samples/miscsim/samplesfsuipc.h | 2 +- samples/miscsim/samplesfsx.cpp | 2 +- samples/miscsim/samplesfsx.h | 2 +- samples/miscsim/samplesmodelmapping.cpp | 2 +- samples/miscsim/samplesmodelmapping.h | 2 +- samples/miscsim/samplesp3d.cpp | 2 +- samples/miscsim/samplesp3d.h | 2 +- samples/miscsim/samplesvpilotrules.cpp | 2 +- samples/miscsim/samplesvpilotrules.h | 2 +- src/core/aircraftmatcher.h | 28 ++++----- src/core/application.cpp | 2 +- src/core/data/globalsetup.cpp | 2 +- src/core/data/globalsetup.h | 39 ++++++------ src/core/data/launchersetup.cpp | 2 +- src/core/data/launchersetup.h | 13 ++-- src/core/data/vatsimsetup.cpp | 2 +- src/core/data/vatsimsetup.h | 17 +++--- src/core/db/databasereaderconfig.cpp | 4 +- src/core/db/databasereaderconfig.h | 12 ++-- src/core/fsd/euroscopesimdata.cpp | 28 ++++----- src/core/fsd/fsdclient.h | 4 +- src/core/simulator.h | 2 +- src/core/vatsim/vatsimsettings.cpp | 4 +- src/core/vatsim/vatsimsettings.h | 22 ++++--- src/gui/components/interpolationlogdisplay.h | 2 +- .../components/registermetadatacomponents.h | 1 - src/gui/models/liveryfilter.cpp | 8 +-- src/gui/settings/dockwidgetsettings.cpp | 2 +- src/gui/settings/dockwidgetsettings.h | 17 +++--- src/gui/settings/guisettings.cpp | 2 +- src/gui/settings/guisettings.h | 9 ++- src/gui/settings/navigatorsettings.cpp | 2 +- src/gui/settings/navigatorsettings.h | 13 ++-- src/gui/settings/textmessagesettings.cpp | 2 +- src/gui/settings/textmessagesettings.h | 21 ++++--- src/gui/settings/viewupdatesettings.cpp | 2 +- src/gui/settings/viewupdatesettings.h | 13 ++-- src/misc/applicationinfo.cpp | 2 +- src/misc/applicationinfo.h | 21 ++++--- src/misc/applicationinfolist.cpp | 2 +- src/misc/applicationinfolist.h | 2 +- src/misc/audio/audiodeviceinfo.cpp | 2 +- src/misc/audio/audiodeviceinfo.h | 11 ++-- src/misc/audio/audiodeviceinfolist.cpp | 2 +- src/misc/audio/audiodeviceinfolist.h | 2 +- src/misc/audio/audiosettings.cpp | 2 +- src/misc/audio/audiosettings.h | 21 ++++--- src/misc/aviation/aircraftcategory.cpp | 2 +- src/misc/aviation/aircraftcategory.h | 23 ++++---- src/misc/aviation/aircraftcategorylist.cpp | 2 +- src/misc/aviation/aircraftcategorylist.h | 2 +- src/misc/aviation/aircraftengine.cpp | 2 +- src/misc/aviation/aircraftengine.h | 9 ++- src/misc/aviation/aircraftenginelist.cpp | 2 +- src/misc/aviation/aircraftenginelist.h | 2 +- src/misc/aviation/aircrafticaocode.cpp | 2 +- src/misc/aviation/aircrafticaocode.h | 36 +++++------ src/misc/aviation/aircrafticaocodelist.cpp | 2 +- src/misc/aviation/aircrafticaocodelist.h | 2 +- src/misc/aviation/aircraftlights.cpp | 2 +- src/misc/aviation/aircraftlights.h | 22 +++---- src/misc/aviation/aircraftparts.cpp | 2 +- src/misc/aviation/aircraftparts.h | 23 ++++---- src/misc/aviation/aircraftpartslist.cpp | 2 +- src/misc/aviation/aircraftpartslist.h | 2 +- src/misc/aviation/aircraftsituation.cpp | 2 +- src/misc/aviation/aircraftsituation.h | 39 ++++++------ src/misc/aviation/aircraftsituationchange.cpp | 2 +- src/misc/aviation/aircraftsituationchange.h | 59 +++++++++---------- .../aviation/aircraftsituationchangelist.cpp | 2 +- .../aviation/aircraftsituationchangelist.h | 2 +- src/misc/aviation/aircraftsituationlist.cpp | 2 +- src/misc/aviation/aircraftsituationlist.h | 2 +- src/misc/aviation/aircraftvelocity.cpp | 2 +- src/misc/aviation/aircraftvelocity.h | 17 +++--- src/misc/aviation/airlineicaocode.cpp | 2 +- src/misc/aviation/airlineicaocode.h | 29 +++++---- src/misc/aviation/airlineicaocodelist.cpp | 2 +- src/misc/aviation/airlineicaocodelist.h | 2 +- src/misc/aviation/airport.cpp | 2 +- src/misc/aviation/airport.h | 25 ++++---- src/misc/aviation/airporticaocode.cpp | 2 +- src/misc/aviation/airporticaocode.h | 7 +-- src/misc/aviation/airportlist.cpp | 2 +- src/misc/aviation/airportlist.h | 2 +- src/misc/aviation/altitude.h | 7 +-- src/misc/aviation/atcstation.cpp | 2 +- src/misc/aviation/atcstation.h | 29 +++++---- src/misc/aviation/atcstationlist.cpp | 2 +- src/misc/aviation/atcstationlist.h | 2 +- src/misc/aviation/callsign.cpp | 2 +- src/misc/aviation/callsign.h | 13 ++-- src/misc/aviation/callsignset.cpp | 2 +- src/misc/aviation/callsignset.h | 2 +- src/misc/aviation/comnavequipment.cpp | 2 +- src/misc/aviation/comnavequipment.h | 9 ++- src/misc/aviation/comsystem.h | 5 +- src/misc/aviation/flightplan.cpp | 4 +- src/misc/aviation/flightplan.h | 56 +++++++++--------- src/misc/aviation/flightplanaircraftinfo.cpp | 2 +- src/misc/aviation/flightplanaircraftinfo.h | 13 ++-- src/misc/aviation/flightplanlist.cpp | 2 +- src/misc/aviation/flightplanlist.h | 2 +- src/misc/aviation/heading.h | 5 +- src/misc/aviation/informationmessage.cpp | 2 +- src/misc/aviation/informationmessage.h | 11 ++-- src/misc/aviation/livery.cpp | 2 +- src/misc/aviation/livery.h | 21 ++++--- src/misc/aviation/liverylist.cpp | 2 +- src/misc/aviation/liverylist.h | 2 +- src/misc/aviation/modulator.h | 17 +++--- src/misc/aviation/ongroundinfo.cpp | 2 +- src/misc/aviation/ongroundinfo.h | 10 ++-- src/misc/aviation/selcal.cpp | 2 +- src/misc/aviation/selcal.h | 6 +- src/misc/aviation/simbriefdata.cpp | 2 +- src/misc/aviation/simbriefdata.h | 9 ++- src/misc/aviation/ssrequipment.cpp | 2 +- src/misc/aviation/ssrequipment.h | 7 +-- src/misc/aviation/track.h | 5 +- src/misc/aviation/transponder.cpp | 2 +- src/misc/aviation/transponder.h | 9 ++- src/misc/aviation/waketurbulencecategory.cpp | 2 +- src/misc/aviation/waketurbulencecategory.h | 7 +-- src/misc/collection.h | 18 +++--- src/misc/country.cpp | 2 +- src/misc/country.h | 23 ++++---- src/misc/countrylist.cpp | 2 +- src/misc/countrylist.h | 2 +- src/misc/crashhandler.cpp | 14 ++--- src/misc/crashhandler.h | 2 +- src/misc/crashinfo.cpp | 2 +- src/misc/crashinfo.h | 15 +++-- src/misc/db/artifact.cpp | 2 +- src/misc/db/artifact.h | 23 ++++---- src/misc/db/artifactlist.cpp | 2 +- src/misc/db/artifactlist.h | 2 +- src/misc/db/dbinfo.cpp | 2 +- src/misc/db/dbinfo.h | 13 ++-- src/misc/db/dbinfolist.cpp | 2 +- src/misc/db/dbinfolist.h | 2 +- src/misc/db/distribution.cpp | 2 +- src/misc/db/distribution.h | 15 +++-- src/misc/db/distributionlist.cpp | 2 +- src/misc/db/distributionlist.h | 2 +- src/misc/db/updateinfo.cpp | 2 +- src/misc/db/updateinfo.h | 11 ++-- src/misc/directories.cpp | 2 +- src/misc/directories.h | 15 +++-- src/misc/genericdbusinterface.h | 6 +- src/misc/geo/coordinategeodetic.cpp | 2 +- src/misc/geo/coordinategeodetic.h | 13 ++-- src/misc/geo/coordinategeodeticlist.cpp | 2 +- src/misc/geo/coordinategeodeticlist.h | 2 +- src/misc/geo/elevationplane.h | 5 +- src/misc/icon.h | 11 ++-- src/misc/iconlist.cpp | 2 +- src/misc/iconlist.h | 2 +- src/misc/identifier.cpp | 2 +- src/misc/identifier.h | 15 +++-- src/misc/identifierlist.cpp | 2 +- src/misc/identifierlist.h | 2 +- src/misc/input/actionhotkey.cpp | 2 +- src/misc/input/actionhotkey.h | 11 ++-- src/misc/input/actionhotkeylist.cpp | 2 +- src/misc/input/actionhotkeylist.h | 2 +- src/misc/input/hotkeycombination.cpp | 2 +- src/misc/input/hotkeycombination.h | 9 ++- src/misc/input/joystickbutton.cpp | 2 +- src/misc/input/joystickbutton.h | 9 ++- src/misc/input/joystickbuttonlist.cpp | 2 +- src/misc/input/joystickbuttonlist.h | 2 +- src/misc/input/keyboardkey.cpp | 2 +- src/misc/input/keyboardkey.h | 7 +-- src/misc/input/keyboardkeylist.cpp | 2 +- src/misc/input/keyboardkeylist.h | 2 +- src/misc/logcategory.cpp | 2 +- src/misc/logcategory.h | 7 +-- src/misc/logcategorylist.cpp | 2 +- src/misc/logcategorylist.h | 2 +- src/misc/loghandler.cpp | 4 +- src/misc/loghistory.h | 6 +- src/misc/logmessage.h | 2 +- src/misc/logpattern.h | 9 ++- src/misc/metaclass.h | 40 ++++++------- src/misc/mixin/mixindatastream.h | 2 +- src/misc/mixin/mixindbus.h | 6 +- src/misc/mixin/mixinhash.h | 2 +- src/misc/mixin/mixinindex.h | 2 +- src/misc/mixin/mixinjson.h | 2 +- src/misc/mixin/mixinmetatype.h | 2 +- src/misc/mixin/mixinstring.h | 2 +- src/misc/namevariantpair.cpp | 2 +- src/misc/namevariantpair.h | 11 ++-- src/misc/namevariantpairlist.cpp | 2 +- src/misc/namevariantpairlist.h | 2 +- src/misc/network/authenticateduser.cpp | 2 +- src/misc/network/authenticateduser.h | 25 ++++---- src/misc/network/client.cpp | 2 +- src/misc/network/client.h | 17 +++--- src/misc/network/clientlist.cpp | 2 +- src/misc/network/clientlist.h | 2 +- src/misc/network/connectionstatus.cpp | 2 +- src/misc/network/connectionstatus.h | 7 +-- src/misc/network/ecosystem.cpp | 2 +- src/misc/network/ecosystem.h | 7 +-- src/misc/network/ecosystemlist.cpp | 2 +- src/misc/network/ecosystemlist.h | 2 +- src/misc/network/facilitytype.cpp | 2 +- src/misc/network/facilitytype.h | 7 +-- src/misc/network/fsdsetup.cpp | 2 +- src/misc/network/fsdsetup.h | 9 ++- src/misc/network/loginmode.cpp | 2 +- src/misc/network/loginmode.h | 7 +-- src/misc/network/rawfsdmessage.cpp | 2 +- src/misc/network/rawfsdmessage.h | 9 ++- src/misc/network/rawfsdmessagelist.cpp | 2 +- src/misc/network/rawfsdmessagelist.h | 2 +- src/misc/network/remotefile.cpp | 2 +- src/misc/network/remotefile.h | 17 +++--- src/misc/network/remotefilelist.cpp | 2 +- src/misc/network/remotefilelist.h | 2 +- src/misc/network/role.cpp | 2 +- src/misc/network/role.h | 11 ++-- src/misc/network/rolelist.cpp | 2 +- src/misc/network/rolelist.h | 2 +- src/misc/network/server.cpp | 2 +- src/misc/network/server.h | 25 ++++---- src/misc/network/serverlist.cpp | 2 +- src/misc/network/serverlist.h | 2 +- src/misc/network/textmessage.cpp | 2 +- src/misc/network/textmessage.h | 15 +++-- src/misc/network/textmessagelist.cpp | 2 +- src/misc/network/textmessagelist.h | 2 +- src/misc/network/url.cpp | 2 +- src/misc/network/url.h | 17 +++--- src/misc/network/urllog.cpp | 2 +- src/misc/network/urllog.h | 15 +++-- src/misc/network/urlloglist.cpp | 2 +- src/misc/network/urlloglist.h | 2 +- src/misc/network/user.cpp | 2 +- src/misc/network/user.h | 17 +++--- src/misc/network/userlist.cpp | 2 +- src/misc/network/userlist.h | 2 +- src/misc/network/voicecapabilities.cpp | 2 +- src/misc/network/voicecapabilities.h | 7 +-- src/misc/pixmap.cpp | 2 +- src/misc/pixmap.h | 7 +-- src/misc/platform.cpp | 2 +- src/misc/platform.h | 7 +-- src/misc/platformset.cpp | 2 +- src/misc/platformset.h | 2 +- src/misc/pq/physicalquantity.cpp | 18 +++--- src/misc/pq/physicalquantity.h | 38 ++++++------ src/misc/pq/pqstring.cpp | 2 +- src/misc/pq/pqstring.h | 7 +-- src/misc/pq/units.cpp | 18 +++--- src/misc/pq/units.h | 52 ++++++++-------- src/misc/processinfo.cpp | 2 +- src/misc/processinfo.h | 9 ++- src/misc/propertyindex.h | 5 +- src/misc/propertyindexlist.cpp | 2 +- src/misc/propertyindexlist.h | 2 +- src/misc/rgbcolor.cpp | 2 +- src/misc/rgbcolor.h | 11 ++-- src/misc/sequence.h | 16 ++--- src/misc/sharedstate/datalink.h | 2 +- src/misc/sharedstate/passiveobserver.cpp | 2 +- src/misc/sharedstate/passiveobserver.h | 4 +- src/misc/simulation/aircraftmatchersetup.cpp | 2 +- src/misc/simulation/aircraftmatchersetup.h | 21 ++++--- src/misc/simulation/aircraftmodel.cpp | 2 +- src/misc/simulation/aircraftmodel.h | 43 +++++++------- src/misc/simulation/aircraftmodellist.cpp | 2 +- src/misc/simulation/aircraftmodellist.h | 2 +- .../simulation/airspaceaircraftsnapshot.cpp | 2 +- .../simulation/airspaceaircraftsnapshot.h | 17 +++--- src/misc/simulation/distributor.cpp | 2 +- src/misc/simulation/distributor.h | 20 +++---- src/misc/simulation/distributorlist.cpp | 2 +- src/misc/simulation/distributorlist.h | 2 +- .../simulation/distributorlistpreferences.cpp | 2 +- .../simulation/distributorlistpreferences.h | 17 +++--- .../fscommon/aircraftcfgentries.cpp | 2 +- .../simulation/fscommon/aircraftcfgentries.h | 37 ++++++------ .../fscommon/aircraftcfgentrieslist.cpp | 2 +- .../fscommon/aircraftcfgentrieslist.h | 2 +- .../simulation/fscommon/vpilotmodelrule.cpp | 2 +- .../simulation/fscommon/vpilotmodelrule.h | 15 +++-- .../fscommon/vpilotmodelruleset.cpp | 2 +- .../simulation/fscommon/vpilotmodelruleset.h | 2 +- .../interpolationrenderingsetup.cpp | 4 +- .../interpolationrenderingsetup.h | 46 +++++++-------- .../interpolation/interpolationsetuplist.cpp | 2 +- .../interpolation/interpolationsetuplist.h | 2 +- src/misc/simulation/matchingstatistics.cpp | 2 +- src/misc/simulation/matchingstatistics.h | 2 +- .../simulation/matchingstatisticsentry.cpp | 2 +- src/misc/simulation/matchingstatisticsentry.h | 19 +++--- .../settings/fgswiftbussettings.cpp | 2 +- .../simulation/settings/fgswiftbussettings.h | 7 +-- .../simulation/settings/modelsettings.cpp | 2 +- src/misc/simulation/settings/modelsettings.h | 7 +-- .../simulation/settings/simulatorsettings.cpp | 6 +- .../simulation/settings/simulatorsettings.h | 37 ++++++------ .../settings/swiftpluginsettings.cpp | 2 +- .../simulation/settings/swiftpluginsettings.h | 12 ++-- .../simulation/settings/xswiftbussettings.cpp | 2 +- .../simulation/settings/xswiftbussettings.h | 31 +++++----- src/misc/simulation/simulatedaircraft.cpp | 2 +- src/misc/simulation/simulatedaircraft.h | 35 ++++++----- src/misc/simulation/simulatedaircraftlist.cpp | 2 +- src/misc/simulation/simulatedaircraftlist.h | 2 +- src/misc/simulation/simulatorinfo.cpp | 2 +- src/misc/simulation/simulatorinfo.h | 7 +-- src/misc/simulation/simulatorinfolist.cpp | 2 +- src/misc/simulation/simulatorinfolist.h | 2 +- src/misc/simulation/simulatorinternals.cpp | 2 +- src/misc/simulation/simulatorinternals.h | 7 +-- src/misc/simulation/simulatorplugininfo.cpp | 2 +- src/misc/simulation/simulatorplugininfo.h | 17 +++--- .../simulation/simulatorplugininfolist.cpp | 2 +- src/misc/simulation/simulatorplugininfolist.h | 2 +- .../simulation/xplane/navdatareference.cpp | 4 +- src/misc/simulation/xplane/navdatareference.h | 11 ++-- src/misc/statusmessage.cpp | 2 +- src/misc/statusmessage.h | 17 +++--- src/misc/statusmessagelist.cpp | 2 +- src/misc/statusmessagelist.h | 2 +- src/misc/valuecache.h | 7 +-- src/misc/valueobject.h | 14 ++--- src/misc/variantlist.cpp | 2 +- src/misc/variantlist.h | 2 +- src/misc/verify.cpp | 12 ++-- src/misc/weather/cloudlayer.cpp | 2 +- src/misc/weather/cloudlayer.h | 17 +++--- src/misc/weather/cloudlayerlist.cpp | 2 +- src/misc/weather/cloudlayerlist.h | 2 +- src/misc/weather/metar.cpp | 2 +- src/misc/weather/metar.h | 31 +++++----- src/misc/weather/metarlist.cpp | 2 +- src/misc/weather/metarlist.h | 2 +- src/misc/weather/presentweather.cpp | 2 +- src/misc/weather/presentweather.h | 11 ++-- src/misc/weather/presentweatherlist.cpp | 2 +- src/misc/weather/presentweatherlist.h | 2 +- src/misc/weather/windlayer.cpp | 2 +- src/misc/weather/windlayer.h | 19 +++--- src/misc/weather/windlayerlist.cpp | 2 +- src/misc/weather/windlayerlist.h | 2 +- .../simulator/emulated/simulatoremulated.cpp | 4 +- .../simulator/emulated/simulatoremulated.h | 20 +++---- .../emulated/simulatoremulatedfactory.cpp | 2 +- .../emulated/simulatoremulatedfactory.h | 2 +- .../simulatoremulatedmonitordialog.cpp | 2 +- .../emulated/simulatoremulatedmonitordialog.h | 2 +- .../simulatoremulatedconfig.cpp | 2 +- .../emulatedconfig/simulatoremulatedconfig.h | 2 +- .../simulatoremulatedconfigwidget.cpp | 2 +- .../simulatoremulatedconfigwidget.h | 2 +- .../flightgear/fgswiftbusserviceproxy.cpp | 2 +- .../flightgear/fgswiftbusserviceproxy.h | 4 +- .../flightgear/fgswiftbustrafficproxy.cpp | 2 +- .../flightgear/fgswiftbustrafficproxy.h | 8 +-- .../flightgear/flightgearmpaircraft.cpp | 2 +- .../flightgear/flightgearmpaircraft.h | 2 +- .../flightgear/simulatorflightgear.cpp | 14 ++--- .../flightgear/simulatorflightgear.h | 4 +- .../simulatorflightgearconfig.cpp | 2 +- .../simulatorflightgearconfig.h | 2 +- .../simulatorflightgearconfigwindow.cpp | 2 +- .../simulatorflightgearconfigwindow.h | 2 +- src/plugins/simulator/fs9/callbackwrapper.h | 2 +- src/plugins/simulator/fs9/directplayerror.cpp | 2 +- src/plugins/simulator/fs9/directplayerror.h | 2 +- src/plugins/simulator/fs9/directplaypeer.cpp | 2 +- src/plugins/simulator/fs9/directplaypeer.h | 2 +- src/plugins/simulator/fs9/directplayutils.h | 2 +- src/plugins/simulator/fs9/fs9.h | 2 +- src/plugins/simulator/fs9/fs9client.cpp | 4 +- src/plugins/simulator/fs9/fs9client.h | 6 +- src/plugins/simulator/fs9/fs9host.cpp | 2 +- src/plugins/simulator/fs9/fs9host.h | 6 +- src/plugins/simulator/fs9/hostnode.cpp | 2 +- src/plugins/simulator/fs9/hostnode.h | 2 +- src/plugins/simulator/fs9/lobbyclient.cpp | 2 +- src/plugins/simulator/fs9/lobbyclient.h | 2 +- .../simulator/fs9/multiplayerpacketparser.cpp | 2 +- .../simulator/fs9/multiplayerpacketparser.h | 2 +- .../simulator/fs9/multiplayerpackets.h | 2 +- .../simulator/fs9/registermetadata.cpp | 2 +- src/plugins/simulator/fs9/registermetadata.h | 2 +- src/plugins/simulator/fs9/simulatorfs9.cpp | 4 +- src/plugins/simulator/fs9/simulatorfs9.h | 6 +- src/plugins/simulator/fscommon/fsuipc.h | 2 +- .../simulator/fscommon/fsuipcdummy.cpp | 4 +- src/plugins/simulator/fscommon/fsuipcimpl.cpp | 2 +- .../simulator/fscommon/simulatorfscommon.cpp | 6 +- .../simulator/fscommon/simulatorfscommon.h | 4 +- .../fscommon/simulatorfscommonfunctions.h | 2 +- src/plugins/simulator/fsx/simulatorfsx.cpp | 2 +- src/plugins/simulator/fsx/simulatorfsx.h | 4 +- .../simulator/fsx/simulatorfsxfactory.cpp | 2 +- .../simulator/fsx/simulatorfsxfactory.h | 2 +- .../fsxcommon/fsxsettingscomponent.cpp | 2 +- .../fsxcommon/fsxsettingscomponent.h | 2 +- .../fsxcommon/simconnectdatadefinition.cpp | 4 +- .../fsxcommon/simconnectdatadefinition.h | 2 +- .../simulator/fsxcommon/simconnectobject.cpp | 2 +- .../simulator/fsxcommon/simconnectobject.h | 2 +- .../fsxcommon/simconnectsettingscomponent.cpp | 2 +- .../fsxcommon/simconnectsettingscomponent.h | 2 +- .../fsxcommon/simulatorfsxcommon.cpp | 6 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 4 +- .../fsxcommon/simulatorfsxconfigwindow.cpp | 2 +- .../fsxcommon/simulatorfsxconfigwindow.h | 2 +- .../fsxcommon/simulatorfsxconfigwindow.ui | 8 +-- .../fsxcommon/simulatorfsxsimconnectproc.cpp | 2 +- .../fsxconfig/simulatorfsxconfig.cpp | 4 +- .../simulator/fsxconfig/simulatorfsxconfig.h | 2 +- src/plugins/simulator/msfs/simulatormsfs.cpp | 4 +- src/plugins/simulator/msfs/simulatormsfs.h | 6 +- .../simulator/msfs/simulatormsfsfactory.cpp | 2 +- src/plugins/simulator/p3d/simulatorp3d.cpp | 6 +- src/plugins/simulator/p3d/simulatorp3d.h | 2 +- .../simulator/p3d/simulatorp3dfactory.cpp | 2 +- .../simulator/p3d/simulatorp3dfactory.h | 2 +- .../p3dconfig/simulatorp3dconfig.cpp | 2 +- .../simulator/p3dconfig/simulatorp3dconfig.h | 2 +- .../plugincommon/simulatorplugincommon.cpp | 4 +- .../plugincommon/simulatorplugincommon.h | 2 +- .../simulator/xplane/simulatorxplane.cpp | 2 +- .../simulator/xplane/simulatorxplane.h | 10 ++-- .../simulator/xplane/xplanempaircraft.cpp | 2 +- .../simulator/xplane/xplanempaircraft.h | 2 +- .../xplane/xswiftbusserviceproxy.cpp | 2 +- .../simulator/xplane/xswiftbusserviceproxy.h | 20 +++---- .../xplane/xswiftbustrafficproxy.cpp | 2 +- .../simulator/xplane/xswiftbustrafficproxy.h | 8 +-- .../xplaneconfig/simulatorxplaneconfig.cpp | 2 +- .../xplaneconfig/simulatorxplaneconfig.h | 2 +- .../simulatorxplaneconfigwindow.cpp | 2 +- .../simulatorxplaneconfigwindow.h | 2 +- src/sound/tonepair.cpp | 4 +- tests/CMakeLists.txt | 2 +- .../core/context/testcontext/testcontext.cpp | 2 +- .../core/fsd/testfsdclient/testfsdclient.cpp | 6 +- .../fsd/testfsdmessages/testfsdmessages.cpp | 4 +- .../{BlackCore => SwiftCore}/Expect/Dict.pm | 0 .../{BlackCore => SwiftCore}/Expect/Test.pm | 0 .../core/{blackcoretest.h => swiftcoretest.h} | 0 .../testconnectivity/testconnectivity.cpp | 2 +- tests/core/testreaders/testreaders.cpp | 2 +- tests/gui/{blackguitest.h => swiftguitest.h} | 0 tests/gui/testguiutility/testguiutility.cpp | 2 +- .../testaircraftparts/testaircraftparts.cpp | 2 +- .../testaircraftsituation.cpp | 2 +- .../aviation/testaviation/testaviation.cpp | 2 +- .../testflightplan/testflightplan.cpp | 2 +- .../testflightplanaircraftinfo.cpp | 2 +- tests/misc/geo/testgeo/testgeo.cpp | 2 +- tests/misc/input/testinput/testinput.cpp | 2 +- tests/misc/math/testmath/testmath.cpp | 2 +- .../testphysicalquantities.cpp | 2 +- .../testinterpolatorlinear.cpp | 2 +- .../testinterpolatorlinearpbh.cpp | 2 +- .../testinterpolatormisc.cpp | 2 +- .../testinterpolatorparts.cpp | 2 +- .../misc/simulation/testxplane/testxplane.cpp | 2 +- .../misc/{blackmisctest.h => swiftmisctest.h} | 0 tests/misc/testcompress/testcompress.cpp | 2 +- tests/misc/testcontainers/testcontainers.cpp | 2 +- tests/misc/testdatastream/testdatastream.cpp | 2 +- tests/misc/testdbus/testdbus.cpp | 2 +- tests/misc/testicon/testicon.cpp | 2 +- tests/misc/testidentifier/testidentifier.cpp | 2 +- tests/misc/testprocess/testprocess.cpp | 2 +- .../testpropertyindex/testpropertyindex.cpp | 2 +- .../misc/testsharedstate/testsharedstate.cpp | 2 +- tests/misc/testsharedstate/testsharedstate.h | 14 ++--- tests/misc/testslot/testslot.cpp | 2 +- .../teststatusmessage/teststatusmessage.cpp | 2 +- .../misc/teststringutils/teststringutils.cpp | 2 +- tests/misc/testvaluecache/testvaluecache.cpp | 2 +- tests/misc/testvalueobject.h | 7 +-- .../testvariantandmap/testvariantandmap.cpp | 2 +- tests/misc/testworker/testworker.cpp | 2 +- .../misc/weather/testweather/testweather.cpp | 2 +- .../CMakeLists.txt | 2 +- .../simpluginfsxp3dtest.h} | 6 +- .../testsimpluginfsxp3d.cpp} | 10 ++-- .../testsimpluginfsxp3d.h} | 4 +- tests/test.h | 10 ++-- 524 files changed, 1477 insertions(+), 1584 deletions(-) rename tests/core/scripts/perllib/{BlackCore => SwiftCore}/Expect/Dict.pm (100%) rename tests/core/scripts/perllib/{BlackCore => SwiftCore}/Expect/Test.pm (100%) rename tests/core/{blackcoretest.h => swiftcoretest.h} (100%) rename tests/gui/{blackguitest.h => swiftguitest.h} (100%) rename tests/misc/{blackmisctest.h => swiftmisctest.h} (100%) rename tests/{blacksimpluginfsxp3d => simpluginfsxp3d}/CMakeLists.txt (75%) rename tests/{blacksimpluginfsxp3d/blacksimpluginfsxp3dtest.h => simpluginfsxp3d/simpluginfsxp3dtest.h} (59%) rename tests/{blacksimpluginfsxp3d/testblacksimpluginfsxp3d.cpp => simpluginfsxp3d/testsimpluginfsxp3d.cpp} (93%) rename tests/{blacksimpluginfsxp3d/testblacksimpluginfsxp3d.h => simpluginfsxp3d/testsimpluginfsxp3d.h} (91%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 889f6f5a58..7d79373910 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/samples/misc/main.cpp b/samples/misc/main.cpp index f4a2b9fa23..5dd49594d2 100644 --- a/samples/misc/main.cpp +++ b/samples/misc/main.cpp @@ -20,7 +20,7 @@ //! \ingroup samplekmisc using namespace swift::misc; -using namespace BlackSample; +using namespace swift::sample; using namespace swift::core; //! main diff --git a/samples/misc/samplesalgorithm.cpp b/samples/misc/samplesalgorithm.cpp index 456abd0846..185c3bc1da 100644 --- a/samples/misc/samplesalgorithm.cpp +++ b/samples/misc/samplesalgorithm.cpp @@ -22,7 +22,7 @@ #include #include -namespace BlackSample +namespace swift::sample { int CSamplesAlgorithm::samples() { diff --git a/samples/misc/samplesalgorithm.h b/samples/misc/samplesalgorithm.h index a03bfc6171..7362f0c412 100644 --- a/samples/misc/samplesalgorithm.h +++ b/samples/misc/samplesalgorithm.h @@ -6,7 +6,7 @@ #pragma once -namespace BlackSample +namespace swift::sample { //! Samples for our algorithms class CSamplesAlgorithm diff --git a/samples/misc/sampleschangeobject.cpp b/samples/misc/sampleschangeobject.cpp index 94aee62ab9..9501177138 100644 --- a/samples/misc/sampleschangeobject.cpp +++ b/samples/misc/sampleschangeobject.cpp @@ -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() { diff --git a/samples/misc/sampleschangeobject.h b/samples/misc/sampleschangeobject.h index d575d4fbd7..025e99d5e8 100644 --- a/samples/misc/sampleschangeobject.h +++ b/samples/misc/sampleschangeobject.h @@ -6,7 +6,7 @@ #pragma once -namespace BlackSample +namespace swift::sample { //! Samples for metadata class CSamplesChangeObject diff --git a/samples/misc/samplescontainer.cpp b/samples/misc/samplescontainer.cpp index 7869eec58b..0eab9e639b 100644 --- a/samples/misc/samplescontainer.cpp +++ b/samples/misc/samplescontainer.cpp @@ -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() { diff --git a/samples/misc/samplescontainer.h b/samples/misc/samplescontainer.h index ee66c98993..b5cbca7a1c 100644 --- a/samples/misc/samplescontainer.h +++ b/samples/misc/samplescontainer.h @@ -6,7 +6,7 @@ #pragma once -namespace BlackSample +namespace swift::sample { //! Samples for our containers class CSamplesContainer diff --git a/samples/misc/samplesfile.cpp b/samples/misc/samplesfile.cpp index c7d396a64b..f5057fff34 100644 --- a/samples/misc/samplesfile.cpp +++ b/samples/misc/samplesfile.cpp @@ -10,7 +10,7 @@ using namespace swift::misc; -namespace BlackSample +namespace swift::sample { int CSamplesFile::samples(QTextStream &out) { diff --git a/samples/misc/samplesfile.h b/samples/misc/samplesfile.h index 12f69ef3ed..b2dd435d9e 100644 --- a/samples/misc/samplesfile.h +++ b/samples/misc/samplesfile.h @@ -8,7 +8,7 @@ #include -namespace BlackSample +namespace swift::sample { //! Samples for file/directory class CSamplesFile diff --git a/samples/misc/samplesjson.cpp b/samples/misc/samplesjson.cpp index 5761376fe3..ec1263a493 100644 --- a/samples/misc/samplesjson.cpp +++ b/samples/misc/samplesjson.cpp @@ -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() { diff --git a/samples/misc/samplesjson.h b/samples/misc/samplesjson.h index 0655f39250..f347f7e3e0 100644 --- a/samples/misc/samplesjson.h +++ b/samples/misc/samplesjson.h @@ -6,7 +6,7 @@ #pragma once -namespace BlackSample +namespace swift::sample { //! Samples for metadata diff --git a/samples/misc/samplesmetadata.cpp b/samples/misc/samplesmetadata.cpp index e3fabd0846..97d914134b 100644 --- a/samples/misc/samplesmetadata.cpp +++ b/samples/misc/samplesmetadata.cpp @@ -11,7 +11,7 @@ #include #include -namespace BlackSample +namespace swift::sample { int CSamplesMetadata::samples() { diff --git a/samples/misc/samplesmetadata.h b/samples/misc/samplesmetadata.h index b6bc2d01a3..55a04febed 100644 --- a/samples/misc/samplesmetadata.h +++ b/samples/misc/samplesmetadata.h @@ -6,7 +6,7 @@ #pragma once -namespace BlackSample +namespace swift::sample { //! Samples for metadata diff --git a/samples/misc/samplesperformance.cpp b/samples/misc/samplesperformance.cpp index 05ae952b06..9eb4d8be0c 100644 --- a/samples/misc/samplesperformance.cpp +++ b/samples/misc/samplesperformance.cpp @@ -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) { diff --git a/samples/misc/samplesperformance.h b/samples/misc/samplesperformance.h index 49e6fdea14..2654e39eeb 100644 --- a/samples/misc/samplesperformance.h +++ b/samples/misc/samplesperformance.h @@ -17,7 +17,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for our containers class CSamplesPerformance diff --git a/samples/miscdbus/main.cpp b/samples/miscdbus/main.cpp index 258db39a39..b4b25e37e7 100644 --- a/samples/miscdbus/main.cpp +++ b/samples/miscdbus/main.cpp @@ -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(); diff --git a/samples/miscdbus/readme.txt b/samples/miscdbus/readme.txt index 663dafaded..ad527cc5ac 100644 --- a/samples/miscdbus/readme.txt +++ b/samples/miscdbus/readme.txt @@ -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 diff --git a/samples/miscdbus/servicetool.cpp b/samples/miscdbus/servicetool.cpp index 3f097a5cd2..d7f11643d5 100644 --- a/samples/miscdbus/servicetool.cpp +++ b/samples/miscdbus/servicetool.cpp @@ -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) { diff --git a/samples/miscdbus/servicetool.h b/samples/miscdbus/servicetool.h index 7eb62d59e6..bac58b8001 100644 --- a/samples/miscdbus/servicetool.h +++ b/samples/miscdbus/servicetool.h @@ -20,7 +20,7 @@ namespace swift::misc { class CDBusServer; } -namespace BlackSample +namespace swift::sample { class Testservice; // forward declaration diff --git a/samples/miscquantities/main.cpp b/samples/miscquantities/main.cpp index ed63353081..a7f8d8122a 100644 --- a/samples/miscquantities/main.cpp +++ b/samples/miscquantities/main.cpp @@ -17,7 +17,7 @@ #include using namespace swift::misc; -using namespace BlackSample; +using namespace swift::sample; using namespace swift::core; //! main diff --git a/samples/miscquantities/samplesaviation.cpp b/samples/miscquantities/samplesaviation.cpp index c2306dcef5..d93105bef9 100644 --- a/samples/miscquantities/samplesaviation.cpp +++ b/samples/miscquantities/samplesaviation.cpp @@ -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) { diff --git a/samples/miscquantities/samplesaviation.h b/samples/miscquantities/samplesaviation.h index 2f61c88f58..eab711f4ea 100644 --- a/samples/miscquantities/samplesaviation.h +++ b/samples/miscquantities/samplesaviation.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for aviation diff --git a/samples/miscquantities/samplesgeo.cpp b/samples/miscquantities/samplesgeo.cpp index ef7fbd68b6..6a2940f458 100644 --- a/samples/miscquantities/samplesgeo.cpp +++ b/samples/miscquantities/samplesgeo.cpp @@ -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) { diff --git a/samples/miscquantities/samplesgeo.h b/samples/miscquantities/samplesgeo.h index 821073aa15..ba5d101bb6 100644 --- a/samples/miscquantities/samplesgeo.h +++ b/samples/miscquantities/samplesgeo.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for physical quantities class CSamplesGeo diff --git a/samples/miscquantities/samplesphysicalquantities.cpp b/samples/miscquantities/samplesphysicalquantities.cpp index e1449e19c2..f85ae46401 100644 --- a/samples/miscquantities/samplesphysicalquantities.cpp +++ b/samples/miscquantities/samplesphysicalquantities.cpp @@ -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) { diff --git a/samples/miscquantities/samplesphysicalquantities.h b/samples/miscquantities/samplesphysicalquantities.h index f7578da3e7..bafac3d728 100644 --- a/samples/miscquantities/samplesphysicalquantities.h +++ b/samples/miscquantities/samplesphysicalquantities.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for physical quantities diff --git a/samples/miscsim/main.cpp b/samples/miscsim/main.cpp index 99fc2ad171..3a52a6104f 100644 --- a/samples/miscsim/main.cpp +++ b/samples/miscsim/main.cpp @@ -22,7 +22,7 @@ #include using namespace swift::misc; -using namespace BlackSample; +using namespace swift::sample; //! main int main(int argc, char *argv[]) diff --git a/samples/miscsim/samplesfscommon.cpp b/samples/miscsim/samplesfscommon.cpp index cdb2437aec..e7e21e33ab 100644 --- a/samples/miscsim/samplesfscommon.cpp +++ b/samples/miscsim/samplesfscommon.cpp @@ -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) { diff --git a/samples/miscsim/samplesfscommon.h b/samples/miscsim/samplesfscommon.h index d3a909efb2..fef2ad4a6c 100644 --- a/samples/miscsim/samplesfscommon.h +++ b/samples/miscsim/samplesfscommon.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for FsCommon classes class CSamplesFsCommon diff --git a/samples/miscsim/samplesfsuipc.cpp b/samples/miscsim/samplesfsuipc.cpp index c530a689eb..6903e3ddac 100644 --- a/samples/miscsim/samplesfsuipc.cpp +++ b/samples/miscsim/samplesfsuipc.cpp @@ -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 fsuipc(new CFsuipc()); diff --git a/samples/miscsim/samplesfsuipc.h b/samples/miscsim/samplesfsuipc.h index d710bc0d3b..0699fe9e37 100644 --- a/samples/miscsim/samplesfsuipc.h +++ b/samples/miscsim/samplesfsuipc.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for FSUIPC class CSamplesFsuipc diff --git a/samples/miscsim/samplesfsx.cpp b/samples/miscsim/samplesfsx.cpp index 8e0d81a30c..f359b4b237 100644 --- a/samples/miscsim/samplesfsx.cpp +++ b/samples/miscsim/samplesfsx.cpp @@ -12,7 +12,7 @@ using namespace swift::misc::simulation::fsx; -namespace BlackSample +namespace swift::sample { void CSamplesFsx::samplesMisc(QTextStream &streamOut) { diff --git a/samples/miscsim/samplesfsx.h b/samples/miscsim/samplesfsx.h index e35015e672..9ad5b48533 100644 --- a/samples/miscsim/samplesfsx.h +++ b/samples/miscsim/samplesfsx.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for FSX classes class CSamplesFsx diff --git a/samples/miscsim/samplesmodelmapping.cpp b/samples/miscsim/samplesmodelmapping.cpp index 5ee0a6abc4..b9367af4f9 100644 --- a/samples/miscsim/samplesmodelmapping.cpp +++ b/samples/miscsim/samplesmodelmapping.cpp @@ -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) { diff --git a/samples/miscsim/samplesmodelmapping.h b/samples/miscsim/samplesmodelmapping.h index f4d63c1a7b..64b34ee4d2 100644 --- a/samples/miscsim/samplesmodelmapping.h +++ b/samples/miscsim/samplesmodelmapping.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for model mapping classes class CSamplesModelMapping diff --git a/samples/miscsim/samplesp3d.cpp b/samples/miscsim/samplesp3d.cpp index b08a73bdb1..f103259093 100644 --- a/samples/miscsim/samplesp3d.cpp +++ b/samples/miscsim/samplesp3d.cpp @@ -11,7 +11,7 @@ using namespace swift::misc::simulation::fscommon; -namespace BlackSample +namespace swift::sample { void CSamplesP3D::samplesMisc(QTextStream &streamOut) { diff --git a/samples/miscsim/samplesp3d.h b/samples/miscsim/samplesp3d.h index 5865a70db8..ad1ee37944 100644 --- a/samples/miscsim/samplesp3d.h +++ b/samples/miscsim/samplesp3d.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for P3D classes class CSamplesP3D diff --git a/samples/miscsim/samplesvpilotrules.cpp b/samples/miscsim/samplesvpilotrules.cpp index dd6f845f2d..62e6898beb 100644 --- a/samples/miscsim/samplesvpilotrules.cpp +++ b/samples/miscsim/samplesvpilotrules.cpp @@ -19,7 +19,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; -namespace BlackSample +namespace swift::sample { /* diff --git a/samples/miscsim/samplesvpilotrules.h b/samples/miscsim/samplesvpilotrules.h index 54828219eb..634b325ea3 100644 --- a/samples/miscsim/samplesvpilotrules.h +++ b/samples/miscsim/samplesvpilotrules.h @@ -8,7 +8,7 @@ class QTextStream; -namespace BlackSample +namespace swift::sample { //! Samples for vPilot rules class CSamplesVPilotRules diff --git a/src/core/aircraftmatcher.h b/src/core/aircraftmatcher.h index bdcbb8590d..6c9dcf8a08 100644 --- a/src/core/aircraftmatcher.h +++ b/src/core/aircraftmatcher.h @@ -108,11 +108,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 @@ -126,21 +126,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 diff --git a/src/core/application.cpp b/src/core/application.cpp index 2e131768b0..911e9aaea1 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -1384,7 +1384,7 @@ namespace swift::core bool CApplication::isSupportingCrashpad() const { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD return true; #else return false; diff --git a/src/core/data/globalsetup.cpp b/src/core/data/globalsetup.cpp index a1a22c6b34..3fffe9c1c1 100644 --- a/src/core/data/globalsetup.cpp +++ b/src/core/data/globalsetup.cpp @@ -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 { diff --git a/src/core/data/globalsetup.h b/src/core/data/globalsetup.h index 13fe6bb5b9..86de95098f 100644 --- a/src/core/data/globalsetup.h +++ b/src/core/data/globalsetup.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup) namespace swift::core::data { @@ -178,26 +178,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 diff --git a/src/core/data/launchersetup.cpp b/src/core/data/launchersetup.cpp index a919f42263..b34fc71324 100644 --- a/src/core/data/launchersetup.cpp +++ b/src/core/data/launchersetup.cpp @@ -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 { diff --git a/src/core/data/launchersetup.h b/src/core/data/launchersetup.h index 36d59211ce..f50f4b200a 100644 --- a/src/core/data/launchersetup.h +++ b/src/core/data/launchersetup.h @@ -11,7 +11,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 { @@ -90,13 +90,12 @@ namespace swift::core::data int m_coreMode = static_cast(Standalone); //!< core int m_audioMode = static_cast(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 diff --git a/src/core/data/vatsimsetup.cpp b/src/core/data/vatsimsetup.cpp index 93532f4852..55e59ef621 100644 --- a/src/core/data/vatsimsetup.cpp +++ b/src/core/data/vatsimsetup.cpp @@ -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 { diff --git a/src/core/data/vatsimsetup.h b/src/core/data/vatsimsetup.h index 2a53b0e60e..e6dd8d134b 100644 --- a/src/core/data/vatsimsetup.h +++ b/src/core/data/vatsimsetup.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup) namespace swift::core::data { @@ -97,15 +97,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 diff --git a/src/core/db/databasereaderconfig.cpp b/src/core/db/databasereaderconfig.cpp index 81860cc614..bed3de863e 100644 --- a/src/core/db/databasereaderconfig.cpp +++ b/src/core/db/databasereaderconfig.cpp @@ -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 { diff --git a/src/core/db/databasereaderconfig.h b/src/core/db/databasereaderconfig.h index dea64a4e5b..75917f8691 100644 --- a/src/core/db/databasereaderconfig.h +++ b/src/core/db/databasereaderconfig.h @@ -20,7 +20,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig) namespace swift::core::db { @@ -75,15 +75,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 { diff --git a/src/core/fsd/euroscopesimdata.cpp b/src/core/fsd/euroscopesimdata.cpp index 8f6d8196db..7af1e1eb6c 100644 --- a/src/core/fsd/euroscopesimdata.cpp +++ b/src/core/fsd/euroscopesimdata.cpp @@ -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 diff --git a/src/core/fsd/fsdclient.h b/src/core/fsd/fsdclient.h index 8979b1a45a..14f1af1b21 100644 --- a/src/core/fsd/fsdclient.h +++ b/src/core/fsd/fsdclient.h @@ -56,7 +56,7 @@ class QNetworkReply; -namespace BlackFsdTest +namespace SwiftFsdTest { class CTestFSDClient; } @@ -320,7 +320,7 @@ namespace swift::core::fsd private: //! \cond - friend BlackFsdTest::CTestFSDClient; + friend SwiftFsdTest::CTestFSDClient; //! \endcond //! @{ diff --git a/src/core/simulator.h b/src/core/simulator.h index fb764b5726..331db1ffc3 100644 --- a/src/core/simulator.h +++ b/src/core/simulator.h @@ -266,7 +266,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 //! //! 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); diff --git a/src/core/vatsim/vatsimsettings.cpp b/src/core/vatsim/vatsimsettings.cpp index 3402fef193..67719afb6e 100644 --- a/src/core/vatsim/vatsimsettings.cpp +++ b/src/core/vatsim/vatsimsettings.cpp @@ -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 { diff --git a/src/core/vatsim/vatsimsettings.h b/src/core/vatsim/vatsimsettings.h index 18e0eefef6..993c2da49e 100644 --- a/src/core/vatsim/vatsimsettings.h +++ b/src/core/vatsim/vatsimsettings.h @@ -14,8 +14,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 { @@ -71,12 +71,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 @@ -171,12 +170,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 diff --git a/src/gui/components/interpolationlogdisplay.h b/src/gui/components/interpolationlogdisplay.h index d0638bd3f4..2ffc692693 100644 --- a/src/gui/components/interpolationlogdisplay.h +++ b/src/gui/components/interpolationlogdisplay.h @@ -136,7 +136,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 diff --git a/src/gui/components/registermetadatacomponents.h b/src/gui/components/registermetadatacomponents.h index 7ef9e09082..fe90ce1e4a 100644 --- a/src/gui/components/registermetadatacomponents.h +++ b/src/gui/components/registermetadatacomponents.h @@ -7,7 +7,6 @@ #include "gui/swiftguiexport.h" - namespace swift::gui::components { //! Register metadata for components diff --git a/src/gui/models/liveryfilter.cpp b/src/gui/models/liveryfilter.cpp index d9c258dd96..100b511845 100644 --- a/src/gui/models/liveryfilter.cpp +++ b/src/gui/models/liveryfilter.cpp @@ -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(); } diff --git a/src/gui/settings/dockwidgetsettings.cpp b/src/gui/settings/dockwidgetsettings.cpp index 0e63dc4ffc..c1e28cef7b 100644 --- a/src/gui/settings/dockwidgetsettings.cpp +++ b/src/gui/settings/dockwidgetsettings.cpp @@ -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 { diff --git a/src/gui/settings/dockwidgetsettings.h b/src/gui/settings/dockwidgetsettings.h index 51bfe831ea..878912053a 100644 --- a/src/gui/settings/dockwidgetsettings.h +++ b/src/gui/settings/dockwidgetsettings.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings) namespace swift::gui::settings { @@ -99,15 +99,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 diff --git a/src/gui/settings/guisettings.cpp b/src/gui/settings/guisettings.cpp index 97c94f8a12..9429b5f35c 100644 --- a/src/gui/settings/guisettings.cpp +++ b/src/gui/settings/guisettings.cpp @@ -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 { diff --git a/src/gui/settings/guisettings.h b/src/gui/settings/guisettings.h index 8982ecbba4..aadb2adee2 100644 --- a/src/gui/settings/guisettings.h +++ b/src/gui/settings/guisettings.h @@ -12,7 +12,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings) namespace swift::gui::settings { @@ -59,11 +59,10 @@ namespace swift::gui::settings QString m_widgetStyle { "Fusion" }; int m_preferredSelection = static_cast(QAbstractItemView::ExtendedSelection); - BLACK_METACLASS( + SWIFT_METACLASS( CGeneralGuiSettings, - BLACK_METAMEMBER(widgetStyle), - BLACK_METAMEMBER(preferredSelection) - ); + SWIFT_METAMEMBER(widgetStyle), + SWIFT_METAMEMBER(preferredSelection)); }; //! General GUI settings diff --git a/src/gui/settings/navigatorsettings.cpp b/src/gui/settings/navigatorsettings.cpp index decb71b54d..054f05abf3 100644 --- a/src/gui/settings/navigatorsettings.cpp +++ b/src/gui/settings/navigatorsettings.cpp @@ -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 { diff --git a/src/gui/settings/navigatorsettings.h b/src/gui/settings/navigatorsettings.h index 3164ac3dd8..aa44b40f30 100644 --- a/src/gui/settings/navigatorsettings.h +++ b/src/gui/settings/navigatorsettings.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings) namespace swift::gui::settings { @@ -82,13 +82,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 diff --git a/src/gui/settings/textmessagesettings.cpp b/src/gui/settings/textmessagesettings.cpp index 5d66053734..bad23cb41b 100644 --- a/src/gui/settings/textmessagesettings.cpp +++ b/src/gui/settings/textmessagesettings.cpp @@ -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 { diff --git a/src/gui/settings/textmessagesettings.h b/src/gui/settings/textmessagesettings.h index 5158bc9f0d..132f23a037 100644 --- a/src/gui/settings/textmessagesettings.h +++ b/src/gui/settings/textmessagesettings.h @@ -9,7 +9,7 @@ #include "misc/settingscache.h" #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings) namespace swift::misc { @@ -136,17 +136,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 diff --git a/src/gui/settings/viewupdatesettings.cpp b/src/gui/settings/viewupdatesettings.cpp index bad6097e99..c623b35465 100644 --- a/src/gui/settings/viewupdatesettings.cpp +++ b/src/gui/settings/viewupdatesettings.cpp @@ -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 { diff --git a/src/gui/settings/viewupdatesettings.h b/src/gui/settings/viewupdatesettings.h index 76304654c8..d8a72daefc 100644 --- a/src/gui/settings/viewupdatesettings.h +++ b/src/gui/settings/viewupdatesettings.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings) namespace swift::gui::settings { @@ -81,13 +81,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 diff --git a/src/misc/applicationinfo.cpp b/src/misc/applicationinfo.cpp index 054bde3e4e..86543e47a2 100644 --- a/src/misc/applicationinfo.cpp +++ b/src/misc/applicationinfo.cpp @@ -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 { diff --git a/src/misc/applicationinfo.h b/src/misc/applicationinfo.h index c7973cc54b..322e7fdf4c 100644 --- a/src/misc/applicationinfo.h +++ b/src/misc/applicationinfo.h @@ -10,7 +10,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CApplicationInfo) namespace swift::misc { @@ -175,17 +175,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 diff --git a/src/misc/applicationinfolist.cpp b/src/misc/applicationinfolist.cpp index 8ec3621cc2..fd69d8edea 100644 --- a/src/misc/applicationinfolist.cpp +++ b/src/misc/applicationinfolist.cpp @@ -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 { diff --git a/src/misc/applicationinfolist.h b/src/misc/applicationinfolist.h index da26c6ac19..1b2d8858d7 100644 --- a/src/misc/applicationinfolist.h +++ b/src/misc/applicationinfolist.h @@ -9,7 +9,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 { diff --git a/src/misc/audio/audiodeviceinfo.cpp b/src/misc/audio/audiodeviceinfo.cpp index 1ed7dc5566..5d8786d008 100644 --- a/src/misc/audio/audiodeviceinfo.cpp +++ b/src/misc/audio/audiodeviceinfo.cpp @@ -12,7 +12,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo) namespace swift::misc::audio { diff --git a/src/misc/audio/audiodeviceinfo.h b/src/misc/audio/audiodeviceinfo.h index 77b0d95dd2..f8fce66674 100644 --- a/src/misc/audio/audiodeviceinfo.h +++ b/src/misc/audio/audiodeviceinfo.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CAudioDeviceInfo) namespace swift::misc::audio { @@ -107,12 +107,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 diff --git a/src/misc/audio/audiodeviceinfolist.cpp b/src/misc/audio/audiodeviceinfolist.cpp index ab4e05c7e1..54f7412c4b 100644 --- a/src/misc/audio/audiodeviceinfolist.cpp +++ b/src/misc/audio/audiodeviceinfolist.cpp @@ -8,7 +8,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList) namespace swift::misc::audio { diff --git a/src/misc/audio/audiodeviceinfolist.h b/src/misc/audio/audiodeviceinfolist.h index d0c7118166..cd7cc58c0a 100644 --- a/src/misc/audio/audiodeviceinfolist.h +++ b/src/misc/audio/audiodeviceinfolist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::audio, CAudioDeviceInfo, CAudioDeviceInfoList) namespace swift::misc::audio { diff --git a/src/misc/audio/audiosettings.cpp b/src/misc/audio/audiosettings.cpp index 46a04f15ae..70ea5dfde2 100644 --- a/src/misc/audio/audiosettings.cpp +++ b/src/misc/audio/audiosettings.cpp @@ -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 { diff --git a/src/misc/audio/audiosettings.h b/src/misc/audio/audiosettings.h index 9a8bf7ab09..4617f74609 100644 --- a/src/misc/audio/audiosettings.h +++ b/src/misc/audio/audiosettings.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::audio, CSettings) namespace swift::misc::audio { @@ -130,17 +130,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 diff --git a/src/misc/aviation/aircraftcategory.cpp b/src/misc/aviation/aircraftcategory.cpp index 44ed877ff1..61a617cc29 100644 --- a/src/misc/aviation/aircraftcategory.cpp +++ b/src/misc/aviation/aircraftcategory.cpp @@ -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 { diff --git a/src/misc/aviation/aircraftcategory.h b/src/misc/aviation/aircraftcategory.h index b6186f567d..a94684bae2 100644 --- a/src/misc/aviation/aircraftcategory.h +++ b/src/misc/aviation/aircraftcategory.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftCategory) namespace swift::misc::aviation { @@ -159,18 +159,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 diff --git a/src/misc/aviation/aircraftcategorylist.cpp b/src/misc/aviation/aircraftcategorylist.cpp index fe7a282e1c..8148bbd536 100644 --- a/src/misc/aviation/aircraftcategorylist.cpp +++ b/src/misc/aviation/aircraftcategorylist.cpp @@ -8,7 +8,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftcategorylist.h b/src/misc/aviation/aircraftcategorylist.h index 3684744fcc..0ba7957e0f 100644 --- a/src/misc/aviation/aircraftcategorylist.h +++ b/src/misc/aviation/aircraftcategorylist.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraftCategoryList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftengine.cpp b/src/misc/aviation/aircraftengine.cpp index 962238c30a..13461d08fd 100644 --- a/src/misc/aviation/aircraftengine.cpp +++ b/src/misc/aviation/aircraftengine.cpp @@ -6,7 +6,7 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftengine.h b/src/misc/aviation/aircraftengine.h index 993b55a5bd..bd7e8e4cac 100644 --- a/src/misc/aviation/aircraftengine.h +++ b/src/misc/aviation/aircraftengine.h @@ -12,7 +12,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftEngine) namespace swift::misc::aviation { @@ -48,11 +48,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 diff --git a/src/misc/aviation/aircraftenginelist.cpp b/src/misc/aviation/aircraftenginelist.cpp index ab45431ea5..1904c1f251 100644 --- a/src/misc/aviation/aircraftenginelist.cpp +++ b/src/misc/aviation/aircraftenginelist.cpp @@ -6,7 +6,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftenginelist.h b/src/misc/aviation/aircraftenginelist.h index 94219fe47c..3c660c0f82 100644 --- a/src/misc/aviation/aircraftenginelist.h +++ b/src/misc/aviation/aircraftenginelist.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftEngine, CAircraftEngineList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircrafticaocode.cpp b/src/misc/aviation/aircrafticaocode.cpp index 9590b9e064..574aa8d560 100644 --- a/src/misc/aviation/aircrafticaocode.cpp +++ b/src/misc/aviation/aircrafticaocode.cpp @@ -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 { diff --git a/src/misc/aviation/aircrafticaocode.h b/src/misc/aviation/aircrafticaocode.h index 45f9eeb944..b2f35277eb 100644 --- a/src/misc/aviation/aircrafticaocode.h +++ b/src/misc/aviation/aircrafticaocode.h @@ -20,7 +20,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftIcaoCode) namespace swift::misc::aviation { @@ -389,24 +389,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) ); }; diff --git a/src/misc/aviation/aircrafticaocodelist.cpp b/src/misc/aviation/aircrafticaocodelist.cpp index 5f1eaa252a..2774083fd3 100644 --- a/src/misc/aviation/aircrafticaocodelist.cpp +++ b/src/misc/aviation/aircrafticaocodelist.cpp @@ -8,7 +8,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircrafticaocodelist.h b/src/misc/aviation/aircrafticaocodelist.h index 0233ceb1b3..a5e6c9e6f3 100644 --- a/src/misc/aviation/aircrafticaocodelist.h +++ b/src/misc/aviation/aircrafticaocodelist.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraftIcaoCodeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftlights.cpp b/src/misc/aviation/aircraftlights.cpp index 6e188bbf3b..5631e4884f 100644 --- a/src/misc/aviation/aircraftlights.cpp +++ b/src/misc/aviation/aircraftlights.cpp @@ -6,7 +6,7 @@ #include "misc/comparefunctions.h" #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftlights.h b/src/misc/aviation/aircraftlights.h index 261f01c863..8c53a9a66f 100644 --- a/src/misc/aviation/aircraftlights.h +++ b/src/misc/aviation/aircraftlights.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftLights) namespace swift::misc::aviation { @@ -136,17 +136,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 diff --git a/src/misc/aviation/aircraftparts.cpp b/src/misc/aviation/aircraftparts.cpp index 2b63f86a38..c53320f0c4 100644 --- a/src/misc/aviation/aircraftparts.cpp +++ b/src/misc/aviation/aircraftparts.cpp @@ -10,7 +10,7 @@ #include "QStringBuilder" #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftparts.h b/src/misc/aviation/aircraftparts.h index e0ca58c96d..d846f50110 100644 --- a/src/misc/aviation/aircraftparts.h +++ b/src/misc/aviation/aircraftparts.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftParts) namespace swift::misc::aviation { @@ -187,18 +187,17 @@ namespace swift::misc::aviation bool m_isOnGround = false; QString m_guessingDetails; //!< just for debugging, not via DBus ... - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftParts, - BLACK_METAMEMBER_NAMED(lights, "lights"), - BLACK_METAMEMBER_NAMED(gearDown, "gear_down"), - BLACK_METAMEMBER_NAMED(flapsPercentage, "flaps_pct"), - BLACK_METAMEMBER_NAMED(spoilersOut, "spoilers_out"), - BLACK_METAMEMBER_NAMED(engines, "engines"), - BLACK_METAMEMBER_NAMED(isOnGround, "on_ground"), - BLACK_METAMEMBER(partsDetails, 0, DisabledForJson | DisabledForComparison), - BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison), - BLACK_METAMEMBER(timeOffsetMs, 0, DisabledForJson | DisabledForComparison) - ); + SWIFT_METAMEMBER_NAMED(lights, "lights"), + SWIFT_METAMEMBER_NAMED(gearDown, "gear_down"), + SWIFT_METAMEMBER_NAMED(flapsPercentage, "flaps_pct"), + SWIFT_METAMEMBER_NAMED(spoilersOut, "spoilers_out"), + SWIFT_METAMEMBER_NAMED(engines, "engines"), + SWIFT_METAMEMBER_NAMED(isOnGround, "on_ground"), + SWIFT_METAMEMBER(partsDetails, 0, DisabledForJson | DisabledForComparison), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison), + SWIFT_METAMEMBER(timeOffsetMs, 0, DisabledForJson | DisabledForComparison)); }; } // namespace diff --git a/src/misc/aviation/aircraftpartslist.cpp b/src/misc/aviation/aircraftpartslist.cpp index 4a0b6a3a57..44339e850c 100644 --- a/src/misc/aviation/aircraftpartslist.cpp +++ b/src/misc/aviation/aircraftpartslist.cpp @@ -4,7 +4,7 @@ #include "misc/aviation/aircraftparts.h" #include "misc/aviation/aircraftpartslist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftParts, CAircraftPartsList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftParts, CAircraftPartsList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftpartslist.h b/src/misc/aviation/aircraftpartslist.h index 6e059ee57b..53020cdde7 100644 --- a/src/misc/aviation/aircraftpartslist.h +++ b/src/misc/aviation/aircraftpartslist.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftParts, CAircraftPartsList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftParts, CAircraftPartsList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituation.cpp b/src/misc/aviation/aircraftsituation.cpp index 1abee90cec..ec26a0f909 100644 --- a/src/misc/aviation/aircraftsituation.cpp +++ b/src/misc/aviation/aircraftsituation.cpp @@ -21,7 +21,7 @@ using namespace swift::misc::geo; using namespace swift::misc::physical_quantities; using namespace swift::config; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituation) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituation) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituation.h b/src/misc/aviation/aircraftsituation.h index 15896dee39..b84b4c3348 100644 --- a/src/misc/aviation/aircraftsituation.h +++ b/src/misc/aviation/aircraftsituation.h @@ -30,7 +30,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituation) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituation) namespace swift::misc { @@ -500,26 +500,25 @@ namespace swift::misc int m_elvInfo = static_cast(CAircraftSituation::NoElevationInfo); //!< where did we gnd.elevation from? aviation::COnGroundInfo m_onGroundInfo; - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftSituation, - BLACK_METAMEMBER(correspondingCallsign), - BLACK_METAMEMBER(position), - BLACK_METAMEMBER(pressureAltitude), - BLACK_METAMEMBER(heading), - BLACK_METAMEMBER(pitch), - BLACK_METAMEMBER(bank), - BLACK_METAMEMBER(groundSpeed), - BLACK_METAMEMBER(cg), - BLACK_METAMEMBER(hasVelocity), - BLACK_METAMEMBER(velocity), - BLACK_METAMEMBER(groundElevationPlane), - BLACK_METAMEMBER(onGroundInfo), - BLACK_METAMEMBER(elvInfo), - BLACK_METAMEMBER(isElvInfoTransferred), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(timeOffsetMs), - BLACK_METAMEMBER(isInterim) - ); + SWIFT_METAMEMBER(correspondingCallsign), + SWIFT_METAMEMBER(position), + SWIFT_METAMEMBER(pressureAltitude), + SWIFT_METAMEMBER(heading), + SWIFT_METAMEMBER(pitch), + SWIFT_METAMEMBER(bank), + SWIFT_METAMEMBER(groundSpeed), + SWIFT_METAMEMBER(cg), + SWIFT_METAMEMBER(hasVelocity), + SWIFT_METAMEMBER(velocity), + SWIFT_METAMEMBER(groundElevationPlane), + SWIFT_METAMEMBER(onGroundInfo), + SWIFT_METAMEMBER(elvInfo), + SWIFT_METAMEMBER(isElvInfoTransferred), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(timeOffsetMs), + SWIFT_METAMEMBER(isInterim)); }; } // namespace } // namespace diff --git a/src/misc/aviation/aircraftsituationchange.cpp b/src/misc/aviation/aircraftsituationchange.cpp index ca5669648a..c540b73a05 100644 --- a/src/misc/aviation/aircraftsituationchange.cpp +++ b/src/misc/aviation/aircraftsituationchange.cpp @@ -22,7 +22,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::math; using namespace swift::config; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituationChange) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituationChange) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituationchange.h b/src/misc/aviation/aircraftsituationchange.h index ece19aa3dc..25ee24fd8d 100644 --- a/src/misc/aviation/aircraftsituationchange.h +++ b/src/misc/aviation/aircraftsituationchange.h @@ -15,7 +15,7 @@ #include "misc/propertyindexref.h" #include "misc/swiftmiscexport.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituationChange) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftSituationChange) namespace swift::misc { @@ -211,36 +211,35 @@ namespace swift::misc physical_quantities::CLength m_maxGroundDistance = physical_quantities::CLength::null(); physical_quantities::CLength m_minGroundDistance = physical_quantities::CLength::null(); - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftSituationChange, - BLACK_METAMEMBER(situationsCount), - BLACK_METAMEMBER(correspondingCallsign), - BLACK_METAMEMBER(constAscending), - BLACK_METAMEMBER(constDescending), - BLACK_METAMEMBER(constOnGround), - BLACK_METAMEMBER(constNotOnGround), - BLACK_METAMEMBER(justTakeoff), - BLACK_METAMEMBER(justTouchdown), - BLACK_METAMEMBER(containsPushBack), - BLACK_METAMEMBER(rotateUp), - BLACK_METAMEMBER(altStdDev), - BLACK_METAMEMBER(altMean), - BLACK_METAMEMBER(elvStdDev), - BLACK_METAMEMBER(elvMean), - BLACK_METAMEMBER(gsStdDev), - BLACK_METAMEMBER(gsMean), - BLACK_METAMEMBER(gndDistStdDev), - BLACK_METAMEMBER(gndDistMean), - BLACK_METAMEMBER(pitchStdDev), - BLACK_METAMEMBER(pitchMean), - BLACK_METAMEMBER(guessedSceneryDeviation), - BLACK_METAMEMBER(guessedSceneryDeviationCG), - BLACK_METAMEMBER(guessedSceneryDeviationHint), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(oldestTimestampMSecsSinceEpoch), - BLACK_METAMEMBER(oldestAdjustedTimestampMSecsSinceEpoch), - BLACK_METAMEMBER(latestAdjustedTimestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(situationsCount), + SWIFT_METAMEMBER(correspondingCallsign), + SWIFT_METAMEMBER(constAscending), + SWIFT_METAMEMBER(constDescending), + SWIFT_METAMEMBER(constOnGround), + SWIFT_METAMEMBER(constNotOnGround), + SWIFT_METAMEMBER(justTakeoff), + SWIFT_METAMEMBER(justTouchdown), + SWIFT_METAMEMBER(containsPushBack), + SWIFT_METAMEMBER(rotateUp), + SWIFT_METAMEMBER(altStdDev), + SWIFT_METAMEMBER(altMean), + SWIFT_METAMEMBER(elvStdDev), + SWIFT_METAMEMBER(elvMean), + SWIFT_METAMEMBER(gsStdDev), + SWIFT_METAMEMBER(gsMean), + SWIFT_METAMEMBER(gndDistStdDev), + SWIFT_METAMEMBER(gndDistMean), + SWIFT_METAMEMBER(pitchStdDev), + SWIFT_METAMEMBER(pitchMean), + SWIFT_METAMEMBER(guessedSceneryDeviation), + SWIFT_METAMEMBER(guessedSceneryDeviationCG), + SWIFT_METAMEMBER(guessedSceneryDeviationHint), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(oldestTimestampMSecsSinceEpoch), + SWIFT_METAMEMBER(oldestAdjustedTimestampMSecsSinceEpoch), + SWIFT_METAMEMBER(latestAdjustedTimestampMSecsSinceEpoch)); }; } // namespace } // namespace diff --git a/src/misc/aviation/aircraftsituationchangelist.cpp b/src/misc/aviation/aircraftsituationchangelist.cpp index b66c72981a..7ce5297ae9 100644 --- a/src/misc/aviation/aircraftsituationchangelist.cpp +++ b/src/misc/aviation/aircraftsituationchangelist.cpp @@ -3,7 +3,7 @@ #include "misc/aviation/aircraftsituationchangelist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituationChange, CAircraftSituationChangeList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituationChange, CAircraftSituationChangeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituationchangelist.h b/src/misc/aviation/aircraftsituationchangelist.h index 5573ebf269..5939897660 100644 --- a/src/misc/aviation/aircraftsituationchangelist.h +++ b/src/misc/aviation/aircraftsituationchangelist.h @@ -11,7 +11,7 @@ #include "misc/aviation/aircraftsituationchange.h" #include "misc/timestampobjectlist.h" -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituationChange, CAircraftSituationChangeList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituationChange, CAircraftSituationChangeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituationlist.cpp b/src/misc/aviation/aircraftsituationlist.cpp index 5f1ad8f73f..7275b38373 100644 --- a/src/misc/aviation/aircraftsituationlist.cpp +++ b/src/misc/aviation/aircraftsituationlist.cpp @@ -12,7 +12,7 @@ using namespace swift::misc::geo; using namespace swift::misc::physical_quantities; using namespace swift::misc::math; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituation, CAircraftSituationList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituation, CAircraftSituationList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftsituationlist.h b/src/misc/aviation/aircraftsituationlist.h index 3fec51ea08..a4cb2f9466 100644 --- a/src/misc/aviation/aircraftsituationlist.h +++ b/src/misc/aviation/aircraftsituationlist.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituation, CAircraftSituationList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituation, CAircraftSituationList) namespace swift::misc { diff --git a/src/misc/aviation/aircraftvelocity.cpp b/src/misc/aviation/aircraftvelocity.cpp index 39031975cc..af5299994a 100644 --- a/src/misc/aviation/aircraftvelocity.cpp +++ b/src/misc/aviation/aircraftvelocity.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftVelocity) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftVelocity) namespace swift::misc::aviation { diff --git a/src/misc/aviation/aircraftvelocity.h b/src/misc/aviation/aircraftvelocity.h index 3f6a6a949c..a20debcb9e 100644 --- a/src/misc/aviation/aircraftvelocity.h +++ b/src/misc/aviation/aircraftvelocity.h @@ -13,7 +13,7 @@ #include "misc/metaclass.h" #include "misc/swiftmiscexport.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftVelocity) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAircraftVelocity) namespace swift::misc::aviation { @@ -83,15 +83,14 @@ namespace swift::misc::aviation double m_roll = 0; double m_heading = 0; - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftVelocity, - BLACK_METAMEMBER(x), - BLACK_METAMEMBER(y), - BLACK_METAMEMBER(z), - BLACK_METAMEMBER(pitch), - BLACK_METAMEMBER(roll), - BLACK_METAMEMBER(heading) - ); + SWIFT_METAMEMBER(x), + SWIFT_METAMEMBER(y), + SWIFT_METAMEMBER(z), + SWIFT_METAMEMBER(pitch), + SWIFT_METAMEMBER(roll), + SWIFT_METAMEMBER(heading)); }; } diff --git a/src/misc/aviation/airlineicaocode.cpp b/src/misc/aviation/airlineicaocode.cpp index e24424abc0..a0c6a526e3 100644 --- a/src/misc/aviation/airlineicaocode.cpp +++ b/src/misc/aviation/airlineicaocode.cpp @@ -22,7 +22,7 @@ using namespace swift::misc; using namespace swift::misc::db; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirlineIcaoCode) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirlineIcaoCode) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airlineicaocode.h b/src/misc/aviation/airlineicaocode.h index 0a5fa7999a..56dc0c70c0 100644 --- a/src/misc/aviation/airlineicaocode.h +++ b/src/misc/aviation/airlineicaocode.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirlineIcaoCode) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirlineIcaoCode) namespace swift::misc::aviation { @@ -283,21 +283,20 @@ namespace swift::misc::aviation bool m_isOperating = true; //!< still operating? bool m_isMilitary = false; //!< Air Force or such - BLACK_METACLASS( + SWIFT_METACLASS( CAirlineIcaoCode, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(designator), - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(country), - BLACK_METAMEMBER(telephonyDesignator), - BLACK_METAMEMBER(groupDesignator), - BLACK_METAMEMBER(groupName), - BLACK_METAMEMBER(groupId), - BLACK_METAMEMBER(isVa), - BLACK_METAMEMBER(isOperating), - BLACK_METAMEMBER(isMilitary) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(designator), + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(country), + SWIFT_METAMEMBER(telephonyDesignator), + SWIFT_METAMEMBER(groupDesignator), + SWIFT_METAMEMBER(groupName), + SWIFT_METAMEMBER(groupId), + SWIFT_METAMEMBER(isVa), + SWIFT_METAMEMBER(isOperating), + SWIFT_METAMEMBER(isMilitary)); }; //! Airline ICAO/id list diff --git a/src/misc/aviation/airlineicaocodelist.cpp b/src/misc/aviation/airlineicaocodelist.cpp index 74e32886ea..9eb3c1adb1 100644 --- a/src/misc/aviation/airlineicaocodelist.cpp +++ b/src/misc/aviation/airlineicaocodelist.cpp @@ -9,7 +9,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAirlineIcaoCode, CAirlineIcaoCodeList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAirlineIcaoCode, CAirlineIcaoCodeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airlineicaocodelist.h b/src/misc/aviation/airlineicaocodelist.h index 632af95d01..137a3a46e1 100644 --- a/src/misc/aviation/airlineicaocodelist.h +++ b/src/misc/aviation/airlineicaocodelist.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAirlineIcaoCode, CAirlineIcaoCodeList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAirlineIcaoCode, CAirlineIcaoCodeList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airport.cpp b/src/misc/aviation/airport.cpp index 56dcfefaf6..4b52698b00 100644 --- a/src/misc/aviation/airport.cpp +++ b/src/misc/aviation/airport.cpp @@ -15,7 +15,7 @@ using namespace swift::misc; using namespace swift::misc::physical_quantities; using namespace swift::misc::geo; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirport) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirport) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airport.h b/src/misc/aviation/airport.h index 7b319308f9..ff4066b717 100644 --- a/src/misc/aviation/airport.h +++ b/src/misc/aviation/airport.h @@ -22,7 +22,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirport) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirport) namespace swift::misc::aviation { @@ -166,21 +166,20 @@ namespace swift::misc::aviation swift::misc::CCountry m_country; swift::misc::geo::CCoordinateGeodetic m_position; - BLACK_METACLASS( + SWIFT_METACLASS( CAirport, - BLACK_METAMEMBER(icao), - BLACK_METAMEMBER(location), - BLACK_METAMEMBER(descriptiveName), - BLACK_METAMEMBER(position), - BLACK_METAMEMBER(country), - BLACK_METAMEMBER(operating), + SWIFT_METAMEMBER(icao), + SWIFT_METAMEMBER(location), + SWIFT_METAMEMBER(descriptiveName), + SWIFT_METAMEMBER(position), + SWIFT_METAMEMBER(country), + SWIFT_METAMEMBER(operating), // ICoordinateWithRelativePosition - BLACK_METAMEMBER(relativeDistance), - BLACK_METAMEMBER(relativeBearing), + SWIFT_METAMEMBER(relativeDistance), + SWIFT_METAMEMBER(relativeBearing), // IDatastoreObjectWithIntegerKey - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // namespace diff --git a/src/misc/aviation/airporticaocode.cpp b/src/misc/aviation/airporticaocode.cpp index 2f9987ab89..b71031ba07 100644 --- a/src/misc/aviation/airporticaocode.cpp +++ b/src/misc/aviation/airporticaocode.cpp @@ -10,7 +10,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirportIcaoCode) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirportIcaoCode) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airporticaocode.h b/src/misc/aviation/airporticaocode.h index 346f3ccca7..62904b12d6 100644 --- a/src/misc/aviation/airporticaocode.h +++ b/src/misc/aviation/airporticaocode.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirportIcaoCode) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAirportIcaoCode) namespace swift::misc::aviation { @@ -73,10 +73,9 @@ namespace swift::misc::aviation private: QString m_icaoCode; - BLACK_METACLASS( + SWIFT_METACLASS( CAirportIcaoCode, - BLACK_METAMEMBER(icaoCode, 0, CaseInsensitiveComparison) - ); + SWIFT_METAMEMBER(icaoCode, 0, CaseInsensitiveComparison)); }; } // namespace diff --git a/src/misc/aviation/airportlist.cpp b/src/misc/aviation/airportlist.cpp index e684c40a38..6a9851466b 100644 --- a/src/misc/aviation/airportlist.cpp +++ b/src/misc/aviation/airportlist.cpp @@ -9,7 +9,7 @@ using namespace swift::misc::physical_quantities; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAirport, CAirportList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAirport, CAirportList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/airportlist.h b/src/misc/aviation/airportlist.h index abc12a6bfe..19e10473b0 100644 --- a/src/misc/aviation/airportlist.h +++ b/src/misc/aviation/airportlist.h @@ -15,7 +15,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAirport, CAirportList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAirport, CAirportList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/altitude.h b/src/misc/aviation/altitude.h index 476b4e9fe0..a32f190886 100644 --- a/src/misc/aviation/altitude.h +++ b/src/misc/aviation/altitude.h @@ -226,11 +226,10 @@ namespace swift::misc::aviation //! The metric tuples m/ft/FL static const QVector &metricTuples(); - BLACK_METACLASS( + SWIFT_METACLASS( CAltitude, - BLACK_METAMEMBER(datum), - BLACK_METAMEMBER(altitudeType) - ); + SWIFT_METAMEMBER(datum), + SWIFT_METAMEMBER(altitudeType)); }; using CAltitudePair = QPair; //!< Pair of altitude diff --git a/src/misc/aviation/atcstation.cpp b/src/misc/aviation/atcstation.cpp index e13d662c60..f868767805 100644 --- a/src/misc/aviation/atcstation.cpp +++ b/src/misc/aviation/atcstation.cpp @@ -20,7 +20,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::geo; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAtcStation) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAtcStation) namespace swift::misc::aviation { diff --git a/src/misc/aviation/atcstation.h b/src/misc/aviation/atcstation.h index 49d6c99380..1a9919058e 100644 --- a/src/misc/aviation/atcstation.h +++ b/src/misc/aviation/atcstation.h @@ -27,7 +27,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAtcStation) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAtcStation) namespace swift::misc::aviation { @@ -240,21 +240,20 @@ namespace swift::misc::aviation CInformationMessage m_atis { CInformationMessage::ATIS }; CInformationMessage m_metar { CInformationMessage::METAR }; - BLACK_METACLASS( + SWIFT_METACLASS( CAtcStation, - BLACK_METAMEMBER(callsign), - BLACK_METAMEMBER(controller), - BLACK_METAMEMBER(frequency), - BLACK_METAMEMBER(position), - BLACK_METAMEMBER(range), - BLACK_METAMEMBER(isOnline), - BLACK_METAMEMBER(isAfvCrossCoupled), - BLACK_METAMEMBER(logoffTimeUtc), - BLACK_METAMEMBER(atis), - BLACK_METAMEMBER(metar), - BLACK_METAMEMBER(relativeDistance), - BLACK_METAMEMBER(relativeBearing) - ); + SWIFT_METAMEMBER(callsign), + SWIFT_METAMEMBER(controller), + SWIFT_METAMEMBER(frequency), + SWIFT_METAMEMBER(position), + SWIFT_METAMEMBER(range), + SWIFT_METAMEMBER(isOnline), + SWIFT_METAMEMBER(isAfvCrossCoupled), + SWIFT_METAMEMBER(logoffTimeUtc), + SWIFT_METAMEMBER(atis), + SWIFT_METAMEMBER(metar), + SWIFT_METAMEMBER(relativeDistance), + SWIFT_METAMEMBER(relativeBearing)); }; } // namespace diff --git a/src/misc/aviation/atcstationlist.cpp b/src/misc/aviation/atcstationlist.cpp index 3289211cf3..e67680e6b7 100644 --- a/src/misc/aviation/atcstationlist.cpp +++ b/src/misc/aviation/atcstationlist.cpp @@ -14,7 +14,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::network; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAtcStation, CAtcStationList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAtcStation, CAtcStationList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/atcstationlist.h b/src/misc/aviation/atcstationlist.h index 5c6fbe50ce..d3052e0511 100644 --- a/src/misc/aviation/atcstationlist.h +++ b/src/misc/aviation/atcstationlist.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAtcStation, CAtcStationList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CAtcStation, CAtcStationList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/callsign.cpp b/src/misc/aviation/callsign.cpp index 6e95fbbe5f..f9b37ce428 100644 --- a/src/misc/aviation/callsign.cpp +++ b/src/misc/aviation/callsign.cpp @@ -12,7 +12,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CCallsign) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CCallsign) namespace swift::misc::aviation { diff --git a/src/misc/aviation/callsign.h b/src/misc/aviation/callsign.h index 6a8888c77f..a6104d2172 100644 --- a/src/misc/aviation/callsign.h +++ b/src/misc/aviation/callsign.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CCallsign) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CCallsign) namespace swift::misc { @@ -223,13 +223,12 @@ namespace swift::misc QString m_telephonyDesignator; TypeHint m_typeHint = NoHint; - BLACK_METACLASS( + SWIFT_METACLASS( CCallsign, - BLACK_METAMEMBER(callsign, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(callsignAsSet, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(telephonyDesignator, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(typeHint, 0, DisabledForComparison | DisabledForHashing) - ); + SWIFT_METAMEMBER(callsign, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(callsignAsSet, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(telephonyDesignator, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(typeHint, 0, DisabledForComparison | DisabledForHashing)); }; } // namespace } // namespace diff --git a/src/misc/aviation/callsignset.cpp b/src/misc/aviation/callsignset.cpp index 2e1612e78a..8f75d91afc 100644 --- a/src/misc/aviation/callsignset.cpp +++ b/src/misc/aviation/callsignset.cpp @@ -7,7 +7,7 @@ #include #include -BLACK_DEFINE_COLLECTION_MIXINS(swift::misc::aviation, CCallsign, CCallsignSet) +SWIFT_DEFINE_COLLECTION_MIXINS(swift::misc::aviation, CCallsign, CCallsignSet) namespace swift::misc::aviation { diff --git a/src/misc/aviation/callsignset.h b/src/misc/aviation/callsignset.h index 5d78512a07..d1d2ed9444 100644 --- a/src/misc/aviation/callsignset.h +++ b/src/misc/aviation/callsignset.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_COLLECTION_MIXINS(swift::misc::aviation, CCallsign, CCallsignSet) +SWIFT_DECLARE_COLLECTION_MIXINS(swift::misc::aviation, CCallsign, CCallsignSet) namespace swift::misc::aviation { diff --git a/src/misc/aviation/comnavequipment.cpp b/src/misc/aviation/comnavequipment.cpp index 7aa3b92cd3..ae47576519 100644 --- a/src/misc/aviation/comnavequipment.cpp +++ b/src/misc/aviation/comnavequipment.cpp @@ -3,7 +3,7 @@ #include "comnavequipment.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CComNavEquipment) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CComNavEquipment) namespace swift::misc::aviation { diff --git a/src/misc/aviation/comnavequipment.h b/src/misc/aviation/comnavequipment.h index 083b3549a3..2594fc057e 100644 --- a/src/misc/aviation/comnavequipment.h +++ b/src/misc/aviation/comnavequipment.h @@ -6,7 +6,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CComNavEquipment) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CComNavEquipment) namespace swift::misc::aviation { @@ -102,11 +102,10 @@ namespace swift::misc::aviation ComNavEquipment m_equipment = Standard; CpdlcSatcomEquipment m_cpdlcSatcomEquipment; - BLACK_METACLASS( + SWIFT_METACLASS( CComNavEquipment, - BLACK_METAMEMBER(equipment), - BLACK_METAMEMBER(cpdlcSatcomEquipment) - ); + SWIFT_METAMEMBER(equipment), + SWIFT_METAMEMBER(cpdlcSatcomEquipment)); }; } diff --git a/src/misc/aviation/comsystem.h b/src/misc/aviation/comsystem.h index 8a0f43a827..3d2c7fc427 100644 --- a/src/misc/aviation/comsystem.h +++ b/src/misc/aviation/comsystem.h @@ -152,10 +152,9 @@ namespace swift::misc::aviation //! \remarks Just a helper method, that is why no CFrequency is returned static double channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing); - BLACK_METACLASS( + SWIFT_METACLASS( CComSystem, - BLACK_METAMEMBER(channelSpacing) - ); + SWIFT_METAMEMBER(channelSpacing)); }; } // namespace diff --git a/src/misc/aviation/flightplan.cpp b/src/misc/aviation/flightplan.cpp index b460c9a172..c9e948049d 100644 --- a/src/misc/aviation/flightplan.cpp +++ b/src/misc/aviation/flightplan.cpp @@ -22,8 +22,8 @@ using namespace swift::misc::network; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanRemarks) -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlan) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanRemarks) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlan) namespace swift::misc::aviation { diff --git a/src/misc/aviation/flightplan.h b/src/misc/aviation/flightplan.h index e03d8cb903..a787c664d6 100644 --- a/src/misc/aviation/flightplan.h +++ b/src/misc/aviation/flightplan.h @@ -30,8 +30,8 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, CFlightPlanRemarks) -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, CFlightPlan) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, CFlightPlanRemarks) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, CFlightPlan) namespace swift::misc::aviation { @@ -123,17 +123,16 @@ namespace swift::misc::aviation network::CVoiceCapabilities m_voiceCapabilities; //!< voice capabilities bool m_isParsed = false; //!< marked as parsed - BLACK_METACLASS( + SWIFT_METACLASS( CFlightPlanRemarks, - BLACK_METAMEMBER(remarks, 0, DisabledForComparison), - BLACK_METAMEMBER(radioTelephony), - BLACK_METAMEMBER(flightOperator), - BLACK_METAMEMBER(airlineIcao), - BLACK_METAMEMBER(selcalCode), - BLACK_METAMEMBER(registration), - BLACK_METAMEMBER(isParsed), - BLACK_METAMEMBER(voiceCapabilities) - ); + SWIFT_METAMEMBER(remarks, 0, DisabledForComparison), + SWIFT_METAMEMBER(radioTelephony), + SWIFT_METAMEMBER(flightOperator), + SWIFT_METAMEMBER(airlineIcao), + SWIFT_METAMEMBER(selcalCode), + SWIFT_METAMEMBER(registration), + SWIFT_METAMEMBER(isParsed), + SWIFT_METAMEMBER(voiceCapabilities)); //! Cut the remarks part static QString getRemark(const QString &remarks, const QString &marker); @@ -424,25 +423,24 @@ namespace swift::misc::aviation //! As string QString buildString(bool i18n = false, const QString &separator = " ") const; - BLACK_METACLASS( + SWIFT_METACLASS( CFlightPlan, // callsign will be current flight - BLACK_METAMEMBER(aircraftInfo), - BLACK_METAMEMBER(originAirportIcao), - BLACK_METAMEMBER(destinationAirportIcao), - BLACK_METAMEMBER(alternateAirportIcao), - BLACK_METAMEMBER(takeoffTimePlanned), - BLACK_METAMEMBER(takeoffTimeActual), - BLACK_METAMEMBER(enrouteTime, 0, LosslessMarshalling), - BLACK_METAMEMBER(fuelTime, 0, LosslessMarshalling), - BLACK_METAMEMBER(cruiseAltitude, 0, LosslessMarshalling), - BLACK_METAMEMBER(cruiseAltitudeString), - BLACK_METAMEMBER(cruiseTrueAirspeed, 0, LosslessMarshalling), - BLACK_METAMEMBER(flightRules), - BLACK_METAMEMBER(route), - BLACK_METAMEMBER(remarks), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(aircraftInfo), + SWIFT_METAMEMBER(originAirportIcao), + SWIFT_METAMEMBER(destinationAirportIcao), + SWIFT_METAMEMBER(alternateAirportIcao), + SWIFT_METAMEMBER(takeoffTimePlanned), + SWIFT_METAMEMBER(takeoffTimeActual), + SWIFT_METAMEMBER(enrouteTime, 0, LosslessMarshalling), + SWIFT_METAMEMBER(fuelTime, 0, LosslessMarshalling), + SWIFT_METAMEMBER(cruiseAltitude, 0, LosslessMarshalling), + SWIFT_METAMEMBER(cruiseAltitudeString), + SWIFT_METAMEMBER(cruiseTrueAirspeed, 0, LosslessMarshalling), + SWIFT_METAMEMBER(flightRules), + SWIFT_METAMEMBER(route), + SWIFT_METAMEMBER(remarks), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // namespace diff --git a/src/misc/aviation/flightplanaircraftinfo.cpp b/src/misc/aviation/flightplanaircraftinfo.cpp index 5040ec1e00..7f0b0d081f 100644 --- a/src/misc/aviation/flightplanaircraftinfo.cpp +++ b/src/misc/aviation/flightplanaircraftinfo.cpp @@ -3,7 +3,7 @@ #include "flightplanaircraftinfo.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanAircraftInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanAircraftInfo) namespace swift::misc::aviation { diff --git a/src/misc/aviation/flightplanaircraftinfo.h b/src/misc/aviation/flightplanaircraftinfo.h index f09b8f9da1..744b131eb5 100644 --- a/src/misc/aviation/flightplanaircraftinfo.h +++ b/src/misc/aviation/flightplanaircraftinfo.h @@ -12,7 +12,7 @@ #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanAircraftInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlanAircraftInfo) namespace swift::misc::aviation { @@ -67,13 +67,12 @@ namespace swift::misc::aviation void parseFaaEquipmentCode(const QString &equipment); //!< Initialize members from FAA format equipment codes void parseUnknownEquipmentCode(const QString &equipment); //!< Initialize members from unknown format equipment strings (best guesses) - BLACK_METACLASS( + SWIFT_METACLASS( CFlightPlanAircraftInfo, - BLACK_METAMEMBER(aircraftIcao), - BLACK_METAMEMBER(comNavEquipment), - BLACK_METAMEMBER(ssrEquipment), - BLACK_METAMEMBER(wtc) - ); + SWIFT_METAMEMBER(aircraftIcao), + SWIFT_METAMEMBER(comNavEquipment), + SWIFT_METAMEMBER(ssrEquipment), + SWIFT_METAMEMBER(wtc)); }; } diff --git a/src/misc/aviation/flightplanlist.cpp b/src/misc/aviation/flightplanlist.cpp index 6c861073fd..d9d1657d76 100644 --- a/src/misc/aviation/flightplanlist.cpp +++ b/src/misc/aviation/flightplanlist.cpp @@ -3,7 +3,7 @@ #include "misc/aviation/flightplanlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CFlightPlan, CFlightPlanList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CFlightPlan, CFlightPlanList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/flightplanlist.h b/src/misc/aviation/flightplanlist.h index f55fd4441d..d83697b490 100644 --- a/src/misc/aviation/flightplanlist.h +++ b/src/misc/aviation/flightplanlist.h @@ -12,7 +12,7 @@ #include "misc/sequence.h" #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CFlightPlan, CFlightPlanList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CFlightPlan, CFlightPlanList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/heading.h b/src/misc/aviation/heading.h index 4951b47951..2f198c179d 100644 --- a/src/misc/aviation/heading.h +++ b/src/misc/aviation/heading.h @@ -98,10 +98,9 @@ namespace swift::misc::aviation private: ReferenceNorth m_north; //!< magnetic or true? - BLACK_METACLASS( + SWIFT_METACLASS( CHeading, - BLACK_METAMEMBER(north) - ); + SWIFT_METAMEMBER(north)); }; } // ns diff --git a/src/misc/aviation/informationmessage.cpp b/src/misc/aviation/informationmessage.cpp index a8d880145e..a0f2cb1cd4 100644 --- a/src/misc/aviation/informationmessage.cpp +++ b/src/misc/aviation/informationmessage.cpp @@ -4,7 +4,7 @@ #include "misc/aviation/informationmessage.h" #include "misc/comparefunctions.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CInformationMessage) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CInformationMessage) namespace swift::misc::aviation { diff --git a/src/misc/aviation/informationmessage.h b/src/misc/aviation/informationmessage.h index d7e7003525..fed84ed539 100644 --- a/src/misc/aviation/informationmessage.h +++ b/src/misc/aviation/informationmessage.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CInformationMessage) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CInformationMessage) namespace swift::misc::aviation { @@ -114,12 +114,11 @@ namespace swift::misc::aviation InformationType m_type; QString m_message; - BLACK_METACLASS( + SWIFT_METACLASS( CInformationMessage, - BLACK_METAMEMBER(type), - BLACK_METAMEMBER(message), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(type), + SWIFT_METAMEMBER(message), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // namespace diff --git a/src/misc/aviation/livery.cpp b/src/misc/aviation/livery.cpp index 2fc3722b05..3811bded7e 100644 --- a/src/misc/aviation/livery.cpp +++ b/src/misc/aviation/livery.cpp @@ -20,7 +20,7 @@ using namespace swift::misc; using namespace swift::misc::db; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CLivery) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CLivery) namespace swift::misc::aviation { diff --git a/src/misc/aviation/livery.h b/src/misc/aviation/livery.h index ee92096473..4f7213d0b9 100644 --- a/src/misc/aviation/livery.h +++ b/src/misc/aviation/livery.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CLivery) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CLivery) namespace swift::misc::aviation { @@ -233,17 +233,16 @@ namespace swift::misc::aviation CRgbColor m_colorTail; //!< color of tail bool m_military = false; //!< military livery? - BLACK_METACLASS( + SWIFT_METACLASS( CLivery, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(airline), - BLACK_METAMEMBER(combinedCode, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(colorFuselage), - BLACK_METAMEMBER(colorTail), - BLACK_METAMEMBER(military) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(airline), + SWIFT_METAMEMBER(combinedCode, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(colorFuselage), + SWIFT_METAMEMBER(colorTail), + SWIFT_METAMEMBER(military)); }; //! Id/CLivery map diff --git a/src/misc/aviation/liverylist.cpp b/src/misc/aviation/liverylist.cpp index e3730b055b..9d93a2862e 100644 --- a/src/misc/aviation/liverylist.cpp +++ b/src/misc/aviation/liverylist.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CLivery, CLiveryList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CLivery, CLiveryList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/liverylist.h b/src/misc/aviation/liverylist.h index 4f5f23d0a8..33a9ad00e9 100644 --- a/src/misc/aviation/liverylist.h +++ b/src/misc/aviation/liverylist.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CLivery, CLiveryList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::aviation, CLivery, CLiveryList) namespace swift::misc::aviation { diff --git a/src/misc/aviation/modulator.h b/src/misc/aviation/modulator.h index 531a4602d9..f8816b1f0f 100644 --- a/src/misc/aviation/modulator.h +++ b/src/misc/aviation/modulator.h @@ -132,16 +132,15 @@ namespace swift::misc::aviation return static_cast(this); } - BLACK_METACLASS( + SWIFT_METACLASS( CModulator, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(frequencyActive), - BLACK_METAMEMBER(frequencyStandby), - BLACK_METAMEMBER(volumeTransmit), - BLACK_METAMEMBER(volumeReceive), - BLACK_METAMEMBER(transmitEnabled), - BLACK_METAMEMBER(receiveEnabled) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(frequencyActive), + SWIFT_METAMEMBER(frequencyStandby), + SWIFT_METAMEMBER(volumeTransmit), + SWIFT_METAMEMBER(volumeReceive), + SWIFT_METAMEMBER(transmitEnabled), + SWIFT_METAMEMBER(receiveEnabled)); }; //! \cond PRIVATE diff --git a/src/misc/aviation/ongroundinfo.cpp b/src/misc/aviation/ongroundinfo.cpp index 032a4eef4d..a19fb35d2e 100644 --- a/src/misc/aviation/ongroundinfo.cpp +++ b/src/misc/aviation/ongroundinfo.cpp @@ -4,7 +4,7 @@ #include "misc/aviation/ongroundinfo.h" #include "misc/verify.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, COnGroundInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, COnGroundInfo) using namespace swift::misc::physical_quantities; diff --git a/src/misc/aviation/ongroundinfo.h b/src/misc/aviation/ongroundinfo.h index 81e3c11fc5..dd50fb6901 100644 --- a/src/misc/aviation/ongroundinfo.h +++ b/src/misc/aviation/ongroundinfo.h @@ -9,7 +9,7 @@ #include "misc/valueobject.h" #include "misc/pq/length.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, COnGroundInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Aviation, COnGroundInfo) namespace swift::misc::aviation { @@ -114,10 +114,10 @@ namespace swift::misc::aviation static constexpr double m_groundFactorThreshold = 0.95; //!< With m_onGroundDetails == "OnGroundByInterpolation", this is the threshold used to decide if the ground factor is OnGround or NotOnGround - BLACK_METACLASS( - COnGroundInfo, - BLACK_METAMEMBER(onGroundDetails), - BLACK_METAMEMBER(onGroundFactor)); + SWIFT_METACLASS( + COnGroundInfo, + SWIFT_METAMEMBER(onGroundDetails), + SWIFT_METAMEMBER(onGroundFactor)); }; } diff --git a/src/misc/aviation/selcal.cpp b/src/misc/aviation/selcal.cpp index e0755eae04..6577ef61d7 100644 --- a/src/misc/aviation/selcal.cpp +++ b/src/misc/aviation/selcal.cpp @@ -11,7 +11,7 @@ using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSelcal) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSelcal) namespace swift::misc::aviation { diff --git a/src/misc/aviation/selcal.h b/src/misc/aviation/selcal.h index 4e9c7ef68d..3c16e0ef19 100644 --- a/src/misc/aviation/selcal.h +++ b/src/misc/aviation/selcal.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSelcal) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSelcal) namespace swift::misc::physical_quantities { class CFrequency; @@ -78,9 +78,9 @@ namespace swift::misc::aviation QString m_code; - BLACK_METACLASS( + SWIFT_METACLASS( CSelcal, - BLACK_METAMEMBER(code) + SWIFT_METAMEMBER(code) ); }; } // namespace diff --git a/src/misc/aviation/simbriefdata.cpp b/src/misc/aviation/simbriefdata.cpp index 89ad0bdc9b..33aef1157a 100644 --- a/src/misc/aviation/simbriefdata.cpp +++ b/src/misc/aviation/simbriefdata.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSimBriefData) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSimBriefData) namespace swift::misc::aviation { diff --git a/src/misc/aviation/simbriefdata.h b/src/misc/aviation/simbriefdata.h index 0757874bb2..6ad8f3f014 100644 --- a/src/misc/aviation/simbriefdata.h +++ b/src/misc/aviation/simbriefdata.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSimBriefData) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSimBriefData) namespace swift::misc::aviation { @@ -66,11 +66,10 @@ namespace swift::misc::aviation QString m_url; QString m_username; - BLACK_METACLASS( + SWIFT_METACLASS( CSimBriefData, - BLACK_METAMEMBER(url), - BLACK_METAMEMBER(username) - ); + SWIFT_METAMEMBER(url), + SWIFT_METAMEMBER(username)); }; namespace Data diff --git a/src/misc/aviation/ssrequipment.cpp b/src/misc/aviation/ssrequipment.cpp index e37717a2b5..af7e92e3c1 100644 --- a/src/misc/aviation/ssrequipment.cpp +++ b/src/misc/aviation/ssrequipment.cpp @@ -3,7 +3,7 @@ #include "ssrequipment.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSsrEquipment) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSsrEquipment) namespace swift::misc::aviation { diff --git a/src/misc/aviation/ssrequipment.h b/src/misc/aviation/ssrequipment.h index 32d31ce853..5b06320a38 100644 --- a/src/misc/aviation/ssrequipment.h +++ b/src/misc/aviation/ssrequipment.h @@ -6,7 +6,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSsrEquipment) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CSsrEquipment) namespace swift::misc::aviation { @@ -65,10 +65,9 @@ namespace swift::misc::aviation SSrEquipment m_equipment = None; - BLACK_METACLASS( + SWIFT_METACLASS( CSsrEquipment, - BLACK_METAMEMBER(equipment) - ); + SWIFT_METAMEMBER(equipment)); }; } diff --git a/src/misc/aviation/track.h b/src/misc/aviation/track.h index 63d8ee7af7..111409bfb9 100644 --- a/src/misc/aviation/track.h +++ b/src/misc/aviation/track.h @@ -93,10 +93,9 @@ namespace swift::misc::aviation private: ReferenceNorth m_north; //!< magnetic or true? - BLACK_METACLASS( + SWIFT_METACLASS( CTrack, - BLACK_METAMEMBER(north) - ); + SWIFT_METAMEMBER(north)); }; } diff --git a/src/misc/aviation/transponder.cpp b/src/misc/aviation/transponder.cpp index e56301b7ba..78dc701a82 100644 --- a/src/misc/aviation/transponder.cpp +++ b/src/misc/aviation/transponder.cpp @@ -7,7 +7,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CTransponder) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CTransponder) namespace swift::misc::aviation { diff --git a/src/misc/aviation/transponder.h b/src/misc/aviation/transponder.h index eb50e6a0f1..2f8fb72387 100644 --- a/src/misc/aviation/transponder.h +++ b/src/misc/aviation/transponder.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CTransponder) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CTransponder) namespace swift::misc::aviation { @@ -156,11 +156,10 @@ namespace swift::misc::aviation int m_transponderCode; //!< Transponder code int m_transponderMode; //!< Transponder mode - BLACK_METACLASS( + SWIFT_METACLASS( CTransponder, - BLACK_METAMEMBER(transponderCode), - BLACK_METAMEMBER(transponderMode) - ); + SWIFT_METAMEMBER(transponderCode), + SWIFT_METAMEMBER(transponderMode)); }; } // ns diff --git a/src/misc/aviation/waketurbulencecategory.cpp b/src/misc/aviation/waketurbulencecategory.cpp index 80f382f6c5..ef1838c19f 100644 --- a/src/misc/aviation/waketurbulencecategory.cpp +++ b/src/misc/aviation/waketurbulencecategory.cpp @@ -3,7 +3,7 @@ #include "waketurbulencecategory.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CWakeTurbulenceCategory) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CWakeTurbulenceCategory) namespace swift::misc::aviation { diff --git a/src/misc/aviation/waketurbulencecategory.h b/src/misc/aviation/waketurbulencecategory.h index 26c3e06c80..6e21ca06bd 100644 --- a/src/misc/aviation/waketurbulencecategory.h +++ b/src/misc/aviation/waketurbulencecategory.h @@ -9,7 +9,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CWakeTurbulenceCategory) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::aviation, CWakeTurbulenceCategory) namespace swift::misc::aviation { @@ -48,10 +48,9 @@ namespace swift::misc::aviation private: WakeTurbulenceCategory m_wtc = UNKNOWN; - BLACK_METACLASS( + SWIFT_METACLASS( CWakeTurbulenceCategory, - BLACK_METAMEMBER(wtc) - ); + SWIFT_METAMEMBER(wtc)); }; } diff --git a/src/misc/collection.h b/src/misc/collection.h index 9c981320cf..4ce8fa9d96 100644 --- a/src/misc/collection.h +++ b/src/misc/collection.h @@ -17,19 +17,19 @@ #include //! \cond -#define BLACK_TEMPLATE_COLLECTION_MIXINS(NS, T, Set, Extern) \ +#define SWIFT_TEMPLATE_COLLECTION_MIXINS(NS, T, Set, Extern) \ namespace NS \ { \ class Set; \ } \ - namespace swift::misc::private_ns \ + namespace swift::misc::private_ns \ { \ Extern template struct CValueObjectMetaInfo; \ Extern template struct CValueObjectMetaInfo>; \ Extern template struct MetaTypeHelper; \ Extern template struct MetaTypeHelper>; \ } \ - namespace swift::misc::mixin \ + namespace swift::misc::mixin \ { \ Extern template class MetaType; \ Extern template class MetaType>; \ @@ -42,21 +42,21 @@ //! \endcond /*! - * \def BLACK_DECLARE_COLLECTION_MIXINS + * \def SWIFT_DECLARE_COLLECTION_MIXINS * Explicit template declaration of mixins for a CCollection subclass * to be placed near the top of the header that defines the class */ /*! - * \def BLACK_DEFINE_COLLECTION_MIXINS + * \def SWIFT_DEFINE_COLLECTION_MIXINS * Explicit template definition of mixins for a CCollection subclass */ #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_DECLARE_COLLECTION_MIXINS(Namespace, T, Set) -# define BLACK_DEFINE_COLLECTION_MIXINS(Namespace, T, Set) +# define SWIFT_DECLARE_COLLECTION_MIXINS(Namespace, T, Set) +# define SWIFT_DEFINE_COLLECTION_MIXINS(Namespace, T, Set) #else -# define BLACK_DECLARE_COLLECTION_MIXINS(Namespace, T, Set) BLACK_TEMPLATE_COLLECTION_MIXINS(Namespace, T, Set, extern) -# define BLACK_DEFINE_COLLECTION_MIXINS(Namespace, T, Set) BLACK_TEMPLATE_COLLECTION_MIXINS(Namespace, T, Set, ) +# define SWIFT_DECLARE_COLLECTION_MIXINS(Namespace, T, Set) SWIFT_TEMPLATE_COLLECTION_MIXINS(Namespace, T, Set, extern) +# define SWIFT_DEFINE_COLLECTION_MIXINS(Namespace, T, Set) SWIFT_TEMPLATE_COLLECTION_MIXINS(Namespace, T, Set, ) #endif namespace swift::misc diff --git a/src/misc/country.cpp b/src/misc/country.cpp index 4a9cc156b8..40fe0d881b 100644 --- a/src/misc/country.cpp +++ b/src/misc/country.cpp @@ -9,7 +9,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CCountry) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CCountry) namespace swift::misc { diff --git a/src/misc/country.h b/src/misc/country.h index 9578f69837..7b52e994ac 100644 --- a/src/misc/country.h +++ b/src/misc/country.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CCountry) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CCountry) namespace swift::misc { @@ -138,18 +138,17 @@ namespace swift::misc QString m_alias2; //!< 2nd alias bool m_historic = false; //!< historic country - BLACK_METACLASS( + SWIFT_METACLASS( CCountry, - BLACK_METAMEMBER(dbKey, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(loadedFromDb), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(iso3), - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(simplifiedName), - BLACK_METAMEMBER(alias1), - BLACK_METAMEMBER(alias2), - BLACK_METAMEMBER(historic) - ); + SWIFT_METAMEMBER(dbKey, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(loadedFromDb), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(iso3), + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(simplifiedName), + SWIFT_METAMEMBER(alias1), + SWIFT_METAMEMBER(alias2), + SWIFT_METAMEMBER(historic)); }; } // namespace diff --git a/src/misc/countrylist.cpp b/src/misc/countrylist.cpp index 58aec75936..dff4345526 100644 --- a/src/misc/countrylist.cpp +++ b/src/misc/countrylist.cpp @@ -7,7 +7,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CCountry, CCountryList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CCountry, CCountryList) namespace swift::misc { diff --git a/src/misc/countrylist.h b/src/misc/countrylist.h index 29c370eb86..4a22741ed2 100644 --- a/src/misc/countrylist.h +++ b/src/misc/countrylist.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CCountry, CCountryList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CCountry, CCountryList) namespace swift::misc { diff --git a/src/misc/crashhandler.cpp b/src/misc/crashhandler.cpp index dc4ea4f342..0997916ef1 100644 --- a/src/misc/crashhandler.cpp +++ b/src/misc/crashhandler.cpp @@ -12,7 +12,7 @@ #include #include -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD # if defined(Q_OS_WIN) && !defined(NOMINMAX) # define NOMINMAX # endif @@ -37,7 +37,7 @@ namespace swift::misc CCrashHandler::~CCrashHandler() {} -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD //! Convert to file path base::FilePath qstringToFilePath(const QString &str) { @@ -51,7 +51,7 @@ namespace swift::misc void CCrashHandler::init() { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD static const QString crashpadHandler(CBuildConfig::isRunningOnWindowsNtPlatform() ? "swift_crashpad_handler.exe" : "swift_crashpad_handler"); static const QString handler = CFileUtils::appendFilePaths(CSwiftDirectories::binDirectory(), crashpadHandler); const QString database = CSwiftDirectories::crashpadDatabaseDirectory(); @@ -108,7 +108,7 @@ namespace swift::misc void CCrashHandler::setUploadsEnabled(bool enable) { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD if (!m_crashReportDatabase) { return; @@ -122,7 +122,7 @@ namespace swift::misc bool CCrashHandler::isCrashDumpUploadEnabled() const { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD if (!m_crashReportDatabase) { return false; @@ -173,7 +173,7 @@ namespace swift::misc void CCrashHandler::simulateCrash() { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD CLogMessage(this).info(u"Simulated crash dump!"); m_crashAndLogInfo.appendInfo("Simulated crash dump!"); m_crashAndLogInfo.writeToFile(); @@ -187,7 +187,7 @@ namespace swift::misc void CCrashHandler::simulateAssert() { -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD CLogMessage(this).info(u"Simulated ASSERT!"); m_crashAndLogInfo.appendInfo("Simulated ASSERT!"); m_crashAndLogInfo.writeToFile(); diff --git a/src/misc/crashhandler.h b/src/misc/crashhandler.h index d653e5a6a0..a2492b4ee4 100644 --- a/src/misc/crashhandler.h +++ b/src/misc/crashhandler.h @@ -75,7 +75,7 @@ namespace swift::misc swift::misc::CCrashInfo m_crashAndLogInfo; //!< info representing details swift::misc::CDigestSignal m_dsCrashAndLogInfo { this, &CCrashHandler::triggerCrashInfoWrite, 10000, 5 }; -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD std::unique_ptr m_crashpadClient; std::unique_ptr m_crashReportDatabase; #endif diff --git a/src/misc/crashinfo.cpp b/src/misc/crashinfo.cpp index 3978a4c03c..0893ea464f 100644 --- a/src/misc/crashinfo.cpp +++ b/src/misc/crashinfo.cpp @@ -7,7 +7,7 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CCrashInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CCrashInfo) namespace swift::misc { diff --git a/src/misc/crashinfo.h b/src/misc/crashinfo.h index 558067479b..171290bb2d 100644 --- a/src/misc/crashinfo.h +++ b/src/misc/crashinfo.h @@ -8,7 +8,7 @@ #include "misc/valueobject.h" #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CCrashInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CCrashInfo) namespace swift::misc { @@ -91,14 +91,13 @@ namespace swift::misc QString m_flightNetwork; QString m_logFileAndPath; - BLACK_METACLASS( + SWIFT_METACLASS( CCrashInfo, - BLACK_METAMEMBER(userName), - BLACK_METAMEMBER(info), - BLACK_METAMEMBER(simulatorString), - BLACK_METAMEMBER(flightNetwork), - BLACK_METAMEMBER(logFileAndPath) - ); + SWIFT_METAMEMBER(userName), + SWIFT_METAMEMBER(info), + SWIFT_METAMEMBER(simulatorString), + SWIFT_METAMEMBER(flightNetwork), + SWIFT_METAMEMBER(logFileAndPath)); }; } // ns diff --git a/src/misc/db/artifact.cpp b/src/misc/db/artifact.cpp index 708923c755..55a43384dd 100644 --- a/src/misc/db/artifact.cpp +++ b/src/misc/db/artifact.cpp @@ -10,7 +10,7 @@ using namespace swift::config; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CArtifact) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CArtifact) namespace swift::misc::db { diff --git a/src/misc/db/artifact.h b/src/misc/db/artifact.h index 667fefd39d..a7fbbeaa88 100644 --- a/src/misc/db/artifact.h +++ b/src/misc/db/artifact.h @@ -12,7 +12,7 @@ #include "misc/network/remotefile.h" #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CArtifact) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CArtifact) namespace swift::misc::db { @@ -161,18 +161,17 @@ namespace swift::misc::db //! Trim a strin representing 4th segment static QString trim4thSegment(const QString &seg); - BLACK_METACLASS( + SWIFT_METACLASS( CArtifact, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(version), - BLACK_METAMEMBER(md5), - BLACK_METAMEMBER(type), - BLACK_METAMEMBER(size), - BLACK_METAMEMBER(existing), - BLACK_METAMEMBER(platform), - BLACK_METAMEMBER(distributions), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(version), + SWIFT_METAMEMBER(md5), + SWIFT_METAMEMBER(type), + SWIFT_METAMEMBER(size), + SWIFT_METAMEMBER(existing), + SWIFT_METAMEMBER(platform), + SWIFT_METAMEMBER(distributions), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // ns diff --git a/src/misc/db/artifactlist.cpp b/src/misc/db/artifactlist.cpp index b0832dde74..2d03eaa981 100644 --- a/src/misc/db/artifactlist.cpp +++ b/src/misc/db/artifactlist.cpp @@ -6,7 +6,7 @@ using namespace swift::misc::network; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CArtifact, CArtifactList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CArtifact, CArtifactList) namespace swift::misc::db { diff --git a/src/misc/db/artifactlist.h b/src/misc/db/artifactlist.h index 95a3eb5a71..e84e902c05 100644 --- a/src/misc/db/artifactlist.h +++ b/src/misc/db/artifactlist.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CArtifact, CArtifactList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CArtifact, CArtifactList) namespace swift::misc::db { diff --git a/src/misc/db/dbinfo.cpp b/src/misc/db/dbinfo.cpp index 9c4c1ba7ff..b68b568e72 100644 --- a/src/misc/db/dbinfo.cpp +++ b/src/misc/db/dbinfo.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CDbInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CDbInfo) namespace swift::misc::db { diff --git a/src/misc/db/dbinfo.h b/src/misc/db/dbinfo.h index d1c5d66275..c2b6f6ffea 100644 --- a/src/misc/db/dbinfo.h +++ b/src/misc/db/dbinfo.h @@ -10,7 +10,7 @@ #include "misc/valueobject.h" #include "misc/swiftmiscexport.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CDbInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CDbInfo) namespace swift::misc::db { @@ -101,13 +101,12 @@ namespace swift::misc::db int m_entries; //!< number of entries network::CEntityFlags::Entity m_entity = network::CEntityFlags::NoEntity; //!< lazy initialized entity - BLACK_METACLASS( + SWIFT_METACLASS( CDbInfo, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(tableName), - BLACK_METAMEMBER(entries) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(tableName), + SWIFT_METAMEMBER(entries)); }; } // namespace diff --git a/src/misc/db/dbinfolist.cpp b/src/misc/db/dbinfolist.cpp index 53d3d20160..d61908bcce 100644 --- a/src/misc/db/dbinfolist.cpp +++ b/src/misc/db/dbinfolist.cpp @@ -5,7 +5,7 @@ using namespace swift::misc::network; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDbInfo, CDbInfoList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDbInfo, CDbInfoList) namespace swift::misc::db { diff --git a/src/misc/db/dbinfolist.h b/src/misc/db/dbinfolist.h index 805ad247c7..e696052781 100644 --- a/src/misc/db/dbinfolist.h +++ b/src/misc/db/dbinfolist.h @@ -14,7 +14,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CDbInfo, CDbInfoList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CDbInfo, CDbInfoList) namespace swift::misc::db { diff --git a/src/misc/db/distribution.cpp b/src/misc/db/distribution.cpp index 56b70fd928..3c02c7d7e8 100644 --- a/src/misc/db/distribution.cpp +++ b/src/misc/db/distribution.cpp @@ -9,7 +9,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CDistribution) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CDistribution) namespace swift::misc::db { diff --git a/src/misc/db/distribution.h b/src/misc/db/distribution.h index 06116dd28e..9928bb2d18 100644 --- a/src/misc/db/distribution.h +++ b/src/misc/db/distribution.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CDistribution) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CDistribution) namespace swift::misc::db { @@ -108,14 +108,13 @@ namespace swift::misc::db bool m_restricted = false; //!< restricted access (i.e. password for download needed) network::CUrl m_downloadUrl; //!< download URL, here I get the installer - BLACK_METACLASS( + SWIFT_METACLASS( CDistribution, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(channel), - BLACK_METAMEMBER(stability), - BLACK_METAMEMBER(downloadUrl) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(channel), + SWIFT_METAMEMBER(stability), + SWIFT_METAMEMBER(downloadUrl)); }; } // ns diff --git a/src/misc/db/distributionlist.cpp b/src/misc/db/distributionlist.cpp index 77bdd008a6..c4811c917f 100644 --- a/src/misc/db/distributionlist.cpp +++ b/src/misc/db/distributionlist.cpp @@ -4,7 +4,7 @@ #include "misc/db/distributionlist.h" #include "misc/stringutils.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDistribution, CDistributionList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDistribution, CDistributionList) namespace swift::misc::db { diff --git a/src/misc/db/distributionlist.h b/src/misc/db/distributionlist.h index 9e6746c3d4..c0bff9df2f 100644 --- a/src/misc/db/distributionlist.h +++ b/src/misc/db/distributionlist.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CDistribution, CDistributionList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::db, CDistribution, CDistributionList) namespace swift::misc::db { diff --git a/src/misc/db/updateinfo.cpp b/src/misc/db/updateinfo.cpp index 3a91aff575..4897a2ab86 100644 --- a/src/misc/db/updateinfo.cpp +++ b/src/misc/db/updateinfo.cpp @@ -11,7 +11,7 @@ using namespace swift::config; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CUpdateInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CUpdateInfo) namespace swift::misc::db { diff --git a/src/misc/db/updateinfo.h b/src/misc/db/updateinfo.h index bcffd95c03..1098310ab9 100644 --- a/src/misc/db/updateinfo.h +++ b/src/misc/db/updateinfo.h @@ -11,7 +11,7 @@ #include "misc/valueobject.h" #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CUpdateInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::db, CUpdateInfo) namespace swift::misc::db { @@ -99,12 +99,11 @@ namespace swift::misc::db CArtifactList m_artifactsXSwiftBus; //!< artifacts xswiftbus CDistributionList m_distributions; //!< all distributions (for any artifacts) - BLACK_METACLASS( + SWIFT_METACLASS( CUpdateInfo, - BLACK_METAMEMBER(artifactsPilotClient), - BLACK_METAMEMBER(artifactsXSwiftBus), - BLACK_METAMEMBER(distributions) - ); + SWIFT_METAMEMBER(artifactsPilotClient), + SWIFT_METAMEMBER(artifactsXSwiftBus), + SWIFT_METAMEMBER(distributions)); }; //! Trait for update info, i.e. distributions and artifacts diff --git a/src/misc/directories.cpp b/src/misc/directories.cpp index f8fa6f3cbf..1690e1b2dc 100644 --- a/src/misc/directories.cpp +++ b/src/misc/directories.cpp @@ -6,7 +6,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CDirectories) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CDirectories) namespace swift::misc { diff --git a/src/misc/directories.h b/src/misc/directories.h index b989b25e54..a39918cb18 100644 --- a/src/misc/directories.h +++ b/src/misc/directories.h @@ -12,7 +12,7 @@ #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CDirectories) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CDirectories) namespace swift::misc { @@ -110,14 +110,13 @@ namespace swift::misc //! Return checkDir if existing, defaultDir otherwise QString existingOrDefaultDir(const QString &checkDir, const QString &defaultDir) const; - BLACK_METACLASS( + SWIFT_METACLASS( CDirectories, - BLACK_METAMEMBER(dirFlightPlan), - BLACK_METAMEMBER(dirLastViewJson), - BLACK_METAMEMBER(dirLastModelJson), - BLACK_METAMEMBER(dirLastModelStashJson), - BLACK_METAMEMBER(dirMatchingScript) - ); + SWIFT_METAMEMBER(dirFlightPlan), + SWIFT_METAMEMBER(dirLastViewJson), + SWIFT_METAMEMBER(dirLastModelJson), + SWIFT_METAMEMBER(dirLastModelStashJson), + SWIFT_METAMEMBER(dirMatchingScript)); }; namespace settings diff --git a/src/misc/genericdbusinterface.h b/src/misc/genericdbusinterface.h index d71fb82559..4370c6ae7d 100644 --- a/src/misc/genericdbusinterface.h +++ b/src/misc/genericdbusinterface.h @@ -20,7 +20,7 @@ * Any signals tagged with this macro will be ignored by swift::misc::CGenericDBusInterface::relayParentSignals(). * \see QMetaMethod::tag */ -# define BLACK_NO_RELAY +# define SWIFT_NO_RELAY #endif namespace swift::misc @@ -39,7 +39,7 @@ namespace swift::misc {} //! For each signal in parent, attempt to connect to it an interface signal of the same name. - //! \see BLACK_NO_RELAY + //! \see SWIFT_NO_RELAY void relayParentSignals() { const QMetaObject *metaObject = this->parent()->metaObject(); @@ -50,7 +50,7 @@ namespace swift::misc { const QMetaMethod method = metaObject->method(i); if (method.methodType() != QMetaMethod::Signal) { continue; } - if (method.tag() && strcmp(method.tag(), "BLACK_NO_RELAY") == 0) { continue; } + if (method.tag() && strcmp(method.tag(), "SWIFT_NO_RELAY") == 0) { continue; } const QByteArray signature = method.methodSignature().prepend("2"); // the reason for this "2" can be found in the definition of SIGNAL() macro const bool c = this->connection().connect(this->service(), this->path(), this->interface(), method.name(), this->parent(), signature); diff --git a/src/misc/geo/coordinategeodetic.cpp b/src/misc/geo/coordinategeodetic.cpp index cd0bcad113..ac7a2ca70a 100644 --- a/src/misc/geo/coordinategeodetic.cpp +++ b/src/misc/geo/coordinategeodetic.cpp @@ -13,7 +13,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; using namespace swift::misc::math; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::geo, CCoordinateGeodetic) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::geo, CCoordinateGeodetic) namespace swift::misc::geo { diff --git a/src/misc/geo/coordinategeodetic.h b/src/misc/geo/coordinategeodetic.h index bf37a86ec8..d3610c782a 100644 --- a/src/misc/geo/coordinategeodetic.h +++ b/src/misc/geo/coordinategeodetic.h @@ -22,7 +22,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::geo, CCoordinateGeodetic) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::geo, CCoordinateGeodetic) namespace swift::misc { @@ -351,13 +351,12 @@ namespace swift::misc double m_z = 0; //!< normal vector [-1,1] aviation::CAltitude m_geodeticHeight { 0, nullptr }; //!< height, ellipsoidal or geodetic height - BLACK_METACLASS( + SWIFT_METACLASS( CCoordinateGeodetic, - BLACK_METAMEMBER(x), - BLACK_METAMEMBER(y), - BLACK_METAMEMBER(z), - BLACK_METAMEMBER(geodeticHeight) - ); + SWIFT_METAMEMBER(x), + SWIFT_METAMEMBER(y), + SWIFT_METAMEMBER(z), + SWIFT_METAMEMBER(geodeticHeight)); }; } // namespace diff --git a/src/misc/geo/coordinategeodeticlist.cpp b/src/misc/geo/coordinategeodeticlist.cpp index 330016c76f..a3e31e3c3a 100644 --- a/src/misc/geo/coordinategeodeticlist.cpp +++ b/src/misc/geo/coordinategeodeticlist.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::math; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::geo, CCoordinateGeodetic, CCoordinateGeodeticList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::geo, CCoordinateGeodetic, CCoordinateGeodeticList) namespace swift::misc::geo { diff --git a/src/misc/geo/coordinategeodeticlist.h b/src/misc/geo/coordinategeodeticlist.h index af12a37f89..707ddc6129 100644 --- a/src/misc/geo/coordinategeodeticlist.h +++ b/src/misc/geo/coordinategeodeticlist.h @@ -20,7 +20,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::geo, CCoordinateGeodetic, CCoordinateGeodeticList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::geo, CCoordinateGeodetic, CCoordinateGeodeticList) namespace swift::misc::geo { diff --git a/src/misc/geo/elevationplane.h b/src/misc/geo/elevationplane.h index 1a5151b55e..486cd85a2c 100644 --- a/src/misc/geo/elevationplane.h +++ b/src/misc/geo/elevationplane.h @@ -137,10 +137,9 @@ namespace swift::misc::geo private: physical_quantities::CLength m_radius { 0, nullptr }; //!< elevation is valid in radius - BLACK_METACLASS( + SWIFT_METACLASS( CElevationPlane, - BLACK_METAMEMBER(radius) - ); + SWIFT_METAMEMBER(radius)); }; } // namespace diff --git a/src/misc/icon.h b/src/misc/icon.h index e8e3bbb89f..0910cdb7ae 100644 --- a/src/misc/icon.h +++ b/src/misc/icon.h @@ -115,13 +115,12 @@ namespace swift::misc QString m_fileResourcePath; //!< file resource path QPixmap m_pixmap; //!< Used with generated pixmaps, when not used with index - BLACK_METACLASS( + SWIFT_METACLASS( CIcon, - BLACK_METAMEMBER(index), - BLACK_METAMEMBER(rotateDegrees, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(descriptiveText), - BLACK_METAMEMBER(fileResourcePath) - ); + SWIFT_METAMEMBER(index), + SWIFT_METAMEMBER(rotateDegrees, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(descriptiveText), + SWIFT_METAMEMBER(fileResourcePath)); }; } // namespace diff --git a/src/misc/iconlist.cpp b/src/misc/iconlist.cpp index 54ac672a56..ec6ee1ded7 100644 --- a/src/misc/iconlist.cpp +++ b/src/misc/iconlist.cpp @@ -5,7 +5,7 @@ #include "misc/containerbase.h" #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CIcon, CIconList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CIcon, CIconList) namespace swift::misc { diff --git a/src/misc/iconlist.h b/src/misc/iconlist.h index 302d1a2e84..e0fe6f1e29 100644 --- a/src/misc/iconlist.h +++ b/src/misc/iconlist.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CIcon, CIconList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CIcon, CIconList) namespace swift::misc { diff --git a/src/misc/identifier.cpp b/src/misc/identifier.cpp index 72497b65b5..735b3d6b62 100644 --- a/src/misc/identifier.cpp +++ b/src/misc/identifier.cpp @@ -11,7 +11,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CIdentifier) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CIdentifier) //! \private Escape characters not allowed in dbus paths QString toDBusPath(const QString &s) diff --git a/src/misc/identifier.h b/src/misc/identifier.h index dcc3c2686c..39dd9841ff 100644 --- a/src/misc/identifier.h +++ b/src/misc/identifier.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CIdentifier) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CIdentifier) namespace swift::misc { @@ -157,14 +157,13 @@ namespace swift::misc QString m_processName; //!< process name qint64 m_processId; //!< PID - BLACK_METACLASS( + SWIFT_METACLASS( CIdentifier, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(machineIdBase64), - BLACK_METAMEMBER(machineName, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(processName), - BLACK_METAMEMBER(processId) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(machineIdBase64), + SWIFT_METAMEMBER(machineName, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(processName), + SWIFT_METAMEMBER(processId)); }; } // namespace diff --git a/src/misc/identifierlist.cpp b/src/misc/identifierlist.cpp index c378c73b1d..66d05a9c46 100644 --- a/src/misc/identifierlist.cpp +++ b/src/misc/identifierlist.cpp @@ -6,7 +6,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CIdentifier, CIdentifierList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CIdentifier, CIdentifierList) namespace swift::misc { diff --git a/src/misc/identifierlist.h b/src/misc/identifierlist.h index 990fa78ff5..44345568cf 100644 --- a/src/misc/identifierlist.h +++ b/src/misc/identifierlist.h @@ -11,7 +11,7 @@ #include "misc/swiftmiscexport.h" #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CIdentifier, CIdentifierList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CIdentifier, CIdentifierList) namespace swift::misc { diff --git a/src/misc/input/actionhotkey.cpp b/src/misc/input/actionhotkey.cpp index d54a6c4cc3..4365d79c20 100644 --- a/src/misc/input/actionhotkey.cpp +++ b/src/misc/input/actionhotkey.cpp @@ -4,7 +4,7 @@ #include "misc/input/actionhotkey.h" #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CActionHotkey) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CActionHotkey) namespace swift::misc::input { diff --git a/src/misc/input/actionhotkey.h b/src/misc/input/actionhotkey.h index 35a1f3246c..35e9c89148 100644 --- a/src/misc/input/actionhotkey.h +++ b/src/misc/input/actionhotkey.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CActionHotkey) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CActionHotkey) namespace swift::misc::input { @@ -97,12 +97,11 @@ namespace swift::misc::input CHotkeyCombination m_combination; //!< hotkey combination QString m_action; //!< hotkey action - BLACK_METACLASS( + SWIFT_METACLASS( CActionHotkey, - BLACK_METAMEMBER(identifier), - BLACK_METAMEMBER(combination), - BLACK_METAMEMBER(action) - ); + SWIFT_METAMEMBER(identifier), + SWIFT_METAMEMBER(combination), + SWIFT_METAMEMBER(action)); }; } // ns diff --git a/src/misc/input/actionhotkeylist.cpp b/src/misc/input/actionhotkeylist.cpp index d63dbf732a..dea104cc9f 100644 --- a/src/misc/input/actionhotkeylist.cpp +++ b/src/misc/input/actionhotkeylist.cpp @@ -4,7 +4,7 @@ #include "misc/input/actionhotkeylist.h" #include "misc/input/hotkeycombination.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CActionHotkey, CActionHotkeyList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CActionHotkey, CActionHotkeyList) namespace swift::misc::input { diff --git a/src/misc/input/actionhotkeylist.h b/src/misc/input/actionhotkeylist.h index 6fb89ef413..d7ee9f7045 100644 --- a/src/misc/input/actionhotkeylist.h +++ b/src/misc/input/actionhotkeylist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CActionHotkey, CActionHotkeyList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CActionHotkey, CActionHotkeyList) namespace swift::misc::input { diff --git a/src/misc/input/hotkeycombination.cpp b/src/misc/input/hotkeycombination.cpp index 0064077fe9..6480fb9341 100644 --- a/src/misc/input/hotkeycombination.cpp +++ b/src/misc/input/hotkeycombination.cpp @@ -8,7 +8,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CHotkeyCombination) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CHotkeyCombination) namespace swift::misc::input { diff --git a/src/misc/input/hotkeycombination.h b/src/misc/input/hotkeycombination.h index 9238ed1d31..8ceb04c65a 100644 --- a/src/misc/input/hotkeycombination.h +++ b/src/misc/input/hotkeycombination.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CHotkeyCombination) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CHotkeyCombination) namespace swift::misc::input { @@ -95,11 +95,10 @@ namespace swift::misc::input CKeyboardKeyList m_keyboardKeys; CJoystickButtonList m_joystickButtons; - BLACK_METACLASS( + SWIFT_METACLASS( CHotkeyCombination, - BLACK_METAMEMBER(keyboardKeys), - BLACK_METAMEMBER(joystickButtons) - ); + SWIFT_METAMEMBER(keyboardKeys), + SWIFT_METAMEMBER(joystickButtons)); }; } // ns diff --git a/src/misc/input/joystickbutton.cpp b/src/misc/input/joystickbutton.cpp index edfa14bba6..9ac50ce99b 100644 --- a/src/misc/input/joystickbutton.cpp +++ b/src/misc/input/joystickbutton.cpp @@ -3,7 +3,7 @@ #include "misc/input/joystickbutton.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CJoystickButton) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CJoystickButton) namespace swift::misc::input { diff --git a/src/misc/input/joystickbutton.h b/src/misc/input/joystickbutton.h index 87528ea480..9eaf75f051 100644 --- a/src/misc/input/joystickbutton.h +++ b/src/misc/input/joystickbutton.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CJoystickButton) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CJoystickButton) namespace swift::misc::input { @@ -90,11 +90,10 @@ namespace swift::misc::input QString m_deviceName; int m_buttonIndex = InvalidButtonIndex; - BLACK_METACLASS( + SWIFT_METACLASS( CJoystickButton, - BLACK_METAMEMBER(deviceName), - BLACK_METAMEMBER(buttonIndex) - ); + SWIFT_METAMEMBER(deviceName), + SWIFT_METAMEMBER(buttonIndex)); }; } // ns diff --git a/src/misc/input/joystickbuttonlist.cpp b/src/misc/input/joystickbuttonlist.cpp index b19f969414..c152496691 100644 --- a/src/misc/input/joystickbuttonlist.cpp +++ b/src/misc/input/joystickbuttonlist.cpp @@ -3,7 +3,7 @@ #include "misc/input/joystickbuttonlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CJoystickButton, CJoystickButtonList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CJoystickButton, CJoystickButtonList) namespace swift::misc::input { diff --git a/src/misc/input/joystickbuttonlist.h b/src/misc/input/joystickbuttonlist.h index 5cd3677d9a..36761063b4 100644 --- a/src/misc/input/joystickbuttonlist.h +++ b/src/misc/input/joystickbuttonlist.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CJoystickButton, CJoystickButtonList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CJoystickButton, CJoystickButtonList) namespace swift::misc::input { diff --git a/src/misc/input/keyboardkey.cpp b/src/misc/input/keyboardkey.cpp index b801fa6fc8..26f82979d5 100644 --- a/src/misc/input/keyboardkey.cpp +++ b/src/misc/input/keyboardkey.cpp @@ -10,7 +10,7 @@ #include "misc/propertyindexref.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CKeyboardKey) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::input, CKeyboardKey) namespace swift::misc::input { diff --git a/src/misc/input/keyboardkey.h b/src/misc/input/keyboardkey.h index d92c198c23..065a950478 100644 --- a/src/misc/input/keyboardkey.h +++ b/src/misc/input/keyboardkey.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CKeyboardKey) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::input, CKeyboardKey) namespace swift::misc::input { @@ -84,10 +84,9 @@ namespace swift::misc::input KeyCode m_keyCode; //!< Key code - BLACK_METACLASS( + SWIFT_METACLASS( CKeyboardKey, - BLACK_METAMEMBER(keyCode) - ); + SWIFT_METAMEMBER(keyCode)); }; } // ns diff --git a/src/misc/input/keyboardkeylist.cpp b/src/misc/input/keyboardkeylist.cpp index 48e5977a55..35e8f45eb1 100644 --- a/src/misc/input/keyboardkeylist.cpp +++ b/src/misc/input/keyboardkeylist.cpp @@ -4,7 +4,7 @@ #include "misc/input/keyboardkeylist.h" #include "misc/input/keycodes.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CKeyboardKey, CKeyboardKeyList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CKeyboardKey, CKeyboardKeyList) namespace swift::misc::input { diff --git a/src/misc/input/keyboardkeylist.h b/src/misc/input/keyboardkeylist.h index 951a9b41b9..b285ee2e8f 100644 --- a/src/misc/input/keyboardkeylist.h +++ b/src/misc/input/keyboardkeylist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CKeyboardKey, CKeyboardKeyList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::input, CKeyboardKey, CKeyboardKeyList) namespace swift::misc::input { diff --git a/src/misc/logcategory.cpp b/src/misc/logcategory.cpp index b81cadb98a..b45630d50b 100644 --- a/src/misc/logcategory.cpp +++ b/src/misc/logcategory.cpp @@ -5,7 +5,7 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CLogCategory) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CLogCategory) namespace swift::misc { diff --git a/src/misc/logcategory.h b/src/misc/logcategory.h index 19929cfee5..0e8bc58ee6 100644 --- a/src/misc/logcategory.h +++ b/src/misc/logcategory.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CLogCategory) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CLogCategory) namespace swift::misc { @@ -51,10 +51,9 @@ namespace swift::misc private: QString m_string; - BLACK_METACLASS( + SWIFT_METACLASS( CLogCategory, - BLACK_METAMEMBER(string) - ); + SWIFT_METAMEMBER(string)); }; } // ns diff --git a/src/misc/logcategorylist.cpp b/src/misc/logcategorylist.cpp index 7650f8e1a0..3acbd48e63 100644 --- a/src/misc/logcategorylist.cpp +++ b/src/misc/logcategorylist.cpp @@ -12,7 +12,7 @@ struct QMetaObject; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CLogCategory, CLogCategoryList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CLogCategory, CLogCategoryList) namespace swift::misc { diff --git a/src/misc/logcategorylist.h b/src/misc/logcategorylist.h index 358aefcd13..aca2d52f99 100644 --- a/src/misc/logcategorylist.h +++ b/src/misc/logcategorylist.h @@ -23,7 +23,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CLogCategory, CLogCategoryList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CLogCategory, CLogCategoryList) namespace swift::misc { diff --git a/src/misc/loghandler.cpp b/src/misc/loghandler.cpp index b72bacaadb..6088989fd2 100644 --- a/src/misc/loghandler.cpp +++ b/src/misc/loghandler.cpp @@ -9,7 +9,7 @@ #include "misc/threadutils.h" #include "config/buildconfig.h" -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD # include "crashpad/client/simulate_crash.h" #endif @@ -65,7 +65,7 @@ namespace swift::misc qApp->installNativeEventFilter(&ef); MessageBoxW(nullptr, message.toStdWString().c_str(), nullptr, MB_OK); // display assert dialog in release build qApp->removeNativeEventFilter(&ef); -# if defined(BLACK_USE_CRASHPAD) +# if defined(SWIFT_USE_CRASHPAD) CRASHPAD_SIMULATE_CRASH(); // workaround inability to catch __fastfail # endif } diff --git a/src/misc/loghistory.h b/src/misc/loghistory.h index e0a9db3282..0982751b43 100644 --- a/src/misc/loghistory.h +++ b/src/misc/loghistory.h @@ -21,7 +21,7 @@ namespace swift::misc class SWIFT_MISC_EXPORT CLogHistory : public shared_state::CListJournal { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("swift.log.history") + SWIFT_SHARED_STATE_CHANNEL("swift.log.history") public: //! Constructor. @@ -34,7 +34,7 @@ namespace swift::misc class SWIFT_MISC_EXPORT CLogHistorySource : public shared_state::CListMutator { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("swift.log.history") + SWIFT_SHARED_STATE_CHANNEL("swift.log.history") public: //! Constructor. @@ -47,7 +47,7 @@ namespace swift::misc class SWIFT_MISC_EXPORT CLogHistoryReplica : public shared_state::CListObserver { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("swift.log.history") + SWIFT_SHARED_STATE_CHANNEL("swift.log.history") public: //! Constructor. diff --git a/src/misc/logmessage.h b/src/misc/logmessage.h index bedb8cbca6..13d1bd9d44 100644 --- a/src/misc/logmessage.h +++ b/src/misc/logmessage.h @@ -61,4 +61,4 @@ namespace swift::misc * Convenience macro to construct a CLogMessage with the filename, line number, and function name, * for verbose debug messages. */ -#define BLACK_LOG (swift::misc::CLogMessage { __FILE__, __LINE__, Q_FUNC_INFO }) +#define SWIFT_LOG (swift::misc::CLogMessage { __FILE__, __LINE__, Q_FUNC_INFO }) diff --git a/src/misc/logpattern.h b/src/misc/logpattern.h index de906a13c9..04f92e8df2 100644 --- a/src/misc/logpattern.h +++ b/src/misc/logpattern.h @@ -167,12 +167,11 @@ namespace swift::misc static const QHash &allHumanReadablePatterns(); - BLACK_METACLASS( + SWIFT_METACLASS( CLogPattern, - BLACK_METAMEMBER(severities), - BLACK_METAMEMBER(strategy), - BLACK_METAMEMBER(strings) - ); + SWIFT_METAMEMBER(severities), + SWIFT_METAMEMBER(strategy), + SWIFT_METAMEMBER(strings)); }; } diff --git a/src/misc/metaclass.h b/src/misc/metaclass.h index c5e85a76ac..deffc95f74 100644 --- a/src/misc/metaclass.h +++ b/src/misc/metaclass.h @@ -23,17 +23,17 @@ // Work around MinGW problem with combination of constexpr and extern template #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_NO_EXPORT_CONSTEXPR constexpr inline __attribute__((always_inline)) +# define SWIFT_NO_EXPORT_CONSTEXPR constexpr inline __attribute__((always_inline)) #else -# define BLACK_NO_EXPORT_CONSTEXPR constexpr +# define SWIFT_NO_EXPORT_CONSTEXPR constexpr #endif // MSVC, GCC, Clang all have non-standard extensions for skipping trailing // commas in variadic macros, but the MSVC extension differs from the others. #ifdef Q_CC_MSVC -# define BLACK_TRAILING_VA_ARGS(...) , __VA_ARGS__ +# define SWIFT_TRAILING_VA_ARGS(...) , __VA_ARGS__ #else -# define BLACK_TRAILING_VA_ARGS(...) , ##__VA_ARGS__ +# define SWIFT_TRAILING_VA_ARGS(...) , ##__VA_ARGS__ #endif //! \endcond @@ -47,15 +47,15 @@ * \note A semicolon is needed at the end. * \ingroup MetaClass */ -#define BLACK_METACLASS(CLASS, ...) \ - friend struct swift::misc::private_ns::CMetaClassAccessor;\ - struct MetaClass : public swift::misc::CMetaClass \ - { \ - using Class = CLASS; \ - BLACK_NO_EXPORT_CONSTEXPR static auto getMemberList() \ - { \ - return makeMetaMemberList(__VA_ARGS__); \ - } \ +#define SWIFT_METACLASS(CLASS, ...) \ + friend struct swift::misc::private_ns::CMetaClassAccessor; \ + struct MetaClass : public swift::misc::CMetaClass \ + { \ + using Class = CLASS; \ + SWIFT_NO_EXPORT_CONSTEXPR static auto getMemberList() \ + { \ + return makeMetaMemberList(__VA_ARGS__); \ + } \ } /*! @@ -65,24 +65,24 @@ * forwarded to CMetaClass::makeMetaMember. * * \tparam MEMBER The name of the member without m_ part. - * \see BLACK_METACLASS - * \see BLACK_METAMEMBER_NAMED + * \see SWIFT_METACLASS + * \see SWIFT_METAMEMBER_NAMED * \see swift::misc::CMetaClass::makeMetaMember * \ingroup MetaClass */ -#define BLACK_METAMEMBER(MEMBER, ...) \ +#define SWIFT_METAMEMBER(MEMBER, ...) \ makeMetaMember( \ - &Class::m_##MEMBER, #MEMBER BLACK_TRAILING_VA_ARGS(__VA_ARGS__)) + &Class::m_##MEMBER, #MEMBER SWIFT_TRAILING_VA_ARGS(__VA_ARGS__)) /*! - * Same as BLACK_METAMEMBER but the second parameter is a string literal + * Same as SWIFT_METAMEMBER but the second parameter is a string literal * containing the JSON name of the member. * * \ingroup MetaClass */ -#define BLACK_METAMEMBER_NAMED(MEMBER, NAME, ...) \ +#define SWIFT_METAMEMBER_NAMED(MEMBER, NAME, ...) \ makeMetaMember( \ - &Class::m_##MEMBER, NAME BLACK_TRAILING_VA_ARGS(__VA_ARGS__)) + &Class::m_##MEMBER, NAME SWIFT_TRAILING_VA_ARGS(__VA_ARGS__)) // *INDENT-ON* //! std::string qHash diff --git a/src/misc/mixin/mixindatastream.h b/src/misc/mixin/mixindatastream.h index afbcd8e4f4..2e0cc58fb7 100644 --- a/src/misc/mixin/mixindatastream.h +++ b/src/misc/mixin/mixindatastream.h @@ -138,7 +138,7 @@ namespace swift::misc * When a derived class and a base class both inherit from mixin::DataStreamByMetaClass, * the derived class uses this macro to disambiguate the inherited members. */ -#define SWIFT_MISC_DECLARE_USING_MIXIN_DATASTREAM(DERIVED) \ +#define SWIFT_MISC_DECLARE_USING_MIXIN_DATASTREAM(DERIVED) \ using ::swift::misc::mixin::DataStreamByMetaClass::marshalToDataStream; \ using ::swift::misc::mixin::DataStreamByMetaClass::unmarshalFromDataStream; } diff --git a/src/misc/mixin/mixindbus.h b/src/misc/mixin/mixindbus.h index 0ea01bb15b..b81074d3ab 100644 --- a/src/misc/mixin/mixindbus.h +++ b/src/misc/mixin/mixindbus.h @@ -172,9 +172,9 @@ namespace swift::misc * When a derived class and a base class both inherit from mixin::DBusByTuple, * the derived class uses this macro to disambiguate the inherited members. */ -#define SWIFT_MISC_DECLARE_USING_MIXIN_DBUS(DERIVED, ...) \ - using ::swift::misc::mixin::DBusByMetaClass::marshallToDbus; \ - using ::swift::misc::mixin::DBusByMetaClass::unmarshallFromDbus; +#define SWIFT_MISC_DECLARE_USING_MIXIN_DBUS(DERIVED, ...) \ + using ::swift::misc::mixin::DBusByMetaClass::marshallToDbus; \ + using ::swift::misc::mixin::DBusByMetaClass::unmarshallFromDbus; // *INDENT-ON* } // Mixin diff --git a/src/misc/mixin/mixinhash.h b/src/misc/mixin/mixinhash.h index 48e524a193..fd51f2c86d 100644 --- a/src/misc/mixin/mixinhash.h +++ b/src/misc/mixin/mixinhash.h @@ -38,7 +38,7 @@ namespace swift::misc /*! * CRTP class template from which a derived class can inherit common methods dealing with hashing instances by metaclass. * - * \tparam Derived Must be registered with BLACK_DECLARE_TUPLE_CONVERSION. + * \tparam Derived Must be registered with SWIFT_DECLARE_TUPLE_CONVERSION. */ template class HashByMetaClass diff --git a/src/misc/mixin/mixinindex.h b/src/misc/mixin/mixinindex.h index c154acc915..d520f31f47 100644 --- a/src/misc/mixin/mixinindex.h +++ b/src/misc/mixin/mixinindex.h @@ -144,7 +144,7 @@ namespace swift::misc * the derived class uses this macro to disambiguate the inherited members. */ // *INDENT-OFF* -#define SWIFT_MISC_DECLARE_USING_MIXIN_INDEX(DERIVED) \ +#define SWIFT_MISC_DECLARE_USING_MIXIN_INDEX(DERIVED) \ using ::swift::misc::mixin::Index::apply; \ using ::swift::misc::mixin::Index::setPropertyByIndex; \ using ::swift::misc::mixin::Index::propertyByIndex; \ diff --git a/src/misc/mixin/mixinjson.h b/src/misc/mixin/mixinjson.h index 90a45d48c2..75742ba6fa 100644 --- a/src/misc/mixin/mixinjson.h +++ b/src/misc/mixin/mixinjson.h @@ -266,7 +266,7 @@ namespace swift::misc * When a derived class and a base class both inherit from mixin::JsonByTuple, * the derived class uses this macro to disambiguate the inherited members. */ -#define SWIFT_MISC_DECLARE_USING_MIXIN_JSON(DERIVED) \ +#define SWIFT_MISC_DECLARE_USING_MIXIN_JSON(DERIVED) \ using ::swift::misc::mixin::JsonByMetaClass::toJson; \ using ::swift::misc::mixin::JsonByMetaClass::convertFromJson; } // Mixin ns diff --git a/src/misc/mixin/mixinmetatype.h b/src/misc/mixin/mixinmetatype.h index c1abee0e5c..e70e658d47 100644 --- a/src/misc/mixin/mixinmetatype.h +++ b/src/misc/mixin/mixinmetatype.h @@ -103,7 +103,7 @@ namespace swift::misc * When a derived class and a base class both inherit from mixin::MetaType, * the derived class uses this macro to disambiguate the inherited members. */ -#define SWIFT_MISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \ +#define SWIFT_MISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \ using ::swift::misc::mixin::MetaType::registerMetadata; \ using ::swift::misc::mixin::MetaType::getMetaTypeId; \ using ::swift::misc::mixin::MetaType::getClassName; \ diff --git a/src/misc/mixin/mixinstring.h b/src/misc/mixin/mixinstring.h index 6a9eaf8825..3d1424093f 100644 --- a/src/misc/mixin/mixinstring.h +++ b/src/misc/mixin/mixinstring.h @@ -105,7 +105,7 @@ namespace swift::misc::mixin * When a derived class and a base class both inherit from mixin::String, * the derived class uses this macro to disambiguate the inherited members. */ -#define SWIFT_MISC_DECLARE_USING_MIXIN_STRING(DERIVED) \ +#define SWIFT_MISC_DECLARE_USING_MIXIN_STRING(DERIVED) \ using ::swift::misc::mixin::String::toQString; \ using ::swift::misc::mixin::String::toStdString; \ using ::swift::misc::mixin::String::stringForStreaming; diff --git a/src/misc/namevariantpair.cpp b/src/misc/namevariantpair.cpp index 6a5f8b1252..ab9c2a7f05 100644 --- a/src/misc/namevariantpair.cpp +++ b/src/misc/namevariantpair.cpp @@ -4,7 +4,7 @@ #include "misc/namevariantpair.h" #include "misc/propertyindexvariantmap.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CNameVariantPair) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CNameVariantPair) namespace swift::misc { diff --git a/src/misc/namevariantpair.h b/src/misc/namevariantpair.h index 8d163112ce..c1568c3960 100644 --- a/src/misc/namevariantpair.h +++ b/src/misc/namevariantpair.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CNameVariantPair) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CNameVariantPair) namespace swift::misc { @@ -70,12 +70,11 @@ namespace swift::misc CVariant m_variant; CIcon m_icon; //!< optional icon - BLACK_METACLASS( + SWIFT_METACLASS( CNameVariantPair, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(variant), - BLACK_METAMEMBER(icon) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(variant), + SWIFT_METAMEMBER(icon)); }; } // namespace diff --git a/src/misc/namevariantpairlist.cpp b/src/misc/namevariantpairlist.cpp index 531ca89dc9..80a6272d65 100644 --- a/src/misc/namevariantpairlist.cpp +++ b/src/misc/namevariantpairlist.cpp @@ -4,7 +4,7 @@ #include "misc/namevariantpairlist.h" #include "misc/range.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CNameVariantPair, CNameVariantPairList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CNameVariantPair, CNameVariantPairList) namespace swift::misc { diff --git a/src/misc/namevariantpairlist.h b/src/misc/namevariantpairlist.h index 9f72e59973..5b7c8cc503 100644 --- a/src/misc/namevariantpairlist.h +++ b/src/misc/namevariantpairlist.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CNameVariantPair, CNameVariantPairList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CNameVariantPair, CNameVariantPairList) namespace swift::misc { diff --git a/src/misc/network/authenticateduser.cpp b/src/misc/network/authenticateduser.cpp index 0e029161cf..278aad7ad1 100644 --- a/src/misc/network/authenticateduser.cpp +++ b/src/misc/network/authenticateduser.cpp @@ -10,7 +10,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CAuthenticatedUser) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CAuthenticatedUser) namespace swift::misc::network { diff --git a/src/misc/network/authenticateduser.h b/src/misc/network/authenticateduser.h index 91529e2071..c9ad65c675 100644 --- a/src/misc/network/authenticateduser.h +++ b/src/misc/network/authenticateduser.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CAuthenticatedUser) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CAuthenticatedUser) namespace swift::misc::network { @@ -172,19 +172,18 @@ namespace swift::misc::network bool m_authenticated = false; CRoleList m_roles; - BLACK_METACLASS( + SWIFT_METACLASS( CAuthenticatedUser, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(vatsimId), - BLACK_METAMEMBER(realname), - BLACK_METAMEMBER(username), - BLACK_METAMEMBER(email), - BLACK_METAMEMBER(password), - BLACK_METAMEMBER(country), - BLACK_METAMEMBER(enabled), - BLACK_METAMEMBER(authenticated), - BLACK_METAMEMBER(roles) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(vatsimId), + SWIFT_METAMEMBER(realname), + SWIFT_METAMEMBER(username), + SWIFT_METAMEMBER(email), + SWIFT_METAMEMBER(password), + SWIFT_METAMEMBER(country), + SWIFT_METAMEMBER(enabled), + SWIFT_METAMEMBER(authenticated), + SWIFT_METAMEMBER(roles)); }; } // namespace diff --git a/src/misc/network/client.cpp b/src/misc/network/client.cpp index 62a16b609c..fec471c912 100644 --- a/src/misc/network/client.cpp +++ b/src/misc/network/client.cpp @@ -12,7 +12,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CClient) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CClient) namespace swift::misc::network { diff --git a/src/misc/network/client.h b/src/misc/network/client.h index a232029f00..ed26535444 100644 --- a/src/misc/network/client.h +++ b/src/misc/network/client.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CClient) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CClient) namespace swift::misc::network { @@ -157,15 +157,14 @@ namespace swift::misc::network QString m_server; CVoiceCapabilities m_voiceCapabilities; - BLACK_METACLASS( + SWIFT_METACLASS( CClient, - BLACK_METAMEMBER(user), - BLACK_METAMEMBER(swift), - BLACK_METAMEMBER(modelString), - BLACK_METAMEMBER(capabilities), - BLACK_METAMEMBER(server), - BLACK_METAMEMBER(voiceCapabilities) - ); + SWIFT_METAMEMBER(user), + SWIFT_METAMEMBER(swift), + SWIFT_METAMEMBER(modelString), + SWIFT_METAMEMBER(capabilities), + SWIFT_METAMEMBER(server), + SWIFT_METAMEMBER(voiceCapabilities)); }; } // namespace diff --git a/src/misc/network/clientlist.cpp b/src/misc/network/clientlist.cpp index 009c897504..5e5661615a 100644 --- a/src/misc/network/clientlist.cpp +++ b/src/misc/network/clientlist.cpp @@ -5,7 +5,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CClient, CClientList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CClient, CClientList) namespace swift::misc::network { diff --git a/src/misc/network/clientlist.h b/src/misc/network/clientlist.h index bd6ca01862..be87a5bfad 100644 --- a/src/misc/network/clientlist.h +++ b/src/misc/network/clientlist.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CClient, CClientList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CClient, CClientList) namespace swift::misc::network { diff --git a/src/misc/network/connectionstatus.cpp b/src/misc/network/connectionstatus.cpp index b28bb1750c..26b137da94 100644 --- a/src/misc/network/connectionstatus.cpp +++ b/src/misc/network/connectionstatus.cpp @@ -3,7 +3,7 @@ #include "misc/network/connectionstatus.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CConnectionStatus) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CConnectionStatus) namespace swift::misc::network { diff --git a/src/misc/network/connectionstatus.h b/src/misc/network/connectionstatus.h index d5021997cf..6be8790b37 100644 --- a/src/misc/network/connectionstatus.h +++ b/src/misc/network/connectionstatus.h @@ -8,7 +8,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CConnectionStatus) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CConnectionStatus) namespace swift::misc::network { @@ -51,10 +51,9 @@ namespace swift::misc::network private: ConnectionStatus m_connectionStatus = Disconnected; - BLACK_METACLASS( + SWIFT_METACLASS( CConnectionStatus, - BLACK_METAMEMBER(connectionStatus) - ); + SWIFT_METAMEMBER(connectionStatus)); }; } // namespace diff --git a/src/misc/network/ecosystem.cpp b/src/misc/network/ecosystem.cpp index 986c1976e8..ef9fac2e6d 100644 --- a/src/misc/network/ecosystem.cpp +++ b/src/misc/network/ecosystem.cpp @@ -6,7 +6,7 @@ #include "misc/verify.h" #include "misc/comparefunctions.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CEcosystem) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CEcosystem) namespace swift::misc::network { diff --git a/src/misc/network/ecosystem.h b/src/misc/network/ecosystem.h index 550ed7e5eb..69b335c7d8 100644 --- a/src/misc/network/ecosystem.h +++ b/src/misc/network/ecosystem.h @@ -11,7 +11,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CEcosystem) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CEcosystem) namespace swift::misc::network { @@ -88,10 +88,9 @@ namespace swift::misc::network private: int m_system = static_cast(Unspecified); - BLACK_METACLASS( + SWIFT_METACLASS( CEcosystem, - BLACK_METAMEMBER(system) - ); + SWIFT_METAMEMBER(system)); }; } // namespace diff --git a/src/misc/network/ecosystemlist.cpp b/src/misc/network/ecosystemlist.cpp index abe5a1a338..b3f1827a4a 100644 --- a/src/misc/network/ecosystemlist.cpp +++ b/src/misc/network/ecosystemlist.cpp @@ -3,7 +3,7 @@ #include "misc/network/ecosystemlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CEcosystem, CEcosystemList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CEcosystem, CEcosystemList) namespace swift::misc::network { diff --git a/src/misc/network/ecosystemlist.h b/src/misc/network/ecosystemlist.h index b0e2a1557b..96fb2e1bf9 100644 --- a/src/misc/network/ecosystemlist.h +++ b/src/misc/network/ecosystemlist.h @@ -12,7 +12,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CEcosystem, CEcosystemList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CEcosystem, CEcosystemList) namespace swift::misc::network { diff --git a/src/misc/network/facilitytype.cpp b/src/misc/network/facilitytype.cpp index 4fb1a09b98..21ca46965d 100644 --- a/src/misc/network/facilitytype.cpp +++ b/src/misc/network/facilitytype.cpp @@ -3,7 +3,7 @@ #include "misc/network/facilitytype.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CFacilityType) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CFacilityType) namespace swift::misc::network { diff --git a/src/misc/network/facilitytype.h b/src/misc/network/facilitytype.h index 163e0aa4f6..8c345a1d97 100644 --- a/src/misc/network/facilitytype.h +++ b/src/misc/network/facilitytype.h @@ -8,7 +8,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CFacilityType) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CFacilityType) namespace swift::misc::network { @@ -47,10 +47,9 @@ namespace swift::misc::network private: FacilityType m_facilityType = Unknown; - BLACK_METACLASS( + SWIFT_METACLASS( CFacilityType, - BLACK_METAMEMBER(facilityType) - ); + SWIFT_METAMEMBER(facilityType)); }; } // namespace diff --git a/src/misc/network/fsdsetup.cpp b/src/misc/network/fsdsetup.cpp index 00678f1579..02cd2aa258 100644 --- a/src/misc/network/fsdsetup.cpp +++ b/src/misc/network/fsdsetup.cpp @@ -13,7 +13,7 @@ using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CFsdSetup) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CFsdSetup) namespace swift::misc::network { diff --git a/src/misc/network/fsdsetup.h b/src/misc/network/fsdsetup.h index 5be00bed0e..59d19bd4da 100644 --- a/src/misc/network/fsdsetup.h +++ b/src/misc/network/fsdsetup.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CFsdSetup) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CFsdSetup) namespace swift::misc::network { @@ -137,11 +137,10 @@ namespace swift::misc::network QString m_textCodec = "latin1"; int m_sendReceive = static_cast(All); - BLACK_METACLASS( + SWIFT_METACLASS( CFsdSetup, - BLACK_METAMEMBER(textCodec), - BLACK_METAMEMBER(sendReceive) - ); + SWIFT_METAMEMBER(textCodec), + SWIFT_METAMEMBER(sendReceive)); }; } // namespace diff --git a/src/misc/network/loginmode.cpp b/src/misc/network/loginmode.cpp index 2f7e850ead..af6fabb378 100644 --- a/src/misc/network/loginmode.cpp +++ b/src/misc/network/loginmode.cpp @@ -3,7 +3,7 @@ #include "misc/network/loginmode.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CLoginMode) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CLoginMode) namespace swift::misc::network { diff --git a/src/misc/network/loginmode.h b/src/misc/network/loginmode.h index 5b627958a8..3b96a36ce8 100644 --- a/src/misc/network/loginmode.h +++ b/src/misc/network/loginmode.h @@ -8,7 +8,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CLoginMode) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CLoginMode) namespace swift::misc::network { @@ -47,10 +47,9 @@ namespace swift::misc::network private: LoginMode m_loginMode = Pilot; - BLACK_METACLASS( + SWIFT_METACLASS( CLoginMode, - BLACK_METAMEMBER(loginMode) - ); + SWIFT_METAMEMBER(loginMode)); }; } // namespace diff --git a/src/misc/network/rawfsdmessage.cpp b/src/misc/network/rawfsdmessage.cpp index 96a8c8cea7..8f46793036 100644 --- a/src/misc/network/rawfsdmessage.cpp +++ b/src/misc/network/rawfsdmessage.cpp @@ -10,7 +10,7 @@ using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRawFsdMessage) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRawFsdMessage) namespace swift::misc::network { diff --git a/src/misc/network/rawfsdmessage.h b/src/misc/network/rawfsdmessage.h index 08081e1fe0..f7449fd85e 100644 --- a/src/misc/network/rawfsdmessage.h +++ b/src/misc/network/rawfsdmessage.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRawFsdMessage) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRawFsdMessage) namespace swift::misc::network { @@ -64,11 +64,10 @@ namespace swift::misc::network private: QString m_rawMessage; - BLACK_METACLASS( + SWIFT_METACLASS( CRawFsdMessage, - BLACK_METAMEMBER(rawMessage), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(rawMessage), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // namespace diff --git a/src/misc/network/rawfsdmessagelist.cpp b/src/misc/network/rawfsdmessagelist.cpp index 6698581c40..d28d746d09 100644 --- a/src/misc/network/rawfsdmessagelist.cpp +++ b/src/misc/network/rawfsdmessagelist.cpp @@ -3,7 +3,7 @@ #include "misc/network/rawfsdmessagelist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRawFsdMessage, CRawFsdMessageList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRawFsdMessage, CRawFsdMessageList) namespace swift::misc::network { diff --git a/src/misc/network/rawfsdmessagelist.h b/src/misc/network/rawfsdmessagelist.h index 6e52630f74..c91da5d5e9 100644 --- a/src/misc/network/rawfsdmessagelist.h +++ b/src/misc/network/rawfsdmessagelist.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRawFsdMessage, CRawFsdMessageList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRawFsdMessage, CRawFsdMessageList) namespace swift::misc::network { diff --git a/src/misc/network/remotefile.cpp b/src/misc/network/remotefile.cpp index bb6f9633c1..e8eec54ca4 100644 --- a/src/misc/network/remotefile.cpp +++ b/src/misc/network/remotefile.cpp @@ -6,7 +6,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRemoteFile) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRemoteFile) namespace swift::misc::network { diff --git a/src/misc/network/remotefile.h b/src/misc/network/remotefile.h index ef1fece666..cf69f92c23 100644 --- a/src/misc/network/remotefile.h +++ b/src/misc/network/remotefile.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRemoteFile) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRemoteFile) namespace swift::misc::network { @@ -128,15 +128,14 @@ namespace swift::misc::network qint64 m_size = 0; qint64 m_created = 0; - BLACK_METACLASS( + SWIFT_METACLASS( CRemoteFile, - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(url), - BLACK_METAMEMBER(size), - BLACK_METAMEMBER(created) - ); + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(url), + SWIFT_METAMEMBER(size), + SWIFT_METAMEMBER(created)); }; } // ns diff --git a/src/misc/network/remotefilelist.cpp b/src/misc/network/remotefilelist.cpp index 5e4eb5dfa7..40a9bc59b7 100644 --- a/src/misc/network/remotefilelist.cpp +++ b/src/misc/network/remotefilelist.cpp @@ -7,7 +7,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRemoteFile, CRemoteFileList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRemoteFile, CRemoteFileList) namespace swift::misc::network { diff --git a/src/misc/network/remotefilelist.h b/src/misc/network/remotefilelist.h index 26d63808da..925ce333e7 100644 --- a/src/misc/network/remotefilelist.h +++ b/src/misc/network/remotefilelist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRemoteFile, CRemoteFileList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRemoteFile, CRemoteFileList) namespace swift::misc::network { diff --git a/src/misc/network/role.cpp b/src/misc/network/role.cpp index 6b31a874c9..f4e2f6a838 100644 --- a/src/misc/network/role.cpp +++ b/src/misc/network/role.cpp @@ -6,7 +6,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRole) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CRole) namespace swift::misc::network { diff --git a/src/misc/network/role.h b/src/misc/network/role.h index f8d07deda1..8feb203bd8 100644 --- a/src/misc/network/role.h +++ b/src/misc/network/role.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRole) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CRole) namespace swift::misc::network { @@ -68,12 +68,11 @@ namespace swift::misc::network QString m_name; QString m_description; - BLACK_METACLASS( + SWIFT_METACLASS( CRole, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(description) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(description)); }; } // ns diff --git a/src/misc/network/rolelist.cpp b/src/misc/network/rolelist.cpp index efba85ee85..50db342537 100644 --- a/src/misc/network/rolelist.cpp +++ b/src/misc/network/rolelist.cpp @@ -6,7 +6,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRole, CRoleList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRole, CRoleList) namespace swift::misc::network { diff --git a/src/misc/network/rolelist.h b/src/misc/network/rolelist.h index 3115d3a8ff..750ceb5711 100644 --- a/src/misc/network/rolelist.h +++ b/src/misc/network/rolelist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRole, CRoleList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CRole, CRoleList) namespace swift::misc::network { diff --git a/src/misc/network/server.cpp b/src/misc/network/server.cpp index acdf34d07e..e05dc71cef 100644 --- a/src/misc/network/server.cpp +++ b/src/misc/network/server.cpp @@ -14,7 +14,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CServer) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CServer) namespace swift::misc::network { diff --git a/src/misc/network/server.h b/src/misc/network/server.h index c5811c0ba4..f3e51801c8 100644 --- a/src/misc/network/server.h +++ b/src/misc/network/server.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CServer) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CServer) namespace swift::misc::network { @@ -216,19 +216,18 @@ namespace swift::misc::network bool m_isAcceptingConnections = true; //!< disable server for connections CFsdSetup m_fsdSetup; - BLACK_METACLASS( + SWIFT_METACLASS( CServer, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(address), - BLACK_METAMEMBER(port), - BLACK_METAMEMBER(user), - BLACK_METAMEMBER(fsdSetup), - BLACK_METAMEMBER(ecosystem), - BLACK_METAMEMBER(serverType), - BLACK_METAMEMBER(isAcceptingConnections), - BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(address), + SWIFT_METAMEMBER(port), + SWIFT_METAMEMBER(user), + SWIFT_METAMEMBER(fsdSetup), + SWIFT_METAMEMBER(ecosystem), + SWIFT_METAMEMBER(serverType), + SWIFT_METAMEMBER(isAcceptingConnections), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison)); }; } // namespace diff --git a/src/misc/network/serverlist.cpp b/src/misc/network/serverlist.cpp index 2f78fa5f0e..0c50575b58 100644 --- a/src/misc/network/serverlist.cpp +++ b/src/misc/network/serverlist.cpp @@ -3,7 +3,7 @@ #include "misc/network/serverlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CServer, CServerList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CServer, CServerList) namespace swift::misc::network { diff --git a/src/misc/network/serverlist.h b/src/misc/network/serverlist.h index e1020b8459..ace3366c47 100644 --- a/src/misc/network/serverlist.h +++ b/src/misc/network/serverlist.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CServer, CServerList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CServer, CServerList) namespace swift::misc::network { diff --git a/src/misc/network/textmessage.cpp b/src/misc/network/textmessage.cpp index 750096844d..a5a055d3cb 100644 --- a/src/misc/network/textmessage.cpp +++ b/src/misc/network/textmessage.cpp @@ -16,7 +16,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CTextMessage) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CTextMessage) namespace swift::misc::network { diff --git a/src/misc/network/textmessage.h b/src/misc/network/textmessage.h index 0b56d817d4..1def383f6d 100644 --- a/src/misc/network/textmessage.h +++ b/src/misc/network/textmessage.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CTextMessage) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CTextMessage) namespace swift::misc::network { @@ -201,14 +201,13 @@ namespace swift::misc::network bool m_wasSent = false; //!< transient bool m_relayedMessage = false; //!< transient - BLACK_METACLASS( + SWIFT_METACLASS( CTextMessage, - BLACK_METAMEMBER(message), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(senderCallsign), - BLACK_METAMEMBER(recipientCallsign), - BLACK_METAMEMBER(frequency) - ); + SWIFT_METAMEMBER(message), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(senderCallsign), + SWIFT_METAMEMBER(recipientCallsign), + SWIFT_METAMEMBER(frequency)); }; } // namespace diff --git a/src/misc/network/textmessagelist.cpp b/src/misc/network/textmessagelist.cpp index ca6695115c..40b0eb7efe 100644 --- a/src/misc/network/textmessagelist.cpp +++ b/src/misc/network/textmessagelist.cpp @@ -10,7 +10,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CTextMessage, CTextMessageList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CTextMessage, CTextMessageList) namespace swift::misc::network { diff --git a/src/misc/network/textmessagelist.h b/src/misc/network/textmessagelist.h index 7a0ed22620..de1dc0b366 100644 --- a/src/misc/network/textmessagelist.h +++ b/src/misc/network/textmessagelist.h @@ -17,7 +17,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CTextMessage, CTextMessageList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CTextMessage, CTextMessageList) namespace swift::misc::network { diff --git a/src/misc/network/url.cpp b/src/misc/network/url.cpp index e97380b9d0..58afba5c7b 100644 --- a/src/misc/network/url.cpp +++ b/src/misc/network/url.cpp @@ -9,7 +9,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUrl) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUrl) namespace swift::misc::network { diff --git a/src/misc/network/url.h b/src/misc/network/url.h index 0961aad897..15e2a8dfd2 100644 --- a/src/misc/network/url.h +++ b/src/misc/network/url.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUrl) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUrl) namespace swift::misc::network { @@ -203,15 +203,14 @@ namespace swift::misc::network static QString stripQueryString(const QString &query); - BLACK_METACLASS( + SWIFT_METACLASS( CUrl, - BLACK_METAMEMBER(scheme), - BLACK_METAMEMBER(host), - BLACK_METAMEMBER(port), - BLACK_METAMEMBER(path), - BLACK_METAMEMBER(query), - BLACK_METAMEMBER(fragment) - ); + SWIFT_METAMEMBER(scheme), + SWIFT_METAMEMBER(host), + SWIFT_METAMEMBER(port), + SWIFT_METAMEMBER(path), + SWIFT_METAMEMBER(query), + SWIFT_METAMEMBER(fragment)); }; } // namespace diff --git a/src/misc/network/urllog.cpp b/src/misc/network/urllog.cpp index 538f550c2d..758d18c419 100644 --- a/src/misc/network/urllog.cpp +++ b/src/misc/network/urllog.cpp @@ -11,7 +11,7 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUrlLog) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUrlLog) namespace swift::misc::network { diff --git a/src/misc/network/urllog.h b/src/misc/network/urllog.h index 60508f3c85..5adc3143aa 100644 --- a/src/misc/network/urllog.h +++ b/src/misc/network/urllog.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUrlLog) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUrlLog) namespace swift::misc::network { @@ -87,14 +87,13 @@ namespace swift::misc::network //! \threadsafe static int uniqueId(); - BLACK_METACLASS( + SWIFT_METACLASS( CUrlLog, - BLACK_METAMEMBER(id), - BLACK_METAMEMBER(url), - BLACK_METAMEMBER(success), - BLACK_METAMEMBER(responseTimeMSecsSinceEpoch), - BLACK_METAMEMBER(responseTimeMs) - ); + SWIFT_METAMEMBER(id), + SWIFT_METAMEMBER(url), + SWIFT_METAMEMBER(success), + SWIFT_METAMEMBER(responseTimeMSecsSinceEpoch), + SWIFT_METAMEMBER(responseTimeMs)); }; } // namespace diff --git a/src/misc/network/urlloglist.cpp b/src/misc/network/urlloglist.cpp index 9944d500a9..20ab4c44e0 100644 --- a/src/misc/network/urlloglist.cpp +++ b/src/misc/network/urlloglist.cpp @@ -3,7 +3,7 @@ #include "misc/network/urlloglist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUrlLog, CUrlLogList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUrlLog, CUrlLogList) namespace swift::misc::network { diff --git a/src/misc/network/urlloglist.h b/src/misc/network/urlloglist.h index 4f8a63e54a..d017093829 100644 --- a/src/misc/network/urlloglist.h +++ b/src/misc/network/urlloglist.h @@ -12,7 +12,7 @@ #include "misc/sequence.h" #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CUrlLog, CUrlLogList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CUrlLog, CUrlLogList) namespace swift::misc::network { diff --git a/src/misc/network/user.cpp b/src/misc/network/user.cpp index 3a34b7956e..0fe02273b8 100644 --- a/src/misc/network/user.cpp +++ b/src/misc/network/user.cpp @@ -19,7 +19,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUser) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CUser) namespace swift::misc::network { diff --git a/src/misc/network/user.h b/src/misc/network/user.h index 09a82d8988..005171ab10 100644 --- a/src/misc/network/user.h +++ b/src/misc/network/user.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUser) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CUser) namespace swift::misc::network { @@ -179,15 +179,14 @@ namespace swift::misc::network aviation::CCallsign m_callsign; aviation::CAirportIcaoCode m_homebase; - BLACK_METACLASS( + SWIFT_METACLASS( CUser, - BLACK_METAMEMBER(id), - BLACK_METAMEMBER(realname), - BLACK_METAMEMBER(email), - BLACK_METAMEMBER(password), - BLACK_METAMEMBER(callsign), - BLACK_METAMEMBER(homebase) - ); + SWIFT_METAMEMBER(id), + SWIFT_METAMEMBER(realname), + SWIFT_METAMEMBER(email), + SWIFT_METAMEMBER(password), + SWIFT_METAMEMBER(callsign), + SWIFT_METAMEMBER(homebase)); }; } // namespace diff --git a/src/misc/network/userlist.cpp b/src/misc/network/userlist.cpp index e7e77fda05..83c66de426 100644 --- a/src/misc/network/userlist.cpp +++ b/src/misc/network/userlist.cpp @@ -3,7 +3,7 @@ #include "misc/network/userlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUser, CUserList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUser, CUserList) namespace swift::misc::network { diff --git a/src/misc/network/userlist.h b/src/misc/network/userlist.h index 657c65642c..6c71e51f1b 100644 --- a/src/misc/network/userlist.h +++ b/src/misc/network/userlist.h @@ -13,7 +13,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CUser, CUserList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::network, CUser, CUserList) namespace swift::misc::network { diff --git a/src/misc/network/voicecapabilities.cpp b/src/misc/network/voicecapabilities.cpp index 41c3c3e150..7c461661d7 100644 --- a/src/misc/network/voicecapabilities.cpp +++ b/src/misc/network/voicecapabilities.cpp @@ -10,7 +10,7 @@ using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CVoiceCapabilities) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CVoiceCapabilities) namespace swift::misc::network { diff --git a/src/misc/network/voicecapabilities.h b/src/misc/network/voicecapabilities.h index 44547d8143..c2998a1401 100644 --- a/src/misc/network/voicecapabilities.h +++ b/src/misc/network/voicecapabilities.h @@ -8,7 +8,7 @@ #include "misc/swiftmiscexport.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CVoiceCapabilities) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::network, CVoiceCapabilities) namespace swift::misc::network { @@ -70,10 +70,9 @@ namespace swift::misc::network //! Capabilites from flight plans remarks such as "/V/" void setFromFlightPlanRemarks(const QString &flightPlanRemarks); - BLACK_METACLASS( + SWIFT_METACLASS( CVoiceCapabilities, - BLACK_METAMEMBER(voiceCapabilities) - ); + SWIFT_METAMEMBER(voiceCapabilities)); }; } // namespace diff --git a/src/misc/pixmap.cpp b/src/misc/pixmap.cpp index 345e18d59d..2c13a4a9b9 100644 --- a/src/misc/pixmap.cpp +++ b/src/misc/pixmap.cpp @@ -10,7 +10,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CPixmap) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CPixmap) namespace swift::misc { diff --git a/src/misc/pixmap.h b/src/misc/pixmap.h index ec6a07f469..fc8bdd58ce 100644 --- a/src/misc/pixmap.h +++ b/src/misc/pixmap.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CPixmap) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CPixmap) namespace swift::misc { @@ -65,10 +65,9 @@ namespace swift::misc mutable bool m_hasCachedPixmap = false; //!< pixmap? Mutable because of lazy initialization mutable QReadWriteLock m_lock; //!< lock (because of mutable members) - BLACK_METACLASS( + SWIFT_METACLASS( CPixmap, - BLACK_METAMEMBER(array) - ); + SWIFT_METAMEMBER(array)); }; } // namespace diff --git a/src/misc/platform.cpp b/src/misc/platform.cpp index baa2758c67..8787b8a864 100644 --- a/src/misc/platform.cpp +++ b/src/misc/platform.cpp @@ -11,7 +11,7 @@ using namespace swift::config; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CPlatform) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CPlatform) namespace swift::misc { diff --git a/src/misc/platform.h b/src/misc/platform.h index ff11e9ad7c..c5b02754af 100644 --- a/src/misc/platform.h +++ b/src/misc/platform.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CPlatform) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CPlatform) namespace swift::misc { @@ -144,10 +144,9 @@ namespace swift::misc private: int m_platform = static_cast(UnknownOs); //!< platform - BLACK_METACLASS( + SWIFT_METACLASS( CPlatform, - BLACK_METAMEMBER(platform) - ); + SWIFT_METAMEMBER(platform)); }; } // namespace diff --git a/src/misc/platformset.cpp b/src/misc/platformset.cpp index 566e5a8893..75519be6eb 100644 --- a/src/misc/platformset.cpp +++ b/src/misc/platformset.cpp @@ -9,7 +9,7 @@ #include #include -BLACK_DEFINE_COLLECTION_MIXINS(swift::misc, CPlatform, CPlatformSet) +SWIFT_DEFINE_COLLECTION_MIXINS(swift::misc, CPlatform, CPlatformSet) namespace swift::misc { diff --git a/src/misc/platformset.h b/src/misc/platformset.h index 20b71a0c79..da9a105aff 100644 --- a/src/misc/platformset.h +++ b/src/misc/platformset.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_COLLECTION_MIXINS(swift::misc, CPlatform, CPlatformSet) +SWIFT_DECLARE_COLLECTION_MIXINS(swift::misc, CPlatform, CPlatformSet) namespace swift::misc { diff --git a/src/misc/pq/physicalquantity.cpp b/src/misc/pq/physicalquantity.cpp index bad642a9c6..6177f88c93 100644 --- a/src/misc/pq/physicalquantity.cpp +++ b/src/misc/pq/physicalquantity.cpp @@ -28,15 +28,15 @@ #include #include -BLACK_DEFINE_PQ_MIXINS(CAngleUnit, CAngle) -BLACK_DEFINE_PQ_MIXINS(CLengthUnit, CLength) -BLACK_DEFINE_PQ_MIXINS(CPressureUnit, CPressure) -BLACK_DEFINE_PQ_MIXINS(CFrequencyUnit, CFrequency) -BLACK_DEFINE_PQ_MIXINS(CMassUnit, CMass) -BLACK_DEFINE_PQ_MIXINS(CTemperatureUnit, CTemperature) -BLACK_DEFINE_PQ_MIXINS(CSpeedUnit, CSpeed) -BLACK_DEFINE_PQ_MIXINS(CTimeUnit, CTime) -BLACK_DEFINE_PQ_MIXINS(CAccelerationUnit, CAcceleration) +SWIFT_DEFINE_PQ_MIXINS(CAngleUnit, CAngle) +SWIFT_DEFINE_PQ_MIXINS(CLengthUnit, CLength) +SWIFT_DEFINE_PQ_MIXINS(CPressureUnit, CPressure) +SWIFT_DEFINE_PQ_MIXINS(CFrequencyUnit, CFrequency) +SWIFT_DEFINE_PQ_MIXINS(CMassUnit, CMass) +SWIFT_DEFINE_PQ_MIXINS(CTemperatureUnit, CTemperature) +SWIFT_DEFINE_PQ_MIXINS(CSpeedUnit, CSpeed) +SWIFT_DEFINE_PQ_MIXINS(CTimeUnit, CTime) +SWIFT_DEFINE_PQ_MIXINS(CAccelerationUnit, CAcceleration) namespace swift::misc::physical_quantities { diff --git a/src/misc/pq/physicalquantity.h b/src/misc/pq/physicalquantity.h index cc77fce722..6184280fd9 100644 --- a/src/misc/pq/physicalquantity.h +++ b/src/misc/pq/physicalquantity.h @@ -29,7 +29,7 @@ namespace swift::misc::physical_quantities } //! \cond -#define BLACK_TEMPLATE_PQ_MIXINS(MU, PQ, Extern, Export) \ +#define SWIFT_TEMPLATE_PQ_MIXINS(MU, PQ, Extern, Export) \ namespace swift::misc::physical_quantities \ { \ class PQ; \ @@ -41,7 +41,7 @@ namespace swift::misc::physical_quantities } \ namespace swift::misc::mixin \ { \ - Extern template class Export DBusOperators>; \ + Extern template class Export DBusOperators>; \ Extern template class Export DataStreamOperators>; \ Extern template class Export JsonOperators>; \ Extern template class Export Index; \ @@ -52,35 +52,35 @@ namespace swift::misc::physical_quantities //! \endcond /*! - * \def BLACK_DECLARE_PQ_MIXINS + * \def SWIFT_DECLARE_PQ_MIXINS * Explicit template declaration of mixins for a CPhysicalQuantity subclass * to be placed near the top of the header that defines the class */ /*! - * \def BLACK_DEFINE_PQ_MIXINS + * \def SWIFT_DEFINE_PQ_MIXINS * Explicit template definition of mixins for a CPhysicalQuantity subclass */ #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_DECLARE_PQ_MIXINS(MU, PQ) -# define BLACK_DEFINE_PQ_MIXINS(MU, PQ) +# define SWIFT_DECLARE_PQ_MIXINS(MU, PQ) +# define SWIFT_DEFINE_PQ_MIXINS(MU, PQ) #elif defined(Q_OS_WIN) && defined(Q_CC_CLANG) -# define BLACK_DECLARE_PQ_MIXINS(MU, PQ) BLACK_TEMPLATE_PQ_MIXINS(MU, PQ, extern, ) -# define BLACK_DEFINE_PQ_MIXINS(MU, PQ) BLACK_TEMPLATE_PQ_MIXINS(MU, PQ, , SWIFT_MISC_EXPORT) +# define SWIFT_DECLARE_PQ_MIXINS(MU, PQ) SWIFT_TEMPLATE_PQ_MIXINS(MU, PQ, extern, ) +# define SWIFT_DEFINE_PQ_MIXINS(MU, PQ) SWIFT_TEMPLATE_PQ_MIXINS(MU, PQ, , SWIFT_MISC_EXPORT) #else -# define BLACK_DECLARE_PQ_MIXINS(MU, PQ) BLACK_TEMPLATE_PQ_MIXINS(MU, PQ, extern, ) -# define BLACK_DEFINE_PQ_MIXINS(MU, PQ) BLACK_TEMPLATE_PQ_MIXINS(MU, PQ, , ) +# define SWIFT_DECLARE_PQ_MIXINS(MU, PQ) SWIFT_TEMPLATE_PQ_MIXINS(MU, PQ, extern, ) +# define SWIFT_DEFINE_PQ_MIXINS(MU, PQ) SWIFT_TEMPLATE_PQ_MIXINS(MU, PQ, , ) #endif -BLACK_DECLARE_PQ_MIXINS(CAngleUnit, CAngle) -BLACK_DECLARE_PQ_MIXINS(CLengthUnit, CLength) -BLACK_DECLARE_PQ_MIXINS(CPressureUnit, CPressure) -BLACK_DECLARE_PQ_MIXINS(CFrequencyUnit, CFrequency) -BLACK_DECLARE_PQ_MIXINS(CMassUnit, CMass) -BLACK_DECLARE_PQ_MIXINS(CTemperatureUnit, CTemperature) -BLACK_DECLARE_PQ_MIXINS(CSpeedUnit, CSpeed) -BLACK_DECLARE_PQ_MIXINS(CTimeUnit, CTime) -BLACK_DECLARE_PQ_MIXINS(CAccelerationUnit, CAcceleration) +SWIFT_DECLARE_PQ_MIXINS(CAngleUnit, CAngle) +SWIFT_DECLARE_PQ_MIXINS(CLengthUnit, CLength) +SWIFT_DECLARE_PQ_MIXINS(CPressureUnit, CPressure) +SWIFT_DECLARE_PQ_MIXINS(CFrequencyUnit, CFrequency) +SWIFT_DECLARE_PQ_MIXINS(CMassUnit, CMass) +SWIFT_DECLARE_PQ_MIXINS(CTemperatureUnit, CTemperature) +SWIFT_DECLARE_PQ_MIXINS(CSpeedUnit, CSpeed) +SWIFT_DECLARE_PQ_MIXINS(CTimeUnit, CTime) +SWIFT_DECLARE_PQ_MIXINS(CAccelerationUnit, CAcceleration) namespace swift::misc::physical_quantities { diff --git a/src/misc/pq/pqstring.cpp b/src/misc/pq/pqstring.cpp index 7afb394963..bed6af66ad 100644 --- a/src/misc/pq/pqstring.cpp +++ b/src/misc/pq/pqstring.cpp @@ -18,7 +18,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::physical_quantities, CPqString) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::physical_quantities, CPqString) namespace swift::misc::physical_quantities { diff --git a/src/misc/pq/pqstring.h b/src/misc/pq/pqstring.h index fddf1f6f25..26a6174c7c 100644 --- a/src/misc/pq/pqstring.h +++ b/src/misc/pq/pqstring.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::physical_quantities, CPqString) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::physical_quantities, CPqString) namespace swift::misc::physical_quantities { @@ -72,10 +72,9 @@ namespace swift::misc::physical_quantities private: QString m_string; - BLACK_METACLASS( + SWIFT_METACLASS( CPqString, - BLACK_METAMEMBER(string) - ); + SWIFT_METAMEMBER(string)); }; } // ns diff --git a/src/misc/pq/units.cpp b/src/misc/pq/units.cpp index 62f19a73e9..94ba4f8f6e 100644 --- a/src/misc/pq/units.cpp +++ b/src/misc/pq/units.cpp @@ -6,15 +6,15 @@ #include -BLACK_DEFINE_UNIT_MIXINS(CAngleUnit) -BLACK_DEFINE_UNIT_MIXINS(CLengthUnit) -BLACK_DEFINE_UNIT_MIXINS(CPressureUnit) -BLACK_DEFINE_UNIT_MIXINS(CFrequencyUnit) -BLACK_DEFINE_UNIT_MIXINS(CMassUnit) -BLACK_DEFINE_UNIT_MIXINS(CTemperatureUnit) -BLACK_DEFINE_UNIT_MIXINS(CSpeedUnit) -BLACK_DEFINE_UNIT_MIXINS(CTimeUnit) -BLACK_DEFINE_UNIT_MIXINS(CAccelerationUnit) +SWIFT_DEFINE_UNIT_MIXINS(CAngleUnit) +SWIFT_DEFINE_UNIT_MIXINS(CLengthUnit) +SWIFT_DEFINE_UNIT_MIXINS(CPressureUnit) +SWIFT_DEFINE_UNIT_MIXINS(CFrequencyUnit) +SWIFT_DEFINE_UNIT_MIXINS(CMassUnit) +SWIFT_DEFINE_UNIT_MIXINS(CTemperatureUnit) +SWIFT_DEFINE_UNIT_MIXINS(CSpeedUnit) +SWIFT_DEFINE_UNIT_MIXINS(CTimeUnit) +SWIFT_DEFINE_UNIT_MIXINS(CAccelerationUnit) namespace swift::misc::physical_quantities { diff --git a/src/misc/pq/units.h b/src/misc/pq/units.h index 76d756d2a9..9e51826874 100644 --- a/src/misc/pq/units.h +++ b/src/misc/pq/units.h @@ -24,18 +24,18 @@ #include //! \cond -#define BLACK_TEMPLATE_UNIT_MIXINS(MU, Extern, Export) \ +#define SWIFT_TEMPLATE_UNIT_MIXINS(MU, Extern, Export) \ namespace swift::misc::physical_quantities \ - { \ - class MU; \ - } \ - namespace swift::misc::private_ns \ - { \ + { \ + class MU; \ + } \ + namespace swift::misc::private_ns \ + { \ Extern template struct Export CValueObjectMetaInfo; \ Extern template struct Export MetaTypeHelper; \ - } \ - namespace swift::misc::mixin \ - { \ + } \ + namespace swift::misc::mixin \ + { \ Extern template class Export MetaType; \ Extern template class Export DBusOperators; \ Extern template class Export DataStreamOperators; \ @@ -44,35 +44,35 @@ //! \endcond /*! - * \def BLACK_DECLARE_UNIT_MIXINS + * \def SWIFT_DECLARE_UNIT_MIXINS * Explicit template declaration of mixins for a CMeasurementUnit subclass * to be placed near the top of the header that defines the class */ /*! - * \def BLACK_DEFINE_UNIT_MIXINS + * \def SWIFT_DEFINE_UNIT_MIXINS * Explicit template definition of mixins for a CMeasurementUnit subclass */ #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_DECLARE_UNIT_MIXINS(MU) -# define BLACK_DEFINE_UNIT_MIXINS(MU) +# define SWIFT_DECLARE_UNIT_MIXINS(MU) +# define SWIFT_DEFINE_UNIT_MIXINS(MU) #elif defined(Q_OS_WIN) && defined(Q_CC_CLANG) -# define BLACK_DECLARE_UNIT_MIXINS(MU) BLACK_TEMPLATE_UNIT_MIXINS(MU, extern, ) -# define BLACK_DEFINE_UNIT_MIXINS(MU) BLACK_TEMPLATE_UNIT_MIXINS(MU, , SWIFT_MISC_EXPORT) +# define SWIFT_DECLARE_UNIT_MIXINS(MU) SWIFT_TEMPLATE_UNIT_MIXINS(MU, extern, ) +# define SWIFT_DEFINE_UNIT_MIXINS(MU) SWIFT_TEMPLATE_UNIT_MIXINS(MU, , SWIFT_MISC_EXPORT) #else -# define BLACK_DECLARE_UNIT_MIXINS(MU) BLACK_TEMPLATE_UNIT_MIXINS(MU, extern, ) -# define BLACK_DEFINE_UNIT_MIXINS(MU) BLACK_TEMPLATE_UNIT_MIXINS(MU, , ) +# define SWIFT_DECLARE_UNIT_MIXINS(MU) SWIFT_TEMPLATE_UNIT_MIXINS(MU, extern, ) +# define SWIFT_DEFINE_UNIT_MIXINS(MU) SWIFT_TEMPLATE_UNIT_MIXINS(MU, , ) #endif -BLACK_DECLARE_UNIT_MIXINS(CAngleUnit) -BLACK_DECLARE_UNIT_MIXINS(CLengthUnit) -BLACK_DECLARE_UNIT_MIXINS(CPressureUnit) -BLACK_DECLARE_UNIT_MIXINS(CFrequencyUnit) -BLACK_DECLARE_UNIT_MIXINS(CMassUnit) -BLACK_DECLARE_UNIT_MIXINS(CTemperatureUnit) -BLACK_DECLARE_UNIT_MIXINS(CSpeedUnit) -BLACK_DECLARE_UNIT_MIXINS(CTimeUnit) -BLACK_DECLARE_UNIT_MIXINS(CAccelerationUnit) +SWIFT_DECLARE_UNIT_MIXINS(CAngleUnit) +SWIFT_DECLARE_UNIT_MIXINS(CLengthUnit) +SWIFT_DECLARE_UNIT_MIXINS(CPressureUnit) +SWIFT_DECLARE_UNIT_MIXINS(CFrequencyUnit) +SWIFT_DECLARE_UNIT_MIXINS(CMassUnit) +SWIFT_DECLARE_UNIT_MIXINS(CTemperatureUnit) +SWIFT_DECLARE_UNIT_MIXINS(CSpeedUnit) +SWIFT_DECLARE_UNIT_MIXINS(CTimeUnit) +SWIFT_DECLARE_UNIT_MIXINS(CAccelerationUnit) // // Used with the template for quantities. This is the reason for diff --git a/src/misc/processinfo.cpp b/src/misc/processinfo.cpp index aba36372fe..93e5cfd456 100644 --- a/src/misc/processinfo.cpp +++ b/src/misc/processinfo.cpp @@ -16,7 +16,7 @@ # include #endif -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CProcessInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CProcessInfo) namespace swift::misc { diff --git a/src/misc/processinfo.h b/src/misc/processinfo.h index 93ef9bb56a..e7a77144ea 100644 --- a/src/misc/processinfo.h +++ b/src/misc/processinfo.h @@ -9,7 +9,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CProcessInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CProcessInfo) namespace swift::misc { @@ -52,11 +52,10 @@ namespace swift::misc qint64 m_pid = 0; QString m_name; - BLACK_METACLASS( + SWIFT_METACLASS( CProcessInfo, - BLACK_METAMEMBER(pid), - BLACK_METAMEMBER(name) - ); + SWIFT_METAMEMBER(pid), + SWIFT_METAMEMBER(name)); }; } diff --git a/src/misc/propertyindex.h b/src/misc/propertyindex.h index 1c1b5d06d3..701d2a2721 100644 --- a/src/misc/propertyindex.h +++ b/src/misc/propertyindex.h @@ -157,10 +157,9 @@ namespace swift::misc private: QList m_indexes; - BLACK_METACLASS( + SWIFT_METACLASS( CPropertyIndex, - BLACK_METAMEMBER(indexes) - ); + SWIFT_METAMEMBER(indexes)); }; } // namespace diff --git a/src/misc/propertyindexlist.cpp b/src/misc/propertyindexlist.cpp index ab891ba79a..e0b15ef444 100644 --- a/src/misc/propertyindexlist.cpp +++ b/src/misc/propertyindexlist.cpp @@ -3,7 +3,7 @@ #include "misc/propertyindexlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CPropertyIndex, CPropertyIndexList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CPropertyIndex, CPropertyIndexList) namespace swift::misc { diff --git a/src/misc/propertyindexlist.h b/src/misc/propertyindexlist.h index 3e0a5e5c16..3d4f2f303d 100644 --- a/src/misc/propertyindexlist.h +++ b/src/misc/propertyindexlist.h @@ -12,7 +12,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CPropertyIndex, CPropertyIndexList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CPropertyIndex, CPropertyIndexList) namespace swift::misc { diff --git a/src/misc/rgbcolor.cpp b/src/misc/rgbcolor.cpp index ad496b915a..2243c718c9 100644 --- a/src/misc/rgbcolor.cpp +++ b/src/misc/rgbcolor.cpp @@ -16,7 +16,7 @@ using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CRgbColor) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CRgbColor) namespace swift::misc { diff --git a/src/misc/rgbcolor.h b/src/misc/rgbcolor.h index e99e05d34e..94d9f161f0 100644 --- a/src/misc/rgbcolor.h +++ b/src/misc/rgbcolor.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CRgbColor) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CRgbColor) namespace swift::misc { @@ -133,12 +133,11 @@ namespace swift::misc static QString intToHex(int h, int digits = 2); - BLACK_METACLASS( + SWIFT_METACLASS( CRgbColor, - BLACK_METAMEMBER(r), - BLACK_METAMEMBER(g), - BLACK_METAMEMBER(b) - ); + SWIFT_METAMEMBER(r), + SWIFT_METAMEMBER(g), + SWIFT_METAMEMBER(b)); }; } // namespace diff --git a/src/misc/sequence.h b/src/misc/sequence.h index 4611bb0649..10f96f507d 100644 --- a/src/misc/sequence.h +++ b/src/misc/sequence.h @@ -18,7 +18,7 @@ #include //! \cond -#define BLACK_TEMPLATE_SEQUENCE_MIXINS(NS, T, List, Extern) \ +#define SWIFT_TEMPLATE_SEQUENCE_MIXINS(NS, T, List, Extern) \ namespace NS \ { \ class List; \ @@ -30,7 +30,7 @@ Extern template struct MetaTypeHelper; \ Extern template struct MetaTypeHelper>; \ } \ - namespace swift::misc::mixin \ + namespace swift::misc::mixin \ { \ Extern template class MetaType; \ Extern template class MetaType>; \ @@ -43,21 +43,21 @@ //! \endcond /*! - * \def BLACK_DECLARE_SEQUENCE_MIXINS + * \def SWIFT_DECLARE_SEQUENCE_MIXINS * Explicit template declaration of mixins for a CSequence subclass * to be placed near the top of the header that defines the class */ /*! - * \def BLACK_DEFINE_SEQUENCE_MIXINS + * \def SWIFT_DEFINE_SEQUENCE_MIXINS * Explicit template definition of mixins for a CSequence subclass */ #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_DECLARE_SEQUENCE_MIXINS(Namespace, T, List) -# define BLACK_DEFINE_SEQUENCE_MIXINS(Namespace, T, List) +# define SWIFT_DECLARE_SEQUENCE_MIXINS(Namespace, T, List) +# define SWIFT_DEFINE_SEQUENCE_MIXINS(Namespace, T, List) #else -# define BLACK_DECLARE_SEQUENCE_MIXINS(Namespace, T, List) BLACK_TEMPLATE_SEQUENCE_MIXINS(Namespace, T, List, extern) -# define BLACK_DEFINE_SEQUENCE_MIXINS(Namespace, T, List) BLACK_TEMPLATE_SEQUENCE_MIXINS(Namespace, T, List, ) +# define SWIFT_DECLARE_SEQUENCE_MIXINS(Namespace, T, List) SWIFT_TEMPLATE_SEQUENCE_MIXINS(Namespace, T, List, extern) +# define SWIFT_DEFINE_SEQUENCE_MIXINS(Namespace, T, List) SWIFT_TEMPLATE_SEQUENCE_MIXINS(Namespace, T, List, ) #endif namespace swift::misc diff --git a/src/misc/sharedstate/datalink.h b/src/misc/sharedstate/datalink.h index 76577fbb20..5e319d7a61 100644 --- a/src/misc/sharedstate/datalink.h +++ b/src/misc/sharedstate/datalink.h @@ -22,7 +22,7 @@ * Put this macro in the private section of a class to set the channel of its child endpoints. * \ingroup shared_state */ -#define BLACK_SHARED_STATE_CHANNEL(ID) Q_CLASSINFO("SharedStateChannel", ID) +#define SWIFT_SHARED_STATE_CHANNEL(ID) Q_CLASSINFO("SharedStateChannel", ID) namespace swift::misc::shared_state { diff --git a/src/misc/sharedstate/passiveobserver.cpp b/src/misc/sharedstate/passiveobserver.cpp index 98a6842634..4d4857584b 100644 --- a/src/misc/sharedstate/passiveobserver.cpp +++ b/src/misc/sharedstate/passiveobserver.cpp @@ -5,7 +5,7 @@ #include "misc/sharedstate/passiveobserver.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::shared_state, CAnyMatch) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::shared_state, CAnyMatch) namespace swift::misc::shared_state { diff --git a/src/misc/sharedstate/passiveobserver.h b/src/misc/sharedstate/passiveobserver.h index 24df71c396..de5144e30e 100644 --- a/src/misc/sharedstate/passiveobserver.h +++ b/src/misc/sharedstate/passiveobserver.h @@ -12,7 +12,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::shared_state, CAnyMatch) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::shared_state, CAnyMatch) namespace swift::misc::shared_state { @@ -80,7 +80,7 @@ namespace swift::misc::shared_state private: int m_dummy = 0; - BLACK_METACLASS(CAnyMatch, BLACK_METAMEMBER(dummy)); + SWIFT_METACLASS(CAnyMatch, SWIFT_METAMEMBER(dummy)); }; } diff --git a/src/misc/simulation/aircraftmatchersetup.cpp b/src/misc/simulation/aircraftmatchersetup.cpp index 34a81cd133..1406d2e973 100644 --- a/src/misc/simulation/aircraftmatchersetup.cpp +++ b/src/misc/simulation/aircraftmatchersetup.cpp @@ -5,7 +5,7 @@ #include "misc/stringutils.h" #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAircraftMatcherSetup) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAircraftMatcherSetup) namespace swift::misc::simulation { diff --git a/src/misc/simulation/aircraftmatchersetup.h b/src/misc/simulation/aircraftmatchersetup.h index a74519cabe..56002fa8ec 100644 --- a/src/misc/simulation/aircraftmatchersetup.h +++ b/src/misc/simulation/aircraftmatchersetup.h @@ -8,7 +8,7 @@ #include "misc/valueobject.h" #include "misc/swiftmiscexport.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CAircraftMatcherSetup) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CAircraftMatcherSetup) namespace swift::misc::simulation { @@ -276,17 +276,16 @@ namespace swift::misc::simulation bool m_msReverseEnabled = false; //!< enable network matching script bool m_msMatchingEnabled = false; //!< enable matching stage matching script - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftMatcherSetup, - BLACK_METAMEMBER(algorithm), - BLACK_METAMEMBER(mode), - BLACK_METAMEMBER(strategy), - BLACK_METAMEMBER(force), - BLACK_METAMEMBER(msReverseLookupFile), - BLACK_METAMEMBER(msMatchingStageFile), - BLACK_METAMEMBER(msReverseEnabled), - BLACK_METAMEMBER(msMatchingEnabled) - ); + SWIFT_METAMEMBER(algorithm), + SWIFT_METAMEMBER(mode), + SWIFT_METAMEMBER(strategy), + SWIFT_METAMEMBER(force), + SWIFT_METAMEMBER(msReverseLookupFile), + SWIFT_METAMEMBER(msMatchingStageFile), + SWIFT_METAMEMBER(msReverseEnabled), + SWIFT_METAMEMBER(msMatchingEnabled)); }; } // namespace diff --git a/src/misc/simulation/aircraftmodel.cpp b/src/misc/simulation/aircraftmodel.cpp index e1cb3a9139..76b6f8ff86 100644 --- a/src/misc/simulation/aircraftmodel.cpp +++ b/src/misc/simulation/aircraftmodel.cpp @@ -27,7 +27,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; using namespace swift::misc::db; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAircraftModel) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAircraftModel) namespace swift::misc::simulation { diff --git a/src/misc/simulation/aircraftmodel.h b/src/misc/simulation/aircraftmodel.h index 6d9257f867..d5c35fa694 100644 --- a/src/misc/simulation/aircraftmodel.h +++ b/src/misc/simulation/aircraftmodel.h @@ -35,7 +35,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CAircraftModel) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CAircraftModel) namespace swift::misc { @@ -569,28 +569,27 @@ namespace swift::misc ModelMode m_modelMode = Include; //!< model mode (include / exclude) physical_quantities::CLength m_cg = physical_quantities::CLength::null(); //!< center of gravity - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftModel, - BLACK_METAMEMBER(dbKey), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(order), - BLACK_METAMEMBER(callsign), - BLACK_METAMEMBER(aircraftIcao), - BLACK_METAMEMBER(livery), - BLACK_METAMEMBER(simulator), - BLACK_METAMEMBER(distributor), - BLACK_METAMEMBER(cg), - BLACK_METAMEMBER(supportedParts), - BLACK_METAMEMBER(modelString, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(modelStringAlias, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(description, 0, DisabledForComparison), - BLACK_METAMEMBER(fileName, 0, DisabledForComparison), - BLACK_METAMEMBER(iconFile, 0, DisabledForComparison), - BLACK_METAMEMBER(fileTimestamp, 0, DisabledForComparison), - BLACK_METAMEMBER(modelType), - BLACK_METAMEMBER(modelMode) - ); + SWIFT_METAMEMBER(dbKey), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(order), + SWIFT_METAMEMBER(callsign), + SWIFT_METAMEMBER(aircraftIcao), + SWIFT_METAMEMBER(livery), + SWIFT_METAMEMBER(simulator), + SWIFT_METAMEMBER(distributor), + SWIFT_METAMEMBER(cg), + SWIFT_METAMEMBER(supportedParts), + SWIFT_METAMEMBER(modelString, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(modelStringAlias, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(description, 0, DisabledForComparison), + SWIFT_METAMEMBER(fileName, 0, DisabledForComparison), + SWIFT_METAMEMBER(iconFile, 0, DisabledForComparison), + SWIFT_METAMEMBER(fileTimestamp, 0, DisabledForComparison), + SWIFT_METAMEMBER(modelType), + SWIFT_METAMEMBER(modelMode)); }; } // namespace } // namespace diff --git a/src/misc/simulation/aircraftmodellist.cpp b/src/misc/simulation/aircraftmodellist.cpp index 09eec66978..ca6b89c9a3 100644 --- a/src/misc/simulation/aircraftmodellist.cpp +++ b/src/misc/simulation/aircraftmodellist.cpp @@ -30,7 +30,7 @@ using namespace swift::misc::math; using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CAircraftModel, CAircraftModelList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CAircraftModel, CAircraftModelList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/aircraftmodellist.h b/src/misc/simulation/aircraftmodellist.h index 280dfe5117..f87e218953 100644 --- a/src/misc/simulation/aircraftmodellist.h +++ b/src/misc/simulation/aircraftmodellist.h @@ -32,7 +32,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::Simulation, CAircraftModel, CAircraftModelList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::Simulation, CAircraftModel, CAircraftModelList) namespace swift::misc { diff --git a/src/misc/simulation/airspaceaircraftsnapshot.cpp b/src/misc/simulation/airspaceaircraftsnapshot.cpp index 33b5edeb4e..d02640f88a 100644 --- a/src/misc/simulation/airspaceaircraftsnapshot.cpp +++ b/src/misc/simulation/airspaceaircraftsnapshot.cpp @@ -11,7 +11,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAirspaceAircraftSnapshot) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAirspaceAircraftSnapshot) namespace swift::misc::simulation { diff --git a/src/misc/simulation/airspaceaircraftsnapshot.h b/src/misc/simulation/airspaceaircraftsnapshot.h index 93c4442b25..c923370a25 100644 --- a/src/misc/simulation/airspaceaircraftsnapshot.h +++ b/src/misc/simulation/airspaceaircraftsnapshot.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAirspaceAircraftSnapshot) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAirspaceAircraftSnapshot) namespace swift::misc::simulation { @@ -101,15 +101,14 @@ namespace swift::misc::simulation swift::misc::aviation::CCallsignSet m_vtolAircraftCallsignsByDistance; swift::misc::aviation::CCallsignSet m_enabledVtolAircraftCallsignsByDistance; - BLACK_METACLASS( + SWIFT_METACLASS( CAirspaceAircraftSnapshot, - BLACK_METAMEMBER(timestampMsSinceEpoch), - BLACK_METAMEMBER(aircraftCallsignsByDistance, 0, DisabledForComparison), - BLACK_METAMEMBER(enabledAircraftCallsignsByDistance, 0, DisabledForComparison), - BLACK_METAMEMBER(disabledAircraftCallsignsByDistance, 0, DisabledForComparison), - BLACK_METAMEMBER(vtolAircraftCallsignsByDistance, 0, DisabledForComparison), - BLACK_METAMEMBER(enabledVtolAircraftCallsignsByDistance, 0, DisabledForComparison) - ); + SWIFT_METAMEMBER(timestampMsSinceEpoch), + SWIFT_METAMEMBER(aircraftCallsignsByDistance, 0, DisabledForComparison), + SWIFT_METAMEMBER(enabledAircraftCallsignsByDistance, 0, DisabledForComparison), + SWIFT_METAMEMBER(disabledAircraftCallsignsByDistance, 0, DisabledForComparison), + SWIFT_METAMEMBER(vtolAircraftCallsignsByDistance, 0, DisabledForComparison), + SWIFT_METAMEMBER(enabledVtolAircraftCallsignsByDistance, 0, DisabledForComparison)); }; } // namespace diff --git a/src/misc/simulation/distributor.cpp b/src/misc/simulation/distributor.cpp index 54cdb9a85e..cf934e280a 100644 --- a/src/misc/simulation/distributor.cpp +++ b/src/misc/simulation/distributor.cpp @@ -11,7 +11,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributor) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributor) namespace swift::misc::simulation { diff --git a/src/misc/simulation/distributor.h b/src/misc/simulation/distributor.h index 629cd24f8f..0512797da8 100644 --- a/src/misc/simulation/distributor.h +++ b/src/misc/simulation/distributor.h @@ -20,7 +20,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributor) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributor) namespace swift::misc::simulation { @@ -140,16 +140,16 @@ namespace swift::misc::simulation //! "Clean up" the keys, like X-CSL => XCSL static QString unifyKeyOrAlias(const QString &value); - BLACK_METACLASS( + SWIFT_METACLASS( CDistributor, - BLACK_METAMEMBER(dbKey, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(loadedFromDb), - BLACK_METAMEMBER(timestampMSecsSinceEpoch), - BLACK_METAMEMBER(order), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(alias1, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(alias2, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(simulator) + SWIFT_METAMEMBER(dbKey, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(loadedFromDb), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch), + SWIFT_METAMEMBER(order), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(alias1, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(alias2, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(simulator) ); }; diff --git a/src/misc/simulation/distributorlist.cpp b/src/misc/simulation/distributorlist.cpp index fb3eab8095..9da0979e89 100644 --- a/src/misc/simulation/distributorlist.cpp +++ b/src/misc/simulation/distributorlist.cpp @@ -7,7 +7,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CDistributor, CDistributorList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CDistributor, CDistributorList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/distributorlist.h b/src/misc/simulation/distributorlist.h index ab677dfeff..58a10d4618 100644 --- a/src/misc/simulation/distributorlist.h +++ b/src/misc/simulation/distributorlist.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CDistributor, CDistributorList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CDistributor, CDistributorList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/distributorlistpreferences.cpp b/src/misc/simulation/distributorlistpreferences.cpp index 99f3383618..2f49f2b357 100644 --- a/src/misc/simulation/distributorlistpreferences.cpp +++ b/src/misc/simulation/distributorlistpreferences.cpp @@ -5,7 +5,7 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributorListPreferences) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributorListPreferences) namespace swift::misc::simulation { diff --git a/src/misc/simulation/distributorlistpreferences.h b/src/misc/simulation/distributorlistpreferences.h index dd0e98a01b..031d239368 100644 --- a/src/misc/simulation/distributorlistpreferences.h +++ b/src/misc/simulation/distributorlistpreferences.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributorListPreferences) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributorListPreferences) namespace swift::misc::simulation { @@ -53,15 +53,14 @@ namespace swift::misc::simulation CDistributorList m_distributorsFG; CSimulatorInfo m_lastUpdatedSimulator; - BLACK_METACLASS( + SWIFT_METACLASS( CDistributorListPreferences, - BLACK_METAMEMBER(distributorsFsx), - BLACK_METAMEMBER(distributorsP3d), - BLACK_METAMEMBER(distributorsFs9), - BLACK_METAMEMBER(distributorsXPlane), - BLACK_METAMEMBER(distributorsFG), - BLACK_METAMEMBER(lastUpdatedSimulator) - ); + SWIFT_METAMEMBER(distributorsFsx), + SWIFT_METAMEMBER(distributorsP3d), + SWIFT_METAMEMBER(distributorsFs9), + SWIFT_METAMEMBER(distributorsXPlane), + SWIFT_METAMEMBER(distributorsFG), + SWIFT_METAMEMBER(lastUpdatedSimulator)); }; } // namespace diff --git a/src/misc/simulation/fscommon/aircraftcfgentries.cpp b/src/misc/simulation/fscommon/aircraftcfgentries.cpp index 4b20967124..c173965c56 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentries.cpp +++ b/src/misc/simulation/fscommon/aircraftcfgentries.cpp @@ -15,7 +15,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/fscommon/aircraftcfgentries.h b/src/misc/simulation/fscommon/aircraftcfgentries.h index 7501764fdf..9865f1988e 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentries.h +++ b/src/misc/simulation/fscommon/aircraftcfgentries.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries) namespace swift::misc::simulation::fscommon { @@ -196,25 +196,24 @@ namespace swift::misc::simulation::fscommon QString m_createdBy; //!< created by, "distributor" bool m_rotorcraft = false; //!< hint if rotorcraft - BLACK_METACLASS( + SWIFT_METACLASS( CAircraftCfgEntries, - BLACK_METAMEMBER(index), - BLACK_METAMEMBER(fileName), - BLACK_METAMEMBER(title), - BLACK_METAMEMBER(atcType), - BLACK_METAMEMBER(atcModel), - BLACK_METAMEMBER(atcParkingCode), - BLACK_METAMEMBER(atcIdColor), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(uiType), - BLACK_METAMEMBER(uiManufacturer), - BLACK_METAMEMBER(uiVariation), - BLACK_METAMEMBER(texture), - BLACK_METAMEMBER(simName), - BLACK_METAMEMBER(createdBy), - BLACK_METAMEMBER(rotorcraft), - BLACK_METAMEMBER(timestampMSecsSinceEpoch) - ); + SWIFT_METAMEMBER(index), + SWIFT_METAMEMBER(fileName), + SWIFT_METAMEMBER(title), + SWIFT_METAMEMBER(atcType), + SWIFT_METAMEMBER(atcModel), + SWIFT_METAMEMBER(atcParkingCode), + SWIFT_METAMEMBER(atcIdColor), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(uiType), + SWIFT_METAMEMBER(uiManufacturer), + SWIFT_METAMEMBER(uiVariation), + SWIFT_METAMEMBER(texture), + SWIFT_METAMEMBER(simName), + SWIFT_METAMEMBER(createdBy), + SWIFT_METAMEMBER(rotorcraft), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch)); }; } // ns diff --git a/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp b/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp index 4faef33222..4acc8914e6 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp +++ b/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp @@ -12,7 +12,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries, CAircraftCfgEntriesList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries, CAircraftCfgEntriesList) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/fscommon/aircraftcfgentrieslist.h b/src/misc/simulation/fscommon/aircraftcfgentrieslist.h index 7a6f9c87dc..b3b2a2206b 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/misc/simulation/fscommon/aircraftcfgentrieslist.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries, CAircraftCfgEntriesList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntries, CAircraftCfgEntriesList) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/fscommon/vpilotmodelrule.cpp b/src/misc/simulation/fscommon/vpilotmodelrule.cpp index 27e2100842..d5ff69412b 100644 --- a/src/misc/simulation/fscommon/vpilotmodelrule.cpp +++ b/src/misc/simulation/fscommon/vpilotmodelrule.cpp @@ -13,7 +13,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::simulation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/fscommon/vpilotmodelrule.h b/src/misc/simulation/fscommon/vpilotmodelrule.h index f4827a48b5..6626d00098 100644 --- a/src/misc/simulation/fscommon/vpilotmodelrule.h +++ b/src/misc/simulation/fscommon/vpilotmodelrule.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule) namespace swift::misc::simulation::fscommon { @@ -88,14 +88,13 @@ namespace swift::misc::simulation::fscommon QString m_callsignPrefix; //!< callsign prefix, aka airline ICAO qint64 m_updatedMsSinceEpoch; //!< updated when - BLACK_METACLASS( + SWIFT_METACLASS( CVPilotModelRule, - BLACK_METAMEMBER(typeCode, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(callsignPrefix, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(modelName, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(folder, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(updatedMsSinceEpoch) - ); + SWIFT_METAMEMBER(typeCode, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(callsignPrefix, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(modelName, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(folder, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(updatedMsSinceEpoch)); }; } // namespace diff --git a/src/misc/simulation/fscommon/vpilotmodelruleset.cpp b/src/misc/simulation/fscommon/vpilotmodelruleset.cpp index 1b778a7551..43a7556ecf 100644 --- a/src/misc/simulation/fscommon/vpilotmodelruleset.cpp +++ b/src/misc/simulation/fscommon/vpilotmodelruleset.cpp @@ -11,7 +11,7 @@ #include #include -BLACK_DEFINE_COLLECTION_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule, CVPilotModelRuleSet) +SWIFT_DEFINE_COLLECTION_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule, CVPilotModelRuleSet) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/fscommon/vpilotmodelruleset.h b/src/misc/simulation/fscommon/vpilotmodelruleset.h index f71c83ae37..aaf4e3c6bd 100644 --- a/src/misc/simulation/fscommon/vpilotmodelruleset.h +++ b/src/misc/simulation/fscommon/vpilotmodelruleset.h @@ -16,7 +16,7 @@ #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/fscommon/vpilotmodelrule.h" -BLACK_DECLARE_COLLECTION_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule, CVPilotModelRuleSet) +SWIFT_DECLARE_COLLECTION_MIXINS(swift::misc::simulation::fscommon, CVPilotModelRule, CVPilotModelRuleSet) namespace swift::misc::simulation::fscommon { diff --git a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp index f2f565203c..0fdf89500d 100644 --- a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp +++ b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp @@ -14,8 +14,8 @@ using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupGlobal) -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupGlobal) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign) namespace swift::misc::simulation { diff --git a/src/misc/simulation/interpolation/interpolationrenderingsetup.h b/src/misc/simulation/interpolation/interpolationrenderingsetup.h index 0eafb168f1..b49bb51f4d 100644 --- a/src/misc/simulation/interpolation/interpolationrenderingsetup.h +++ b/src/misc/simulation/interpolation/interpolationrenderingsetup.h @@ -13,8 +13,8 @@ #include "misc/valueobject.h" #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupGlobal) -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupGlobal) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign) namespace swift::misc { @@ -209,19 +209,18 @@ namespace swift::misc int m_maxRenderedAircraft = InfiniteAircraft(); //!< max.rendered aircraft physical_quantities::CLength m_maxRenderedDistance { 0, nullptr }; //!< max.distance for rendering - BLACK_METACLASS( + SWIFT_METACLASS( CInterpolationAndRenderingSetupGlobal, - BLACK_METAMEMBER(logInterpolation), - BLACK_METAMEMBER(simulatorDebugMessages), - BLACK_METAMEMBER(forceFullInterpolation), - BLACK_METAMEMBER(sendGndToSim), - BLACK_METAMEMBER(enabledAircraftParts), - BLACK_METAMEMBER(fixSceneryOffset), - BLACK_METAMEMBER(interpolatorMode), - BLACK_METAMEMBER(pitchOnGround), - BLACK_METAMEMBER(maxRenderedAircraft), - BLACK_METAMEMBER(maxRenderedDistance) - ); + SWIFT_METAMEMBER(logInterpolation), + SWIFT_METAMEMBER(simulatorDebugMessages), + SWIFT_METAMEMBER(forceFullInterpolation), + SWIFT_METAMEMBER(sendGndToSim), + SWIFT_METAMEMBER(enabledAircraftParts), + SWIFT_METAMEMBER(fixSceneryOffset), + SWIFT_METAMEMBER(interpolatorMode), + SWIFT_METAMEMBER(pitchOnGround), + SWIFT_METAMEMBER(maxRenderedAircraft), + SWIFT_METAMEMBER(maxRenderedDistance)); }; //! Value object for interpolator and rendering per callsign @@ -269,17 +268,16 @@ namespace swift::misc private: aviation::CCallsign m_callsign; - BLACK_METACLASS( + SWIFT_METACLASS( CInterpolationAndRenderingSetupPerCallsign, - BLACK_METAMEMBER(logInterpolation), - BLACK_METAMEMBER(simulatorDebugMessages), - BLACK_METAMEMBER(forceFullInterpolation), - BLACK_METAMEMBER(sendGndToSim), - BLACK_METAMEMBER(enabledAircraftParts), - BLACK_METAMEMBER(fixSceneryOffset), - BLACK_METAMEMBER(interpolatorMode), - BLACK_METAMEMBER(pitchOnGround) - ); + SWIFT_METAMEMBER(logInterpolation), + SWIFT_METAMEMBER(simulatorDebugMessages), + SWIFT_METAMEMBER(forceFullInterpolation), + SWIFT_METAMEMBER(sendGndToSim), + SWIFT_METAMEMBER(enabledAircraftParts), + SWIFT_METAMEMBER(fixSceneryOffset), + SWIFT_METAMEMBER(interpolatorMode), + SWIFT_METAMEMBER(pitchOnGround)); }; } // namespace } // namespace diff --git a/src/misc/simulation/interpolation/interpolationsetuplist.cpp b/src/misc/simulation/interpolation/interpolationsetuplist.cpp index d26d89f4cb..c30281695f 100644 --- a/src/misc/simulation/interpolation/interpolationsetuplist.cpp +++ b/src/misc/simulation/interpolation/interpolationsetuplist.cpp @@ -3,7 +3,7 @@ #include "misc/simulation/interpolation/interpolationsetuplist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/interpolation/interpolationsetuplist.h b/src/misc/simulation/interpolation/interpolationsetuplist.h index b9cf97b4de..6257cf5819 100644 --- a/src/misc/simulation/interpolation/interpolationsetuplist.h +++ b/src/misc/simulation/interpolation/interpolationsetuplist.h @@ -11,7 +11,7 @@ #include "misc/collection.h" #include "misc/sequence.h" -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CInterpolationAndRenderingSetupPerCallsign, CInterpolationSetupList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/matchingstatistics.cpp b/src/misc/simulation/matchingstatistics.cpp index 50dcad5d01..31a12b26b1 100644 --- a/src/misc/simulation/matchingstatistics.cpp +++ b/src/misc/simulation/matchingstatistics.cpp @@ -3,7 +3,7 @@ #include "misc/simulation/matchingstatistics.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry, CMatchingStatistics) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry, CMatchingStatistics) namespace swift::misc::simulation { diff --git a/src/misc/simulation/matchingstatistics.h b/src/misc/simulation/matchingstatistics.h index 445316c772..3d59e5c7e6 100644 --- a/src/misc/simulation/matchingstatistics.h +++ b/src/misc/simulation/matchingstatistics.h @@ -12,7 +12,7 @@ #include "misc/collection.h" #include "misc/mixin/mixinmetatype.h" -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry, CMatchingStatistics) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry, CMatchingStatistics) namespace swift::misc::simulation { diff --git a/src/misc/simulation/matchingstatisticsentry.cpp b/src/misc/simulation/matchingstatisticsentry.cpp index af32eebdf8..573fb575be 100644 --- a/src/misc/simulation/matchingstatisticsentry.cpp +++ b/src/misc/simulation/matchingstatisticsentry.cpp @@ -4,7 +4,7 @@ #include "misc/simulation/matchingstatisticsentry.h" #include "misc/comparefunctions.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry) namespace swift::misc::simulation { diff --git a/src/misc/simulation/matchingstatisticsentry.h b/src/misc/simulation/matchingstatisticsentry.h index 6d470bbf7f..3791203865 100644 --- a/src/misc/simulation/matchingstatisticsentry.h +++ b/src/misc/simulation/matchingstatisticsentry.h @@ -9,7 +9,7 @@ #include "misc/valueobject.h" #include "misc/timestampbased.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CMatchingStatisticsEntry) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CMatchingStatisticsEntry) namespace swift::misc::simulation { @@ -125,16 +125,15 @@ namespace swift::misc::simulation int m_entryType = Missing; //!< type int m_count = 1; //!< quantity - BLACK_METACLASS( + SWIFT_METACLASS( CMatchingStatisticsEntry, - BLACK_METAMEMBER(sessionId), - BLACK_METAMEMBER(modelSetId), - BLACK_METAMEMBER(aircraftDesignator), - BLACK_METAMEMBER(airlineDesignator), - BLACK_METAMEMBER(description), - BLACK_METAMEMBER(entryType), - BLACK_METAMEMBER(count) - ); + SWIFT_METAMEMBER(sessionId), + SWIFT_METAMEMBER(modelSetId), + SWIFT_METAMEMBER(aircraftDesignator), + SWIFT_METAMEMBER(airlineDesignator), + SWIFT_METAMEMBER(description), + SWIFT_METAMEMBER(entryType), + SWIFT_METAMEMBER(count)); }; } // namespace diff --git a/src/misc/simulation/settings/fgswiftbussettings.cpp b/src/misc/simulation/settings/fgswiftbussettings.cpp index 43857eb875..0a92630fef 100644 --- a/src/misc/simulation/settings/fgswiftbussettings.cpp +++ b/src/misc/simulation/settings/fgswiftbussettings.cpp @@ -3,7 +3,7 @@ #include "misc/simulation/settings/fgswiftbussettings.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CFGSwiftBusSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CFGSwiftBusSettings) namespace swift::misc::simulation::settings { diff --git a/src/misc/simulation/settings/fgswiftbussettings.h b/src/misc/simulation/settings/fgswiftbussettings.h index de2e4a59b1..1f6f845f58 100644 --- a/src/misc/simulation/settings/fgswiftbussettings.h +++ b/src/misc/simulation/settings/fgswiftbussettings.h @@ -10,7 +10,7 @@ #include "misc/settingscache.h" #include "misc/valueobject.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CFGSwiftBusSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CFGSwiftBusSettings) namespace swift::misc::simulation::settings { @@ -46,10 +46,9 @@ namespace swift::misc::simulation::settings private: QString m_dBusServerAddress { "tcp:host=127.0.0.1,port=45003" }; //!< DBus server - BLACK_METACLASS( + SWIFT_METACLASS( CFGSwiftBusSettings, - BLACK_METAMEMBER(dBusServerAddress) - ); + SWIFT_METAMEMBER(dBusServerAddress)); }; /*! diff --git a/src/misc/simulation/settings/modelsettings.cpp b/src/misc/simulation/settings/modelsettings.cpp index 0d70d8a78a..3d6dfb4fcd 100644 --- a/src/misc/simulation/settings/modelsettings.cpp +++ b/src/misc/simulation/settings/modelsettings.cpp @@ -4,7 +4,7 @@ #include "misc/simulation/settings/modelsettings.h" #include "misc/stringutils.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CModelSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CModelSettings) namespace swift::misc::simulation::settings { diff --git a/src/misc/simulation/settings/modelsettings.h b/src/misc/simulation/settings/modelsettings.h index 9aefc28544..57f5618127 100644 --- a/src/misc/simulation/settings/modelsettings.h +++ b/src/misc/simulation/settings/modelsettings.h @@ -10,7 +10,7 @@ #include "misc/swiftmiscexport.h" #include "misc/propertyindexref.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CModelSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CModelSettings) namespace swift::misc::simulation::settings { @@ -45,10 +45,9 @@ namespace swift::misc::simulation::settings private: bool m_allowExcludeModels = false; //!< Allow excluded models in sets - BLACK_METACLASS( + SWIFT_METACLASS( CModelSettings, - BLACK_METAMEMBER(allowExcludeModels) - ); + SWIFT_METAMEMBER(allowExcludeModels)); }; //! Trait for simulator settings diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp index 702655ef21..3ee28900e3 100644 --- a/src/misc/simulation/settings/simulatorsettings.cpp +++ b/src/misc/simulation/settings/simulatorsettings.cpp @@ -17,9 +17,9 @@ using namespace swift::misc::simulation::fscommon; using namespace swift::misc::simulation::xplane; using namespace swift::misc::simulation::flightgear; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSimulatorSettings) -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CFsxP3DSettings) -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSimulatorMessagesSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSimulatorSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CFsxP3DSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSimulatorMessagesSettings) namespace swift::misc::simulation::settings { diff --git a/src/misc/simulation/settings/simulatorsettings.h b/src/misc/simulation/settings/simulatorsettings.h index e6fc5ecb3a..85a221a6b3 100644 --- a/src/misc/simulation/settings/simulatorsettings.h +++ b/src/misc/simulation/settings/simulatorsettings.h @@ -18,9 +18,9 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSimulatorSettings) -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CFsxP3DSettings) -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSimulatorMessagesSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSimulatorSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CFsxP3DSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSimulatorMessagesSettings) namespace swift::misc::simulation::settings { @@ -143,16 +143,15 @@ namespace swift::misc::simulation::settings int m_cgSource = static_cast(CGFromSimulatorFirst); //!< CG source physical_quantities::CLength m_recordedGndRadius { 250.0, physical_quantities::CLengthUnit::m() }; - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatorSettings, - BLACK_METAMEMBER(simulatorDirectory), - BLACK_METAMEMBER(modelDirectories), - BLACK_METAMEMBER(excludeDirectoryPatterns), - BLACK_METAMEMBER(comIntegration), - BLACK_METAMEMBER(cgSource), - BLACK_METAMEMBER(recordGnd), - BLACK_METAMEMBER(recordedGndRadius) - ); + SWIFT_METAMEMBER(simulatorDirectory), + SWIFT_METAMEMBER(modelDirectories), + SWIFT_METAMEMBER(excludeDirectoryPatterns), + SWIFT_METAMEMBER(comIntegration), + SWIFT_METAMEMBER(cgSource), + SWIFT_METAMEMBER(recordGnd), + SWIFT_METAMEMBER(recordedGndRadius)); }; //! Some P3D/FSX settings @@ -192,11 +191,10 @@ namespace swift::misc::simulation::settings bool m_useSimulatedObjectAdding = false; //!< COM integration bool m_useSbOffsets = true; //!< use the SB offset - BLACK_METACLASS( + SWIFT_METACLASS( CFsxP3DSettings, - BLACK_METAMEMBER(useSimulatedObjectAdding), - BLACK_METAMEMBER(useSbOffsets) - ); + SWIFT_METAMEMBER(useSimulatedObjectAdding), + SWIFT_METAMEMBER(useSbOffsets)); }; //! Allows to have specific utility functions for each simulator @@ -626,11 +624,10 @@ namespace swift::misc::simulation::settings int m_messageType = static_cast(TextMessagePrivate | TextMessageSupervisor); bool m_relayGloballyEnabled = true; //!< messsage relay enabled to simulator - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatorMessagesSettings, - BLACK_METAMEMBER(technicalLogLevel), - BLACK_METAMEMBER(messageType) - ); + SWIFT_METAMEMBER(technicalLogLevel), + SWIFT_METAMEMBER(messageType)); }; //! Trait for simulator message settings diff --git a/src/misc/simulation/settings/swiftpluginsettings.cpp b/src/misc/simulation/settings/swiftpluginsettings.cpp index 170617e8c2..be2c688f8d 100644 --- a/src/misc/simulation/settings/swiftpluginsettings.cpp +++ b/src/misc/simulation/settings/swiftpluginsettings.cpp @@ -4,7 +4,7 @@ #include "misc/simulation/settings/swiftpluginsettings.h" #include "misc/stringutils.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSwiftPluginSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSwiftPluginSettings) namespace swift::misc::simulation::settings { diff --git a/src/misc/simulation/settings/swiftpluginsettings.h b/src/misc/simulation/settings/swiftpluginsettings.h index 10aa99db57..2d9a738fb4 100644 --- a/src/misc/simulation/settings/swiftpluginsettings.h +++ b/src/misc/simulation/settings/swiftpluginsettings.h @@ -11,7 +11,7 @@ #include "misc/propertyindexref.h" #include "misc/swiftmiscexport.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSwiftPluginSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CSwiftPluginSettings) namespace swift::misc::simulation::settings { @@ -70,12 +70,12 @@ namespace swift::misc::simulation::settings CAircraftModel m_defaultModel; bool m_logFunctionCalls = true; - BLACK_METACLASS( + SWIFT_METACLASS( CSwiftPluginSettings, - BLACK_METAMEMBER(emulatedSimulator), - BLACK_METAMEMBER(ownModel), - BLACK_METAMEMBER(defaultModel), - BLACK_METAMEMBER(logFunctionCalls) + SWIFT_METAMEMBER(emulatedSimulator), + SWIFT_METAMEMBER(ownModel), + SWIFT_METAMEMBER(defaultModel), + SWIFT_METAMEMBER(logFunctionCalls) ); }; diff --git a/src/misc/simulation/settings/xswiftbussettings.cpp b/src/misc/simulation/settings/xswiftbussettings.cpp index 81e8313c9c..e8bb00409a 100644 --- a/src/misc/simulation/settings/xswiftbussettings.cpp +++ b/src/misc/simulation/settings/xswiftbussettings.cpp @@ -4,7 +4,7 @@ #include "misc/simulation/settings/xswiftbussettings.h" #include "misc/simulation/settings/xswiftbussettingsqtfree.inc" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CXSwiftBusSettings) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CXSwiftBusSettings) namespace swift::misc::simulation::settings { diff --git a/src/misc/simulation/settings/xswiftbussettings.h b/src/misc/simulation/settings/xswiftbussettings.h index 76dbd59130..676a67b274 100644 --- a/src/misc/simulation/settings/xswiftbussettings.h +++ b/src/misc/simulation/settings/xswiftbussettings.h @@ -14,7 +14,7 @@ #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CXSwiftBusSettings) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::Settings, CXSwiftBusSettings) namespace swift::misc::simulation::settings { @@ -85,22 +85,21 @@ namespace swift::misc::simulation::settings virtual void objectUpdated() override final; private: - BLACK_METACLASS( + SWIFT_METACLASS( CXSwiftBusSettings, - BLACK_METAMEMBER(dBusServerAddress), - BLACK_METAMEMBER(msgBox), - BLACK_METAMEMBER(nightTextureMode), - BLACK_METAMEMBER(maxPlanes), - BLACK_METAMEMBER(drawingLabels), - BLACK_METAMEMBER(labelColor), - BLACK_METAMEMBER(bundleTaxiLandingLights), - BLACK_METAMEMBER(maxDrawDistanceNM), - BLACK_METAMEMBER(followAircraftDistanceM), - BLACK_METAMEMBER(logRenderPhases), - BLACK_METAMEMBER(tcasEnabled), - BLACK_METAMEMBER(terrainProbeEnabled), - BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForComparison | DisabledForHashing) - ); + SWIFT_METAMEMBER(dBusServerAddress), + SWIFT_METAMEMBER(msgBox), + SWIFT_METAMEMBER(nightTextureMode), + SWIFT_METAMEMBER(maxPlanes), + SWIFT_METAMEMBER(drawingLabels), + SWIFT_METAMEMBER(labelColor), + SWIFT_METAMEMBER(bundleTaxiLandingLights), + SWIFT_METAMEMBER(maxDrawDistanceNM), + SWIFT_METAMEMBER(followAircraftDistanceM), + SWIFT_METAMEMBER(logRenderPhases), + SWIFT_METAMEMBER(tcasEnabled), + SWIFT_METAMEMBER(terrainProbeEnabled), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForComparison | DisabledForHashing)); }; /*! diff --git a/src/misc/simulation/simulatedaircraft.cpp b/src/misc/simulation/simulatedaircraft.cpp index b9b01f8546..89cca75e2d 100644 --- a/src/misc/simulation/simulatedaircraft.cpp +++ b/src/misc/simulation/simulatedaircraft.cpp @@ -16,7 +16,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatedAircraft) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatedAircraft) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatedaircraft.h b/src/misc/simulation/simulatedaircraft.h index 6128525c2b..005ac9cd3e 100644 --- a/src/misc/simulation/simulatedaircraft.h +++ b/src/misc/simulation/simulatedaircraft.h @@ -33,7 +33,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatedAircraft) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatedAircraft) namespace swift::misc { @@ -477,25 +477,24 @@ namespace swift::misc //! Init, which synchronizes some denormalized values void init(); - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatedAircraft, - BLACK_METAMEMBER(callsign), - BLACK_METAMEMBER(pilot), - BLACK_METAMEMBER(situation), - BLACK_METAMEMBER(com1system), - BLACK_METAMEMBER(com2system), - BLACK_METAMEMBER(transponder), - BLACK_METAMEMBER(parts), - BLACK_METAMEMBER(selcal), - BLACK_METAMEMBER(models), - BLACK_METAMEMBER(enabled), - BLACK_METAMEMBER(rendered), - BLACK_METAMEMBER(partsSynchronized), - BLACK_METAMEMBER(fastPositionUpdates), + SWIFT_METAMEMBER(callsign), + SWIFT_METAMEMBER(pilot), + SWIFT_METAMEMBER(situation), + SWIFT_METAMEMBER(com1system), + SWIFT_METAMEMBER(com2system), + SWIFT_METAMEMBER(transponder), + SWIFT_METAMEMBER(parts), + SWIFT_METAMEMBER(selcal), + SWIFT_METAMEMBER(models), + SWIFT_METAMEMBER(enabled), + SWIFT_METAMEMBER(rendered), + SWIFT_METAMEMBER(partsSynchronized), + SWIFT_METAMEMBER(fastPositionUpdates), // ICoordinateWithRelativePosition - BLACK_METAMEMBER(relativeDistance), - BLACK_METAMEMBER(relativeBearing) - ); + SWIFT_METAMEMBER(relativeDistance), + SWIFT_METAMEMBER(relativeBearing)); }; } // namespace } // namespace diff --git a/src/misc/simulation/simulatedaircraftlist.cpp b/src/misc/simulation/simulatedaircraftlist.cpp index 7febc35098..0c64165bcb 100644 --- a/src/misc/simulation/simulatedaircraftlist.cpp +++ b/src/misc/simulation/simulatedaircraftlist.cpp @@ -19,7 +19,7 @@ using namespace swift::misc::geo; using namespace swift::misc::physical_quantities; using namespace swift::misc::network; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatedAircraft, CSimulatedAircraftList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatedAircraft, CSimulatedAircraftList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatedaircraftlist.h b/src/misc/simulation/simulatedaircraftlist.h index 798e970f5e..47f4127810 100644 --- a/src/misc/simulation/simulatedaircraftlist.h +++ b/src/misc/simulation/simulatedaircraftlist.h @@ -15,7 +15,7 @@ #include "misc/sequence.h" #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatedAircraft, CSimulatedAircraftList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatedAircraft, CSimulatedAircraftList) namespace swift::misc { diff --git a/src/misc/simulation/simulatorinfo.cpp b/src/misc/simulation/simulatorinfo.cpp index c186ba03df..b9f5cd1e02 100644 --- a/src/misc/simulation/simulatorinfo.cpp +++ b/src/misc/simulation/simulatorinfo.cpp @@ -21,7 +21,7 @@ using namespace swift::misc::db; using namespace swift::misc::simulation::fscommon; using namespace swift::misc::simulation::xplane; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInfo) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorinfo.h b/src/misc/simulation/simulatorinfo.h index da273abdc7..a0bba9e1e8 100644 --- a/src/misc/simulation/simulatorinfo.h +++ b/src/misc/simulation/simulatorinfo.h @@ -20,7 +20,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CSimulatorInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::Simulation, CSimulatorInfo) namespace swift::misc::simulation { @@ -229,10 +229,9 @@ namespace swift::misc::simulation private: int m_simulator = static_cast(None); - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatorInfo, - BLACK_METAMEMBER(simulator) - ); + SWIFT_METAMEMBER(simulator)); }; //! Count per simulator, small utility class allows to retrieve values as per simulator diff --git a/src/misc/simulation/simulatorinfolist.cpp b/src/misc/simulation/simulatorinfolist.cpp index 67ea9e0894..ff780eb84a 100644 --- a/src/misc/simulation/simulatorinfolist.cpp +++ b/src/misc/simulation/simulatorinfolist.cpp @@ -6,7 +6,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorInfo, CSimulatorInfoList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorInfo, CSimulatorInfoList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorinfolist.h b/src/misc/simulation/simulatorinfolist.h index d6a378e630..3cc8aad4dd 100644 --- a/src/misc/simulation/simulatorinfolist.h +++ b/src/misc/simulation/simulatorinfolist.h @@ -12,7 +12,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::Simulation, CSimulatorInfo, CSimulatorPluginInfoList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::Simulation, CSimulatorInfo, CSimulatorPluginInfoList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorinternals.cpp b/src/misc/simulation/simulatorinternals.cpp index 6b004cd053..552e7b02c2 100644 --- a/src/misc/simulation/simulatorinternals.cpp +++ b/src/misc/simulation/simulatorinternals.cpp @@ -7,7 +7,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInternals) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInternals) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorinternals.h b/src/misc/simulation/simulatorinternals.h index f94d3b40f0..427fec32f8 100644 --- a/src/misc/simulation/simulatorinternals.h +++ b/src/misc/simulation/simulatorinternals.h @@ -18,7 +18,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInternals) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInternals) namespace swift::misc::simulation { @@ -96,10 +96,9 @@ namespace swift::misc::simulation private: swift::misc::CNameVariantPairList m_data; - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatorInternals, - BLACK_METAMEMBER(data) - ); + SWIFT_METAMEMBER(data)); }; } // namespace diff --git a/src/misc/simulation/simulatorplugininfo.cpp b/src/misc/simulation/simulatorplugininfo.cpp index 8e3e293462..1f3352160b 100644 --- a/src/misc/simulation/simulatorplugininfo.cpp +++ b/src/misc/simulation/simulatorplugininfo.cpp @@ -9,7 +9,7 @@ using namespace swift::config; using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorPluginInfo) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorPluginInfo) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorplugininfo.h b/src/misc/simulation/simulatorplugininfo.h index 703b3300fd..306d01b969 100644 --- a/src/misc/simulation/simulatorplugininfo.h +++ b/src/misc/simulation/simulatorplugininfo.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorPluginInfo) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorPluginInfo) namespace swift::misc::simulation { @@ -102,15 +102,14 @@ namespace swift::misc::simulation CSimulatorInfo m_info; bool m_valid { false }; - BLACK_METACLASS( + SWIFT_METACLASS( CSimulatorPluginInfo, - BLACK_METAMEMBER(identifier, 0, CaseInsensitiveComparison), - BLACK_METAMEMBER(name, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(simulator, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(description, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(info, 0, DisabledForComparison | DisabledForHashing), - BLACK_METAMEMBER(valid, 0, DisabledForComparison | DisabledForHashing) - ); + SWIFT_METAMEMBER(identifier, 0, CaseInsensitiveComparison), + SWIFT_METAMEMBER(name, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(simulator, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(description, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(info, 0, DisabledForComparison | DisabledForHashing), + SWIFT_METAMEMBER(valid, 0, DisabledForComparison | DisabledForHashing)); }; } // ns diff --git a/src/misc/simulation/simulatorplugininfolist.cpp b/src/misc/simulation/simulatorplugininfolist.cpp index ae6505e688..2c591ea2cf 100644 --- a/src/misc/simulation/simulatorplugininfolist.cpp +++ b/src/misc/simulation/simulatorplugininfolist.cpp @@ -7,7 +7,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorPluginInfo, CSimulatorPluginInfoList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorPluginInfo, CSimulatorPluginInfoList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/simulatorplugininfolist.h b/src/misc/simulation/simulatorplugininfolist.h index 7c94f91b97..29d6f12dd6 100644 --- a/src/misc/simulation/simulatorplugininfolist.h +++ b/src/misc/simulation/simulatorplugininfolist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorPluginInfo, CSimulatorPluginInfoList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorPluginInfo, CSimulatorPluginInfoList) namespace swift::misc::simulation { diff --git a/src/misc/simulation/xplane/navdatareference.cpp b/src/misc/simulation/xplane/navdatareference.cpp index 1915ebed0f..cf963461d2 100644 --- a/src/misc/simulation/xplane/navdatareference.cpp +++ b/src/misc/simulation/xplane/navdatareference.cpp @@ -7,8 +7,8 @@ #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::xplane, CNavDataReference) -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::xplane, CNavDataReference, CNavDataReferenceList) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::xplane, CNavDataReference) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::xplane, CNavDataReference, CNavDataReferenceList) namespace swift::misc::simulation::xplane { diff --git a/src/misc/simulation/xplane/navdatareference.h b/src/misc/simulation/xplane/navdatareference.h index 1d46e21937..d7888f67f1 100644 --- a/src/misc/simulation/xplane/navdatareference.h +++ b/src/misc/simulation/xplane/navdatareference.h @@ -23,8 +23,8 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::XPlane, CNavDataReference) -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation::XPlane, CNavDataReference, CNavDataReferenceList) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::simulation::XPlane, CNavDataReference) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::simulation::XPlane, CNavDataReference, CNavDataReferenceList) namespace swift::misc::simulation::xplane { @@ -65,11 +65,10 @@ namespace swift::misc::simulation::xplane int m_id = 0; geo::CCoordinateGeodetic m_position; - BLACK_METACLASS( + SWIFT_METACLASS( CNavDataReference, - BLACK_METAMEMBER(id), - BLACK_METAMEMBER(position) - ); + SWIFT_METAMEMBER(id), + SWIFT_METAMEMBER(position)); }; /*! diff --git a/src/misc/statusmessage.cpp b/src/misc/statusmessage.cpp index 58d87332d6..e05b583583 100644 --- a/src/misc/statusmessage.cpp +++ b/src/misc/statusmessage.cpp @@ -12,7 +12,7 @@ #include #include -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CStatusMessage) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc, CStatusMessage) namespace swift::misc { diff --git a/src/misc/statusmessage.h b/src/misc/statusmessage.h index 42647ddf44..fd5f035309 100644 --- a/src/misc/statusmessage.h +++ b/src/misc/statusmessage.h @@ -17,7 +17,7 @@ #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CStatusMessage) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc, CStatusMessage) namespace swift::misc { @@ -607,15 +607,14 @@ namespace swift::misc mutable QReadWriteLock m_lock; //!< lock (because of mutable member) //! \fixme KB 2019-01 order and timestamp "disabled" for Ref T184 token bucket. Would it be better to enable those and use a special comparison function for that (e.g. "equalMessageAndSeverity")? - BLACK_METACLASS( + SWIFT_METACLASS( CStatusMessage, - BLACK_METAMEMBER(categories), - BLACK_METAMEMBER(severity), - BLACK_METAMEMBER(message), - BLACK_METAMEMBER(args), - BLACK_METAMEMBER(order, 0, DisabledForHashing | DisabledForComparison), - BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForHashing | DisabledForComparison) - ); + SWIFT_METAMEMBER(categories), + SWIFT_METAMEMBER(severity), + SWIFT_METAMEMBER(message), + SWIFT_METAMEMBER(args), + SWIFT_METAMEMBER(order, 0, DisabledForHashing | DisabledForComparison), + SWIFT_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForHashing | DisabledForComparison)); }; // CContainerBase methods implemented out-of-line to avoid circular include diff --git a/src/misc/statusmessagelist.cpp b/src/misc/statusmessagelist.cpp index 66a01e4ac2..f02c53ee59 100644 --- a/src/misc/statusmessagelist.cpp +++ b/src/misc/statusmessagelist.cpp @@ -11,7 +11,7 @@ #include #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CStatusMessage, CStatusMessageList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CStatusMessage, CStatusMessageList) namespace swift::misc { diff --git a/src/misc/statusmessagelist.h b/src/misc/statusmessagelist.h index 2a487239cc..e036162cda 100644 --- a/src/misc/statusmessagelist.h +++ b/src/misc/statusmessagelist.h @@ -19,7 +19,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CStatusMessage, CStatusMessageList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CStatusMessage, CStatusMessageList) namespace swift::misc { diff --git a/src/misc/valuecache.h b/src/misc/valuecache.h index 95e976f228..0fa26a4721 100644 --- a/src/misc/valuecache.h +++ b/src/misc/valuecache.h @@ -139,11 +139,10 @@ namespace swift::misc bool m_saved = false; bool m_valuesChanged = true; - BLACK_METACLASS( + SWIFT_METACLASS( CValueCachePacket, - BLACK_METAMEMBER(saved), - BLACK_METAMEMBER(valuesChanged) - ); + SWIFT_METAMEMBER(saved), + SWIFT_METAMEMBER(valuesChanged)); }; /*! diff --git a/src/misc/valueobject.h b/src/misc/valueobject.h index ffb5328d2f..2ea99ab5e0 100644 --- a/src/misc/valueobject.h +++ b/src/misc/valueobject.h @@ -30,7 +30,7 @@ #include //! \cond -#define BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, Extern) \ +#define SWIFT_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, Extern) \ namespace Namespace \ { \ class Class; \ @@ -57,21 +57,21 @@ //! \endcond /*! - * \def BLACK_DECLARE_VALUEOBJECT_MIXINS + * \def SWIFT_DECLARE_VALUEOBJECT_MIXINS * Explicit template declaration of mixins for a CValueObject subclass * to be placed near the top of the header that defines the class */ /*! - * \def BLACK_DEFINE_VALUEOBJECT_MIXINS + * \def SWIFT_DEFINE_VALUEOBJECT_MIXINS * Explicit template definition of mixins for a CValueObject subclass */ #if defined(Q_OS_WIN) && defined(Q_CC_GNU) -# define BLACK_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class) -# define BLACK_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class) +# define SWIFT_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class) +# define SWIFT_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class) #else -# define BLACK_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class) BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, extern) -# define BLACK_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class) BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, ) +# define SWIFT_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class) SWIFT_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, extern) +# define SWIFT_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class) SWIFT_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, ) #endif namespace swift::misc diff --git a/src/misc/variantlist.cpp b/src/misc/variantlist.cpp index 6f1ab3ff18..72e5ff75d2 100644 --- a/src/misc/variantlist.cpp +++ b/src/misc/variantlist.cpp @@ -4,7 +4,7 @@ #include "misc/variantlist.h" #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc, CVariant, CVariantList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CVariant, CVariantList) namespace swift::misc { diff --git a/src/misc/variantlist.h b/src/misc/variantlist.h index ab075e61fa..ff920582e6 100644 --- a/src/misc/variantlist.h +++ b/src/misc/variantlist.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc, CVariant, CVariantList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc, CVariant, CVariantList) namespace swift::misc { diff --git a/src/misc/verify.cpp b/src/misc/verify.cpp index d9fefeafe8..5cbb76161f 100644 --- a/src/misc/verify.cpp +++ b/src/misc/verify.cpp @@ -7,7 +7,7 @@ #include #include -#ifdef BLACK_USE_CRASHPAD +#ifdef SWIFT_USE_CRASHPAD # include "crashpad/client/simulate_crash.h" #endif @@ -18,9 +18,9 @@ #if defined(Q_CC_CLANG) # if __has_builtin(__builtin_debugtrap) -# define BLACK_BUILTIN_DEBUGTRAP __builtin_debugtrap +# define SWIFT_BUILTIN_DEBUGTRAP __builtin_debugtrap # elif __has_builtin(__builtin_debugger) -# define BLACK_BUILTIN_DEBUGTRAP __builtin_debugger +# define SWIFT_BUILTIN_DEBUGTRAP __builtin_debugger # endif #endif @@ -43,8 +43,8 @@ namespace swift::misc::private_ns __debugbreak(); return; } -# elif defined(BLACK_BUILTIN_DEBUGTRAP) - BLACK_BUILTIN_DEBUGTRAP(); +# elif defined(SWIFT_BUILTIN_DEBUGTRAP) + SWIFT_BUILTIN_DEBUGTRAP(); # elif defined(Q_PROCESSOR_X86) __asm__ volatile("int $0x03"); # elif defined(Q_PROCESSOR_ARM) @@ -67,7 +67,7 @@ namespace swift::misc::private_ns log = QStringLiteral("Failed to verify: %1 in %2 line %3").arg(condition, filename, QString::number(line)); } QMessageLogger().warning(QLoggingCategory(qPrintable(CLogCategories::verification()))) << log; -# if defined(BLACK_USE_CRASHPAD) +# if defined(SWIFT_USE_CRASHPAD) CRASHPAD_SIMULATE_CRASH(); # endif #endif diff --git a/src/misc/weather/cloudlayer.cpp b/src/misc/weather/cloudlayer.cpp index 2b46ba71ac..59d8089261 100644 --- a/src/misc/weather/cloudlayer.cpp +++ b/src/misc/weather/cloudlayer.cpp @@ -8,7 +8,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer) namespace swift::misc::weather { diff --git a/src/misc/weather/cloudlayer.h b/src/misc/weather/cloudlayer.h index cfe12a8f83..eeb8201b9f 100644 --- a/src/misc/weather/cloudlayer.h +++ b/src/misc/weather/cloudlayer.h @@ -14,7 +14,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer) namespace swift::misc::weather { @@ -141,15 +141,14 @@ namespace swift::misc::weather Clouds m_clouds = NoClouds; int m_coveragePercent; - BLACK_METACLASS( + SWIFT_METACLASS( CCloudLayer, - BLACK_METAMEMBER(base), - BLACK_METAMEMBER(top), - BLACK_METAMEMBER(precipitationRate), - BLACK_METAMEMBER(precipitation), - BLACK_METAMEMBER(clouds), - BLACK_METAMEMBER(coveragePercent) - ); + SWIFT_METAMEMBER(base), + SWIFT_METAMEMBER(top), + SWIFT_METAMEMBER(precipitationRate), + SWIFT_METAMEMBER(precipitation), + SWIFT_METAMEMBER(clouds), + SWIFT_METAMEMBER(coveragePercent)); }; } // namespace diff --git a/src/misc/weather/cloudlayerlist.cpp b/src/misc/weather/cloudlayerlist.cpp index d2502e2cf7..9abec2271f 100644 --- a/src/misc/weather/cloudlayerlist.cpp +++ b/src/misc/weather/cloudlayerlist.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList) namespace swift::misc::weather { diff --git a/src/misc/weather/cloudlayerlist.h b/src/misc/weather/cloudlayerlist.h index 40f506469b..bdd2b1f1fc 100644 --- a/src/misc/weather/cloudlayerlist.h +++ b/src/misc/weather/cloudlayerlist.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList) namespace swift::misc { diff --git a/src/misc/weather/metar.cpp b/src/misc/weather/metar.cpp index 57f8b442a6..9ce84a0148 100644 --- a/src/misc/weather/metar.cpp +++ b/src/misc/weather/metar.cpp @@ -12,7 +12,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar) namespace swift::misc::weather { diff --git a/src/misc/weather/metar.h b/src/misc/weather/metar.h index 9ba5d19df5..7b3b82f33a 100644 --- a/src/misc/weather/metar.h +++ b/src/misc/weather/metar.h @@ -20,7 +20,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar) namespace swift::misc::weather { @@ -154,22 +154,21 @@ namespace swift::misc::weather physical_quantities::CTemperature m_dewPoint; physical_quantities::CPressure m_altimeter; - BLACK_METACLASS( + SWIFT_METACLASS( CMetar, - BLACK_METAMEMBER(metarMessage), - BLACK_METAMEMBER(reportType), - BLACK_METAMEMBER(airport), - BLACK_METAMEMBER(reportDay), - BLACK_METAMEMBER(reportTime), - BLACK_METAMEMBER(isAutomated), - BLACK_METAMEMBER(windLayer), - BLACK_METAMEMBER(visibility), - BLACK_METAMEMBER(presentWeathers), - BLACK_METAMEMBER(cloudLayers), - BLACK_METAMEMBER(temperature), - BLACK_METAMEMBER(dewPoint), - BLACK_METAMEMBER(altimeter) - ); + SWIFT_METAMEMBER(metarMessage), + SWIFT_METAMEMBER(reportType), + SWIFT_METAMEMBER(airport), + SWIFT_METAMEMBER(reportDay), + SWIFT_METAMEMBER(reportTime), + SWIFT_METAMEMBER(isAutomated), + SWIFT_METAMEMBER(windLayer), + SWIFT_METAMEMBER(visibility), + SWIFT_METAMEMBER(presentWeathers), + SWIFT_METAMEMBER(cloudLayers), + SWIFT_METAMEMBER(temperature), + SWIFT_METAMEMBER(dewPoint), + SWIFT_METAMEMBER(altimeter)); }; } // namespace diff --git a/src/misc/weather/metarlist.cpp b/src/misc/weather/metarlist.cpp index 5323896b2d..af21492661 100644 --- a/src/misc/weather/metarlist.cpp +++ b/src/misc/weather/metarlist.cpp @@ -5,7 +5,7 @@ #include -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList) namespace swift::misc::weather { diff --git a/src/misc/weather/metarlist.h b/src/misc/weather/metarlist.h index 47c91c3231..e292ba9a9a 100644 --- a/src/misc/weather/metarlist.h +++ b/src/misc/weather/metarlist.h @@ -15,7 +15,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList) namespace swift::misc::weather { diff --git a/src/misc/weather/presentweather.cpp b/src/misc/weather/presentweather.cpp index d60b959674..d76d911842 100644 --- a/src/misc/weather/presentweather.cpp +++ b/src/misc/weather/presentweather.cpp @@ -4,7 +4,7 @@ #include "misc/weather/presentweather.h" #include "misc/propertyindexref.h" -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather) namespace swift::misc::weather { diff --git a/src/misc/weather/presentweather.h b/src/misc/weather/presentweather.h index 940b1d1582..3a991552fb 100644 --- a/src/misc/weather/presentweather.h +++ b/src/misc/weather/presentweather.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather) namespace swift::misc::weather { @@ -127,12 +127,11 @@ namespace swift::misc::weather Descriptor m_descriptor = None; int m_weatherPhenomena; - BLACK_METACLASS( + SWIFT_METACLASS( CPresentWeather, - BLACK_METAMEMBER(intensity), - BLACK_METAMEMBER(descriptor), - BLACK_METAMEMBER(weatherPhenomena) - ); + SWIFT_METAMEMBER(intensity), + SWIFT_METAMEMBER(descriptor), + SWIFT_METAMEMBER(weatherPhenomena)); }; } // namespace diff --git a/src/misc/weather/presentweatherlist.cpp b/src/misc/weather/presentweatherlist.cpp index 473bc0e293..8b3f41d3ec 100644 --- a/src/misc/weather/presentweatherlist.cpp +++ b/src/misc/weather/presentweatherlist.cpp @@ -3,7 +3,7 @@ #include "misc/weather/presentweatherlist.h" -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList) namespace swift::misc::weather { diff --git a/src/misc/weather/presentweatherlist.h b/src/misc/weather/presentweatherlist.h index eda0ecd87d..877c537445 100644 --- a/src/misc/weather/presentweatherlist.h +++ b/src/misc/weather/presentweatherlist.h @@ -11,7 +11,7 @@ #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList) namespace swift::misc::weather { diff --git a/src/misc/weather/windlayer.cpp b/src/misc/weather/windlayer.cpp index 07f07c7d43..e03091e92a 100644 --- a/src/misc/weather/windlayer.cpp +++ b/src/misc/weather/windlayer.cpp @@ -8,7 +8,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; -BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer) +SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer) namespace swift::misc::weather { diff --git a/src/misc/weather/windlayer.h b/src/misc/weather/windlayer.h index 43fb50e826..8bfe11a9bc 100644 --- a/src/misc/weather/windlayer.h +++ b/src/misc/weather/windlayer.h @@ -16,7 +16,7 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer) +SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer) namespace swift::misc::weather { @@ -113,16 +113,15 @@ namespace swift::misc::weather physical_quantities::CSpeed m_speed; physical_quantities::CSpeed m_gustSpeed; - BLACK_METACLASS( + SWIFT_METACLASS( CWindLayer, - BLACK_METAMEMBER(level), - BLACK_METAMEMBER(directionMain), - BLACK_METAMEMBER(directionFrom), - BLACK_METAMEMBER(directionTo), - BLACK_METAMEMBER(directionVariable), - BLACK_METAMEMBER(speed), - BLACK_METAMEMBER(gustSpeed) - ); + SWIFT_METAMEMBER(level), + SWIFT_METAMEMBER(directionMain), + SWIFT_METAMEMBER(directionFrom), + SWIFT_METAMEMBER(directionTo), + SWIFT_METAMEMBER(directionVariable), + SWIFT_METAMEMBER(speed), + SWIFT_METAMEMBER(gustSpeed)); }; } // namespace diff --git a/src/misc/weather/windlayerlist.cpp b/src/misc/weather/windlayerlist.cpp index 8cc98a7b9c..ac6e214fc8 100644 --- a/src/misc/weather/windlayerlist.cpp +++ b/src/misc/weather/windlayerlist.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::aviation; -BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList) +SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList) namespace swift::misc::weather { diff --git a/src/misc/weather/windlayerlist.h b/src/misc/weather/windlayerlist.h index 879ba6d7bd..1c1ea3dd36 100644 --- a/src/misc/weather/windlayerlist.h +++ b/src/misc/weather/windlayerlist.h @@ -13,7 +13,7 @@ #include #include -BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList) +SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList) namespace swift::misc { diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index 6916d1e972..7068570f60 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -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" }); diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index 8646dc8590..69e185b2b0 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -20,10 +20,10 @@ #include #include -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) @@ -74,8 +74,8 @@ namespace BlackSimPlugin::Emulated // functions logged and used //! \ingroup swiftdotcommands //! 
-        //! .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
         //!
//! \copydoc swift::core::ISimulator::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; @@ -87,27 +87,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 diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp index 6e6bc5e2b4..14dd395522 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp @@ -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, diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.h b/src/plugins/simulator/emulated/simulatoremulatedfactory.h index c65d5d4b2c..982b3d635c 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.h +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.h @@ -11,7 +11,7 @@ #include #include -namespace BlackSimPlugin::Emulated +namespace swift::simplugin::emulated { //! Factory implementation to create CSimulatorEmulated instances class CSimulatorEmulatedFactory : diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index b4e3700adc..1e8ff9290b 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -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() { diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index aac0b0aeee..e08c223646 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -19,7 +19,7 @@ namespace Ui { class CSimulatorEmulatedMonitorDialog; } -namespace BlackSimPlugin::Emulated +namespace swift::simplugin::emulated { class CSimulatorEmulated; diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp index 5f7ca018f6..34fb876ecc 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.cpp @@ -4,7 +4,7 @@ #include "simulatoremulatedconfig.h" #include "simulatoremulatedconfigwidget.h" -namespace BlackSimPlugin::Emulated +namespace swift::simplugin::emulated { CSimulatorEmulatedConfig::CSimulatorEmulatedConfig(QObject *parent) : QObject(parent) { diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h index 64ffe45e30..9d3e0db08a 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h @@ -7,7 +7,7 @@ #include "gui/pluginconfig.h" -namespace BlackSimPlugin::Emulated +namespace swift::simplugin::emulated { /*! * Window for setting up the FSX plugin. diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp index 1a21f8d8b2..0f37b4d8cd 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp @@ -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) diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h index 9b818c982c..553eca7449 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h @@ -12,7 +12,7 @@ namespace Ui { class CSimulatorEmulatedConfigWidget; } -namespace BlackSimPlugin::Emulated +namespace swift::simplugin::emulated { /*! * Configuration window for CSimulatorEmulatedConfig diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp index ddb6f96699..0b40ad0f4d 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.cpp @@ -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) { diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h index 593e37f07a..7af051896f 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h @@ -25,7 +25,7 @@ class QDBusPendingCallWatcher; #define FGSWIFTBUS_SERVICE_OBJECTPATH "/fgswiftbus/service" //! \endcond -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { struct FlightgearData; @@ -94,7 +94,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( diff --git a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp index e2e6190ad0..f1f1d580a8 100644 --- a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp @@ -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) { diff --git a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h index dd58429146..cd00f97c78 100644 --- a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h @@ -24,7 +24,7 @@ class QDBusConnection; #define FGSWIFTBUS_TRAFFIC_OBJECTPATH "/fgswiftbus/traffic" //! \endcond -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { //! List of doubles using QDoubleList = QList; @@ -204,13 +204,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; diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp index f9b90550d6..2732c11f50 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp @@ -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() {} diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h index 609b39325a..0ce4e63a9c 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.h @@ -14,7 +14,7 @@ namespace swift::core { class ISimulator; } -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { //! Class representing a Flightgear multiplayer aircraft class CFlightgearMPAircraft diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index dd832b61be..268e01c389 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -72,7 +72,7 @@ namespace } } -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { int FGSWIFTBUS_API_VERSION = -1; QList 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; diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.h b/src/plugins/simulator/flightgear/simulatorflightgear.h index 0ab0207cfd..fb69116b88 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.h +++ b/src/plugins/simulator/flightgear/simulatorflightgear.h @@ -56,7 +56,7 @@ namespace swift::misc } } -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { extern int FGSWIFTBUS_API_VERSION; extern QList incompatibleVersions; @@ -105,7 +105,7 @@ namespace BlackSimPlugin::Flightgear }; //! Flightgear ISimulator implementation - class CSimulatorFlightgear : public Common::CSimulatorPluginCommon + class CSimulatorFlightgear : public common::CSimulatorPluginCommon { Q_OBJECT diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp index c4595e4c0d..e5b2305119 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.cpp @@ -6,7 +6,7 @@ class QWidget; -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { CSimulatorFlightgearConfig::CSimulatorFlightgearConfig(QObject *parent) : QObject(parent) { diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h index 7a1f6b9706..85d206ec45 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h @@ -17,7 +17,7 @@ namespace swift::gui { class CPluginConfigWindow; } -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { /*! * Config plugin for the Flightgear plugin. diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp index de2a3104fd..15c6cf3604 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp @@ -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) diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h index 885d93abc9..3759766805 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h @@ -15,7 +15,7 @@ namespace Ui { class CSimulatorFlightgearConfigWindow; } -namespace BlackSimPlugin::Flightgear +namespace swift::simplugin::flightgear { /*! * A window that shows all the Flightgear plugin options. diff --git a/src/plugins/simulator/fs9/callbackwrapper.h b/src/plugins/simulator/fs9/callbackwrapper.h index ab3d25a372..29a248b16c 100644 --- a/src/plugins/simulator/fs9/callbackwrapper.h +++ b/src/plugins/simulator/fs9/callbackwrapper.h @@ -8,7 +8,7 @@ #include #include -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Template, wrapping the C-style DirectPlay handler callback to a class member template diff --git a/src/plugins/simulator/fs9/directplayerror.cpp b/src/plugins/simulator/fs9/directplayerror.cpp index db22e28927..e1c0c0c84e 100644 --- a/src/plugins/simulator/fs9/directplayerror.cpp +++ b/src/plugins/simulator/fs9/directplayerror.cpp @@ -4,7 +4,7 @@ #include "directplayerror.h" #include "misc/logmessage.h" -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { HRESULT logDirectPlayError(HRESULT error) { diff --git a/src/plugins/simulator/fs9/directplayerror.h b/src/plugins/simulator/fs9/directplayerror.h index 08343abd3e..4554deb876 100644 --- a/src/plugins/simulator/fs9/directplayerror.h +++ b/src/plugins/simulator/fs9/directplayerror.h @@ -11,7 +11,7 @@ #include -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Print the direct play error HRESULT logDirectPlayError(HRESULT error); diff --git a/src/plugins/simulator/fs9/directplaypeer.cpp b/src/plugins/simulator/fs9/directplaypeer.cpp index e6ed0ecf60..3166e0f06b 100644 --- a/src/plugins/simulator/fs9/directplaypeer.cpp +++ b/src/plugins/simulator/fs9/directplaypeer.cpp @@ -15,7 +15,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { const QStringList &CDirectPlayPeer::getLogCategories() { diff --git a/src/plugins/simulator/fs9/directplaypeer.h b/src/plugins/simulator/fs9/directplaypeer.h index b2224ae9cd..a5112c64b0 100644 --- a/src/plugins/simulator/fs9/directplaypeer.h +++ b/src/plugins/simulator/fs9/directplaypeer.h @@ -15,7 +15,7 @@ #include #include -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(); } diff --git a/src/plugins/simulator/fs9/directplayutils.h b/src/plugins/simulator/fs9/directplayutils.h index 12be65730d..3932c7f623 100644 --- a/src/plugins/simulator/fs9/directplayutils.h +++ b/src/plugins/simulator/fs9/directplayutils.h @@ -5,7 +5,7 @@ #pragma once -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Safely release a COM allocated object template diff --git a/src/plugins/simulator/fs9/fs9.h b/src/plugins/simulator/fs9/fs9.h index daba906461..6b64933ea7 100644 --- a/src/plugins/simulator/fs9/fs9.h +++ b/src/plugins/simulator/fs9/fs9.h @@ -14,7 +14,7 @@ #endif #include -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! FS9 SDK class CFs9Sdk diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp index 5aae516d57..88360add38 100644 --- a/src/plugins/simulator/fs9/fs9client.cpp +++ b/src/plugins/simulator/fs9/fs9client.cpp @@ -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, diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h index 91e72d258e..1fd006dc70 100644 --- a/src/plugins/simulator/fs9/fs9client.h +++ b/src/plugins/simulator/fs9/fs9client.h @@ -17,7 +17,7 @@ namespace swift::core { class ISimulator; } -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Class faking a FS9 multiplayer client connection class CFs9Client : public CDirectPlayPeer @@ -67,7 +67,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 @@ -111,4 +111,4 @@ namespace BlackSimPlugin::Fs9 }; } // ns -Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Client::ClientStatus) +Q_DECLARE_METATYPE(swift::simplugin::fs9::CFs9Client::ClientStatus) diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp index d34a09c98a..d59237fec0 100644 --- a/src/plugins/simulator/fs9/fs9host.cpp +++ b/src/plugins/simulator/fs9/fs9host.cpp @@ -15,7 +15,7 @@ using namespace swift::misc; -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { CFs9Host::CFs9Host(QObject *parent) : CDirectPlayPeer(sApp->swiftVersionString(), parent) { diff --git a/src/plugins/simulator/fs9/fs9host.h b/src/plugins/simulator/fs9/fs9host.h index 997ab4aca8..4ee3c189c2 100644 --- a/src/plugins/simulator/fs9/fs9host.h +++ b/src/plugins/simulator/fs9/fs9host.h @@ -7,7 +7,7 @@ //! \file -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Class encapsulating a FS9 host class CFs9Host : public CDirectPlayPeer @@ -40,7 +40,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 @@ -53,4 +53,4 @@ namespace BlackSimPlugin::Fs9 }; } // ns -Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Host::HostStatus) +Q_DECLARE_METATYPE(swift::simplugin::fs9::CFs9Host::HostStatus) diff --git a/src/plugins/simulator/fs9/hostnode.cpp b/src/plugins/simulator/fs9/hostnode.cpp index 952f12c8af..5cd4181d48 100644 --- a/src/plugins/simulator/fs9/hostnode.cpp +++ b/src/plugins/simulator/fs9/hostnode.cpp @@ -4,7 +4,7 @@ #include "hostnode.h" #include "directplayutils.h" -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { CHostNode::CHostNode() { diff --git a/src/plugins/simulator/fs9/hostnode.h b/src/plugins/simulator/fs9/hostnode.h index 00ab84d685..7ed111581d 100644 --- a/src/plugins/simulator/fs9/hostnode.h +++ b/src/plugins/simulator/fs9/hostnode.h @@ -8,7 +8,7 @@ //! \file -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Class representing a enumerated host node struct CHostNode diff --git a/src/plugins/simulator/fs9/lobbyclient.cpp b/src/plugins/simulator/fs9/lobbyclient.cpp index 0f760fec08..1452a37202 100644 --- a/src/plugins/simulator/fs9/lobbyclient.cpp +++ b/src/plugins/simulator/fs9/lobbyclient.cpp @@ -21,7 +21,7 @@ using namespace swift::misc; -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { CLobbyClient::CLobbyClient(QObject *parent) : QObject(parent), diff --git a/src/plugins/simulator/fs9/lobbyclient.h b/src/plugins/simulator/fs9/lobbyclient.h index f09621b9d3..3bba9a827f 100644 --- a/src/plugins/simulator/fs9/lobbyclient.h +++ b/src/plugins/simulator/fs9/lobbyclient.h @@ -8,7 +8,7 @@ #include #include -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Lobby client launching and connecting FS9 class CLobbyClient : public QObject diff --git a/src/plugins/simulator/fs9/multiplayerpacketparser.cpp b/src/plugins/simulator/fs9/multiplayerpacketparser.cpp index 7b932f4291..f82ea316cd 100644 --- a/src/plugins/simulator/fs9/multiplayerpacketparser.cpp +++ b/src/plugins/simulator/fs9/multiplayerpacketparser.cpp @@ -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) { diff --git a/src/plugins/simulator/fs9/multiplayerpacketparser.h b/src/plugins/simulator/fs9/multiplayerpacketparser.h index 205b898fa4..e83bdfa1fb 100644 --- a/src/plugins/simulator/fs9/multiplayerpacketparser.h +++ b/src/plugins/simulator/fs9/multiplayerpacketparser.h @@ -12,7 +12,7 @@ //! \file -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { namespace Private { diff --git a/src/plugins/simulator/fs9/multiplayerpackets.h b/src/plugins/simulator/fs9/multiplayerpackets.h index 6a09196223..df879beccd 100644 --- a/src/plugins/simulator/fs9/multiplayerpackets.h +++ b/src/plugins/simulator/fs9/multiplayerpackets.h @@ -10,7 +10,7 @@ //! \file -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Multiplayer param packet - aircraft configuration struct MPParam : public MULTIPLAYER_PACKET_PARAMS diff --git a/src/plugins/simulator/fs9/registermetadata.cpp b/src/plugins/simulator/fs9/registermetadata.cpp index 366137148b..862aa7df21 100644 --- a/src/plugins/simulator/fs9/registermetadata.cpp +++ b/src/plugins/simulator/fs9/registermetadata.cpp @@ -5,7 +5,7 @@ #include "fs9host.h" #include "fs9client.h" -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { void registerMetadata() { diff --git a/src/plugins/simulator/fs9/registermetadata.h b/src/plugins/simulator/fs9/registermetadata.h index f69b73192d..d017452ba4 100644 --- a/src/plugins/simulator/fs9/registermetadata.h +++ b/src/plugins/simulator/fs9/registermetadata.h @@ -5,7 +5,7 @@ #pragma once -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! Register all relevant metadata in plugin void registerMetadata(); diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index fe86ea2e0f..74709f9d2e 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -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 &fs9Host, diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 259e67b189..09b5819223 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -22,7 +22,7 @@ #include #include -namespace BlackSimPlugin::Fs9 +namespace swift::simplugin::fs9 { //! FS9 Simulator Implementation class CSimulatorFs9 : public FsCommon::CSimulatorFsCommon @@ -86,7 +86,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(); @@ -94,7 +94,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> m_hashFs9Clients; QMetaObject::Connection m_connectionHostMessages; bool m_simConnected = false; //!< Is simulator connected? diff --git a/src/plugins/simulator/fscommon/fsuipc.h b/src/plugins/simulator/fscommon/fsuipc.h index e99e3ff5b0..afb4a16d88 100644 --- a/src/plugins/simulator/fscommon/fsuipc.h +++ b/src/plugins/simulator/fscommon/fsuipc.h @@ -9,7 +9,7 @@ #include "misc/simulation/simulatedaircraft.h" #include -namespace BlackSimPlugin::FsCommon +namespace swift::simplugin::fscommon { //! Class representing a FSUIPC "interface" class FSCOMMON_EXPORT CFsuipc : public QObject diff --git a/src/plugins/simulator/fscommon/fsuipcdummy.cpp b/src/plugins/simulator/fscommon/fsuipcdummy.cpp index 9a35a47071..7a4bacfeb5 100644 --- a/src/plugins/simulator/fscommon/fsuipcdummy.cpp +++ b/src/plugins/simulator/fscommon/fsuipcdummy.cpp @@ -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) diff --git a/src/plugins/simulator/fscommon/fsuipcimpl.cpp b/src/plugins/simulator/fscommon/fsuipcimpl.cpp index a336bf4ec5..9a30529ef8 100644 --- a/src/plugins/simulator/fscommon/fsuipcimpl.cpp +++ b/src/plugins/simulator/fscommon/fsuipcimpl.cpp @@ -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) { diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index 51c447ac46..9dc34fedea 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -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" }); } diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 6095b3e3e8..d8e64d43ca 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -13,10 +13,10 @@ #include #include -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) diff --git a/src/plugins/simulator/fscommon/simulatorfscommonfunctions.h b/src/plugins/simulator/fscommon/simulatorfscommonfunctions.h index df56d6d0d3..be4806c726 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommonfunctions.h +++ b/src/plugins/simulator/fscommon/simulatorfscommonfunctions.h @@ -8,7 +8,7 @@ #include #include -namespace BlackSimPlugin::FsCommon +namespace swift::simplugin::fscommon { //! @{ //! Correctly casted values/checks diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 7ca17b84bd..9eed9045dc 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -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, diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index 4c03e756f0..9a9b2e6308 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -7,10 +7,10 @@ #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 diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 80f8d32ba6..0e74890041 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -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, diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index d501e2ae3a..0d71d9ebb3 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -11,7 +11,7 @@ #include #include -namespace BlackSimPlugin::Fsx +namespace swift::simplugin::fsx { //! Factory implementation to create CSimulatorFsx instances class CSimulatorFsxFactory : diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp index 335aadf6c7..d51e7af59b 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp @@ -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) diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h index 9a0f0defe7..22ace92bed 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.h @@ -19,7 +19,7 @@ namespace swift::gui { class COverlayMessagesFrame; } -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { class CSimulatorFsxCommon; diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp index e5569e8d12..ecd5db14a9 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp @@ -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) { diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h index 537b529cb7..806b5e2eff 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h @@ -17,7 +17,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 diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index d49400704d..943a323d7f 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -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() { diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h index 865157d3ed..c690485a8f 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.h +++ b/src/plugins/simulator/fsxcommon/simconnectobject.h @@ -13,7 +13,7 @@ #include #include -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { //! Class representing a SimConnect object class FSXCOMMON_EXPORT CSimConnectObject diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index 225c2e3542..466c9820e7 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -24,7 +24,7 @@ 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) diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h index e33dd0d777..1500379c94 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h @@ -17,7 +17,7 @@ namespace Ui { class CSimConnectSettingsComponent; } -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { /*! * A component that gathers all SimConnect related settings. diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index d0dde5e2e8..0250506599 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -42,9 +42,9 @@ using namespace swift::misc::simulation::fscommon; 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" }); diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index 2d09113e9a..30b1536eeb 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -30,7 +30,7 @@ #include #include -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { //! SimConnect Event IDs enum EventIds @@ -468,7 +468,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); diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp index 71937ca863..41c31db59e 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp @@ -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), diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h index 8c2583ce69..247ea08fe6 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h @@ -14,7 +14,7 @@ namespace Ui { class CSimulatorFsxConfigWindow; } -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { /*! * A window that lets user set up the FSX plugin. diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.ui b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.ui index d373451908..163a174567 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.ui +++ b/src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.ui @@ -55,7 +55,7 @@ 0 - + @@ -77,7 +77,7 @@ 0 - + 0 @@ -101,13 +101,13 @@ - BlackSimPlugin::FsxCommon::CSimConnectSettingsComponent + swift::simplugin::fsxcommon::CSimConnectSettingsComponent QFrame
simconnectsettingscomponent.h
1 - BlackSimPlugin::FsxCommon::CFsxSettingsComponent + swift::simplugin::fsxcommon::CFsxSettingsComponent QFrame
fsxsettingscomponent.h
1 diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 1f424c827e..cb89345fad 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -25,7 +25,7 @@ using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; using namespace swift::misc::simulation::Fsx; -namespace BlackSimPlugin::FsxCommon +namespace swift::simplugin::fsxcommon { void CALLBACK CSimulatorFsxCommon::SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext) { diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp index 5d9ea92bba..bef58f02f8 100644 --- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp +++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp @@ -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) { diff --git a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h index 398844c65b..db966ea9d2 100644 --- a/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h +++ b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h @@ -8,7 +8,7 @@ #include "gui/pluginconfig.h" #include "misc/settingscache.h" -namespace BlackSimPlugin::Fsx +namespace swift::simplugin::fsx { /*! * Window for setting up the FSX plugin. diff --git a/src/plugins/simulator/msfs/simulatormsfs.cpp b/src/plugins/simulator/msfs/simulatormsfs.cpp index 0b6b184b10..656e603907 100644 --- a/src/plugins/simulator/msfs/simulatormsfs.cpp +++ b/src/plugins/simulator/msfs/simulatormsfs.cpp @@ -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, diff --git a/src/plugins/simulator/msfs/simulatormsfs.h b/src/plugins/simulator/msfs/simulatormsfs.h index c704a1db7e..19b752f71d 100644 --- a/src/plugins/simulator/msfs/simulatormsfs.h +++ b/src/plugins/simulator/msfs/simulatormsfs.h @@ -7,10 +7,10 @@ #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 @@ -27,7 +27,7 @@ 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 diff --git a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp b/src/plugins/simulator/msfs/simulatormsfsfactory.cpp index b470555577..cf70afe95c 100644 --- a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp +++ b/src/plugins/simulator/msfs/simulatormsfsfactory.cpp @@ -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, diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index c290e73efd..db6d9af272 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.cpp +++ b/src/plugins/simulator/p3d/simulatorp3d.cpp @@ -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 namespace swift::simplugin::fsxcommon; using namespace swift::core; -using namespace BlackSimPlugin::FsCommon; +using namespace namespace swift::simplugin::fscommon; -namespace BlackSimPlugin::P3D +namespace swift::simplugin::p3d { CSimulatorP3D::CSimulatorP3D(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, diff --git a/src/plugins/simulator/p3d/simulatorp3d.h b/src/plugins/simulator/p3d/simulatorp3d.h index 92cd31b482..0830e9492d 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.h +++ b/src/plugins/simulator/p3d/simulatorp3d.h @@ -10,7 +10,7 @@ #include "misc/simulation/settings/simulatorsettings.h" #include "misc/settingscache.h" -namespace BlackSimPlugin::P3D +namespace swift::simplugin::p3d { //! P3D specific events enum EventsIdsP3D diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp index bc37a18b14..c21bbdf997 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp @@ -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, diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.h b/src/plugins/simulator/p3d/simulatorp3dfactory.h index 2e875944cd..15b7e398ea 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.h +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.h @@ -11,7 +11,7 @@ #include #include -namespace BlackSimPlugin::P3D +namespace swift::simplugin::p3d { //! Factory implementation to create CSimulatorP3D instances class CSimulatorP3DFactory : diff --git a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp index 47e9b2ac96..3ebe9f695e 100644 --- a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp +++ b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.cpp @@ -4,7 +4,7 @@ #include "simulatorp3dconfig.h" #include "../fsxcommon/simulatorfsxconfigwindow.h" -namespace BlackSimPlugin::P3D +namespace swift::simplugin::p3d { CSimulatorP3DConfig::CSimulatorP3DConfig(QObject *parent) : QObject(parent) { diff --git a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h index 5d55684142..e59f53f3e0 100644 --- a/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h +++ b/src/plugins/simulator/p3dconfig/simulatorp3dconfig.h @@ -7,7 +7,7 @@ #include "gui/pluginconfig.h" -namespace BlackSimPlugin::P3D +namespace swift::simplugin::p3d { /*! * Window for setting up the P3D plugin. diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp index f767eb9048..9c6101a43b 100644 --- a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp +++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp @@ -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 diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.h b/src/plugins/simulator/plugincommon/simulatorplugincommon.h index fd760b713c..0f74e144cb 100644 --- a/src/plugins/simulator/plugincommon/simulatorplugincommon.h +++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.h @@ -14,7 +14,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 diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 8158107b12..c9c25d523f 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -80,7 +80,7 @@ namespace } } -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { CSimulatorXPlane::CSimulatorXPlane(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider, diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 19430a6c5b..dc484a92df 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -56,7 +56,7 @@ namespace swift::misc } } -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { class CXSwiftBusServiceProxy; class CXSwiftBusTrafficProxy; @@ -109,7 +109,7 @@ namespace BlackSimPlugin::XPlane }; //! X-Plane ISimulator implementation - class CSimulatorXPlane : public Common::CSimulatorPluginCommon + class CSimulatorXPlane : public common::CSimulatorPluginCommon { Q_OBJECT @@ -332,9 +332,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); } diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index cdb1146606..4425b2732a 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -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() {} diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 745094a4f0..31b7e101f6 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -14,7 +14,7 @@ namespace swift::core { class ISimulator; } -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { //! Class representing a X-Plane multiplayer aircraft class CXPlaneMPAircraft diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp index 3809f4207d..3b1d6183bb 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp @@ -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) { diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h index d4f118e763..ce56db5dea 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.h +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.h @@ -25,7 +25,7 @@ class QDBusPendingCallWatcher; #define XSWIFTBUS_SERVICE_OBJECTPATH "/xswiftbus/service" //! \endcond -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { struct XPlaneData; @@ -77,7 +77,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( @@ -98,28 +98,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); diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp index 3b6f289937..a96bb4222a 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.cpp @@ -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() { diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 25c0033d65..774fb8cfda 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -25,7 +25,7 @@ class QDBusConnection; #define XSWIFTBUS_TRAFFIC_OBJECTPATH "/xswiftbus/traffic" //! \endcond -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { //! List of doubles using QDoubleList = QList; @@ -221,13 +221,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); diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp index 8432da5adf..bc7880b580 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp @@ -6,7 +6,7 @@ class QWidget; -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { CSimulatorXPlaneConfig::CSimulatorXPlaneConfig(QObject *parent) : QObject(parent) { diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h index 2b30b2db0d..365928108f 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h @@ -17,7 +17,7 @@ namespace swift::gui { class CPluginConfigWindow; } -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { /*! * Config plugin for the X-Plane plugin. diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp index 0415492bdd..9cdf98e26d 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp @@ -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) diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h index fbebf21ef4..2247dd88e9 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h @@ -15,7 +15,7 @@ namespace Ui { class CSimulatorXPlaneConfigWindow; } -namespace BlackSimPlugin::XPlane +namespace swift::simplugin::xplane { /*! * A window that shows all the X-Plane plugin options. diff --git a/src/sound/tonepair.cpp b/src/sound/tonepair.cpp index 4c2c135116..5ec5533d1b 100644 --- a/src/sound/tonepair.cpp +++ b/src/sound/tonepair.cpp @@ -8,8 +8,8 @@ namespace swift::sound CTonePair::CTonePair(const swift::misc::physical_quantities::CFrequency &frequency, const swift::misc::physical_quantities::CFrequency &secondaryFrequency, const swift::misc::physical_quantities::CTime &duration) : m_firstFrequencyHz(static_cast(frequency.valueRounded(swift::misc::physical_quantities::CFrequencyUnit::Hz()))), - m_secondFrequencyHz(static_cast(secondaryFrequency.valueRounded(swift::misc::physical_quantities::CFrequencyUnit::Hz()))), - m_durationMs(static_cast(duration.valueRounded(swift::misc::physical_quantities::CTimeUnit::ms()))) + m_secondFrequencyHz(static_cast(secondaryFrequency.valueRounded(swift::misc::physical_quantities::CFrequencyUnit::Hz()))), + m_durationMs(static_cast(duration.valueRounded(swift::misc::physical_quantities::CTimeUnit::ms()))) {} } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ea2881c680..d48dcbdb72 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,5 +10,5 @@ add_subdirectory(gui) add_subdirectory(misc) if(SWIFT_BUILD_FSX_PLUGIN) - add_subdirectory(blacksimpluginfsxp3d) + add_subdirectory(swiftsimpluginfsxp3d) endif() diff --git a/tests/core/context/testcontext/testcontext.cpp b/tests/core/context/testcontext/testcontext.cpp index 85cd164930..3d90b6c356 100644 --- a/tests/core/context/testcontext/testcontext.cpp +++ b/tests/core/context/testcontext/testcontext.cpp @@ -97,7 +97,7 @@ int main(int argc, char *argv[]) QCoreApplication app(argc, argv); // using QGuiApplication fails on Jenkins Linux, no display #endif - BLACKTEST_INIT(SwiftCoreTest::CTestContext) + SWIFTTEST_INIT(SwiftCoreTest::CTestContext) CApplication a(CApplicationInfo::UnitTest); a.addNetworkOptions(); const bool setup = a.parseCommandLineArgsAndLoadSetup(); diff --git a/tests/core/fsd/testfsdclient/testfsdclient.cpp b/tests/core/fsd/testfsdclient/testfsdclient.cpp index 91e449bda8..07f1aa8998 100644 --- a/tests/core/fsd/testfsdclient/testfsdclient.cpp +++ b/tests/core/fsd/testfsdclient/testfsdclient.cpp @@ -5,7 +5,7 @@ /*! * \file - * \ingroup testblackfsd + * \ingroup testswiftfsd */ #include "config/buildconfig.h" @@ -33,7 +33,7 @@ using namespace swift::misc::simulation; using namespace swift::config; using namespace swift::core::fsd; -namespace BlackFsdTest +namespace SwiftFsdTest { //! Testing FSD Client class CTestFSDClient : public QObject @@ -976,7 +976,7 @@ namespace BlackFsdTest } //! main -BLACKTEST_MAIN(BlackFsdTest::CTestFSDClient); +SWIFTTEST_MAIN(SwiftFsdTest::CTestFSDClient); #include "testfsdclient.moc" diff --git a/tests/core/fsd/testfsdmessages/testfsdmessages.cpp b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp index 3e4c1d01cb..bda874383a 100644 --- a/tests/core/fsd/testfsdmessages/testfsdmessages.cpp +++ b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp @@ -5,7 +5,7 @@ /*! * \file - * \ingroup testblackfsd + * \ingroup testswiftfsd */ #include "config/buildconfig.h" @@ -704,7 +704,7 @@ namespace MiscTest } //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestFsdMessages); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestFsdMessages); #include "testfsdmessages.moc" diff --git a/tests/core/scripts/perllib/BlackCore/Expect/Dict.pm b/tests/core/scripts/perllib/SwiftCore/Expect/Dict.pm similarity index 100% rename from tests/core/scripts/perllib/BlackCore/Expect/Dict.pm rename to tests/core/scripts/perllib/SwiftCore/Expect/Dict.pm diff --git a/tests/core/scripts/perllib/BlackCore/Expect/Test.pm b/tests/core/scripts/perllib/SwiftCore/Expect/Test.pm similarity index 100% rename from tests/core/scripts/perllib/BlackCore/Expect/Test.pm rename to tests/core/scripts/perllib/SwiftCore/Expect/Test.pm diff --git a/tests/core/blackcoretest.h b/tests/core/swiftcoretest.h similarity index 100% rename from tests/core/blackcoretest.h rename to tests/core/swiftcoretest.h diff --git a/tests/core/testconnectivity/testconnectivity.cpp b/tests/core/testconnectivity/testconnectivity.cpp index 121afa456c..cb844f5530 100644 --- a/tests/core/testconnectivity/testconnectivity.cpp +++ b/tests/core/testconnectivity/testconnectivity.cpp @@ -94,7 +94,7 @@ namespace swiftcoretest int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - BLACKTEST_INIT(swiftcoretest::CTestConnectivity) + SWIFTTEST_INIT(swiftcoretest::CTestConnectivity) CApplication a(CApplicationInfo::UnitTest); a.addNetworkOptions(); const bool setup = a.parseCommandLineArgsAndLoadSetup(); diff --git a/tests/core/testreaders/testreaders.cpp b/tests/core/testreaders/testreaders.cpp index 1fce676bbb..363bb17414 100644 --- a/tests/core/testreaders/testreaders.cpp +++ b/tests/core/testreaders/testreaders.cpp @@ -214,7 +214,7 @@ namespace swiftcoretest } // ns //! main -BLACKTEST_APPLESS_MAIN(swiftcoretest::CTestReaders); +SWIFTTEST_APPLESS_MAIN(swiftcoretest::CTestReaders); #include "testreaders.moc" diff --git a/tests/gui/blackguitest.h b/tests/gui/swiftguitest.h similarity index 100% rename from tests/gui/blackguitest.h rename to tests/gui/swiftguitest.h diff --git a/tests/gui/testguiutility/testguiutility.cpp b/tests/gui/testguiutility/testguiutility.cpp index 1fd0b16f6c..fc5832413b 100644 --- a/tests/gui/testguiutility/testguiutility.cpp +++ b/tests/gui/testguiutility/testguiutility.cpp @@ -31,7 +31,7 @@ namespace SwiftGuiTest } // ns //! main -BLACKTEST_APPLESS_MAIN(SwiftGuiTest::CTestGuiUtility); +SWIFTTEST_APPLESS_MAIN(SwiftGuiTest::CTestGuiUtility); #include "testguiutility.moc" diff --git a/tests/misc/aviation/testaircraftparts/testaircraftparts.cpp b/tests/misc/aviation/testaircraftparts/testaircraftparts.cpp index 2a73228a91..c3473189ac 100644 --- a/tests/misc/aviation/testaircraftparts/testaircraftparts.cpp +++ b/tests/misc/aviation/testaircraftparts/testaircraftparts.cpp @@ -83,7 +83,7 @@ namespace MiscTest } // ns //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestAircraftParts); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestAircraftParts); #include "testaircraftparts.moc" diff --git a/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp b/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp index 073f8aed67..c4e49966e8 100644 --- a/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp +++ b/tests/misc/aviation/testaircraftsituation/testaircraftsituation.cpp @@ -368,7 +368,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_MAIN(MiscTest::CTestAircraftSituation); +SWIFTTEST_MAIN(MiscTest::CTestAircraftSituation); #include "testaircraftsituation.moc" diff --git a/tests/misc/aviation/testaviation/testaviation.cpp b/tests/misc/aviation/testaviation/testaviation.cpp index 583a3a472b..79fd718f8c 100644 --- a/tests/misc/aviation/testaviation/testaviation.cpp +++ b/tests/misc/aviation/testaviation/testaviation.cpp @@ -440,7 +440,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestAviation); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestAviation); #include "testaviation.moc" diff --git a/tests/misc/aviation/testflightplan/testflightplan.cpp b/tests/misc/aviation/testflightplan/testflightplan.cpp index b7ca80d3d6..6e213cda13 100644 --- a/tests/misc/aviation/testflightplan/testflightplan.cpp +++ b/tests/misc/aviation/testflightplan/testflightplan.cpp @@ -101,7 +101,7 @@ namespace MiscTest } // ns //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestFlightPlan); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestFlightPlan); #include "testflightplan.moc" diff --git a/tests/misc/aviation/testflightplan/testflightplanaircraftinfo.cpp b/tests/misc/aviation/testflightplan/testflightplanaircraftinfo.cpp index cf121266cb..49533f2f96 100644 --- a/tests/misc/aviation/testflightplan/testflightplanaircraftinfo.cpp +++ b/tests/misc/aviation/testflightplan/testflightplanaircraftinfo.cpp @@ -222,7 +222,7 @@ namespace MiscTest } // ns //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestFlightPlanAircraftInfo); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestFlightPlanAircraftInfo); #include "testflightplanaircraftinfo.moc" diff --git a/tests/misc/geo/testgeo/testgeo.cpp b/tests/misc/geo/testgeo/testgeo.cpp index 15421fd29e..e7261e588f 100644 --- a/tests/misc/geo/testgeo/testgeo.cpp +++ b/tests/misc/geo/testgeo/testgeo.cpp @@ -77,7 +77,7 @@ namespace MiscTest } // ns //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestGeo); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestGeo); #include "testgeo.moc" diff --git a/tests/misc/input/testinput/testinput.cpp b/tests/misc/input/testinput/testinput.cpp index 3eaf757950..dc637c3625 100644 --- a/tests/misc/input/testinput/testinput.cpp +++ b/tests/misc/input/testinput/testinput.cpp @@ -189,7 +189,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestInput); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestInput); #include "testinput.moc" diff --git a/tests/misc/math/testmath/testmath.cpp b/tests/misc/math/testmath/testmath.cpp index ebed4a7ebc..af7557db59 100644 --- a/tests/misc/math/testmath/testmath.cpp +++ b/tests/misc/math/testmath/testmath.cpp @@ -48,7 +48,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestMath); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestMath); #include "testmath.moc" diff --git a/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp b/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp index 3cd44820e2..4937ba089f 100644 --- a/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp +++ b/tests/misc/pq/testphysicalquantities/testphysicalquantities.cpp @@ -446,7 +446,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestPhysicalQuantities); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestPhysicalQuantities); #include "testphysicalquantities.moc" diff --git a/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp b/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp index 8150714ebd..9fb38ffc59 100644 --- a/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp +++ b/tests/misc/simulation/testinterpolatorlinear/testinterpolatorlinear.cpp @@ -201,7 +201,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_MAIN(MiscTest::CTestInterpolatorLinear); +SWIFTTEST_MAIN(MiscTest::CTestInterpolatorLinear); #include "testinterpolatorlinear.moc" diff --git a/tests/misc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp b/tests/misc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp index 09908a5312..b5cab3b21e 100644 --- a/tests/misc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp +++ b/tests/misc/simulation/testinterpolatorlinearpbh/testinterpolatorlinearpbh.cpp @@ -260,7 +260,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestInterpolatorLinearPbh); +SWIFTTEST_MAIN(MiscTest::CTestInterpolatorLinearPbh); #include "testinterpolatorlinearpbh.moc" diff --git a/tests/misc/simulation/testinterpolatormisc/testinterpolatormisc.cpp b/tests/misc/simulation/testinterpolatormisc/testinterpolatormisc.cpp index 01af7001d1..80fecc590c 100644 --- a/tests/misc/simulation/testinterpolatormisc/testinterpolatormisc.cpp +++ b/tests/misc/simulation/testinterpolatormisc/testinterpolatormisc.cpp @@ -121,7 +121,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_MAIN(MiscTest::CTestInterpolatorMisc); +SWIFTTEST_MAIN(MiscTest::CTestInterpolatorMisc); #include "testinterpolatormisc.moc" diff --git a/tests/misc/simulation/testinterpolatorparts/testinterpolatorparts.cpp b/tests/misc/simulation/testinterpolatorparts/testinterpolatorparts.cpp index a3357bafe8..f383352ebe 100644 --- a/tests/misc/simulation/testinterpolatorparts/testinterpolatorparts.cpp +++ b/tests/misc/simulation/testinterpolatorparts/testinterpolatorparts.cpp @@ -186,7 +186,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_MAIN(MiscTest::CTestInterpolatorParts); +SWIFTTEST_MAIN(MiscTest::CTestInterpolatorParts); #include "testinterpolatorparts.moc" diff --git a/tests/misc/simulation/testxplane/testxplane.cpp b/tests/misc/simulation/testxplane/testxplane.cpp index 48882ee2f4..2521270b45 100644 --- a/tests/misc/simulation/testxplane/testxplane.cpp +++ b/tests/misc/simulation/testxplane/testxplane.cpp @@ -176,7 +176,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestXPlane); +SWIFTTEST_MAIN(MiscTest::CTestXPlane); #include "testxplane.moc" diff --git a/tests/misc/blackmisctest.h b/tests/misc/swiftmisctest.h similarity index 100% rename from tests/misc/blackmisctest.h rename to tests/misc/swiftmisctest.h diff --git a/tests/misc/testcompress/testcompress.cpp b/tests/misc/testcompress/testcompress.cpp index 00a2a2ae98..75bf18d87a 100644 --- a/tests/misc/testcompress/testcompress.cpp +++ b/tests/misc/testcompress/testcompress.cpp @@ -75,7 +75,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestCompress); +SWIFTTEST_MAIN(MiscTest::CTestCompress); #include "testcompress.moc" diff --git a/tests/misc/testcontainers/testcontainers.cpp b/tests/misc/testcontainers/testcontainers.cpp index fdf5e9f58e..7729f49ff9 100644 --- a/tests/misc/testcontainers/testcontainers.cpp +++ b/tests/misc/testcontainers/testcontainers.cpp @@ -417,7 +417,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestContainers); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestContainers); #include "testcontainers.moc" diff --git a/tests/misc/testdatastream/testdatastream.cpp b/tests/misc/testdatastream/testdatastream.cpp index a4c14aeb03..757e666b63 100644 --- a/tests/misc/testdatastream/testdatastream.cpp +++ b/tests/misc/testdatastream/testdatastream.cpp @@ -64,7 +64,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestDataStream); +SWIFTTEST_MAIN(MiscTest::CTestDataStream); #include "testdatastream.moc" diff --git a/tests/misc/testdbus/testdbus.cpp b/tests/misc/testdbus/testdbus.cpp index 0975b9e7cd..6995b21399 100644 --- a/tests/misc/testdbus/testdbus.cpp +++ b/tests/misc/testdbus/testdbus.cpp @@ -80,7 +80,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestDBus); +SWIFTTEST_MAIN(MiscTest::CTestDBus); #include "testdbus.moc" diff --git a/tests/misc/testicon/testicon.cpp b/tests/misc/testicon/testicon.cpp index a7493f53c9..ca7bc64a3c 100644 --- a/tests/misc/testicon/testicon.cpp +++ b/tests/misc/testicon/testicon.cpp @@ -46,7 +46,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_MAIN(MiscTest::CTestIcon); +SWIFTTEST_MAIN(MiscTest::CTestIcon); #include "testicon.moc" diff --git a/tests/misc/testidentifier/testidentifier.cpp b/tests/misc/testidentifier/testidentifier.cpp index 9245cd1734..1c33426b9a 100644 --- a/tests/misc/testidentifier/testidentifier.cpp +++ b/tests/misc/testidentifier/testidentifier.cpp @@ -80,7 +80,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestIdentifier); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestIdentifier); #include "testidentifier.moc" diff --git a/tests/misc/testprocess/testprocess.cpp b/tests/misc/testprocess/testprocess.cpp index 58255c5279..d624b6859a 100644 --- a/tests/misc/testprocess/testprocess.cpp +++ b/tests/misc/testprocess/testprocess.cpp @@ -39,7 +39,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestProcess); +SWIFTTEST_MAIN(MiscTest::CTestProcess); #include "testprocess.moc" diff --git a/tests/misc/testpropertyindex/testpropertyindex.cpp b/tests/misc/testpropertyindex/testpropertyindex.cpp index 4410510493..e1e24bc0fe 100644 --- a/tests/misc/testpropertyindex/testpropertyindex.cpp +++ b/tests/misc/testpropertyindex/testpropertyindex.cpp @@ -107,7 +107,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestPropertyIndex); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestPropertyIndex); #include "testpropertyindex.moc" diff --git a/tests/misc/testsharedstate/testsharedstate.cpp b/tests/misc/testsharedstate/testsharedstate.cpp index 45a764144c..b509376ad2 100644 --- a/tests/misc/testsharedstate/testsharedstate.cpp +++ b/tests/misc/testsharedstate/testsharedstate.cpp @@ -209,7 +209,7 @@ namespace MiscTest } //! main -BLACKTEST_MAIN(MiscTest::CTestSharedState); +SWIFTTEST_MAIN(MiscTest::CTestSharedState); #include "testsharedstate.moc" diff --git a/tests/misc/testsharedstate/testsharedstate.h b/tests/misc/testsharedstate/testsharedstate.h index c4cb5a669e..d58cb8f02b 100644 --- a/tests/misc/testsharedstate/testsharedstate.h +++ b/tests/misc/testsharedstate/testsharedstate.h @@ -32,7 +32,7 @@ namespace MiscTest private: unsigned m_mask = ~0u; - BLACK_METACLASS(CTestFilter, BLACK_METAMEMBER(mask)); + SWIFT_METACLASS(CTestFilter, SWIFT_METAMEMBER(mask)); }; } @@ -46,7 +46,7 @@ namespace MiscTest class CTestScalarMutator : public swift::misc::shared_state::CScalarMutator { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_scalar_channel") + SWIFT_SHARED_STATE_CHANNEL("test_scalar_channel") public: //! Ctor CTestScalarMutator(QObject *parent) : CScalarMutator(parent) {} @@ -56,7 +56,7 @@ namespace MiscTest class CTestScalarJournal : public swift::misc::shared_state::CScalarJournal { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_scalar_channel") + SWIFT_SHARED_STATE_CHANNEL("test_scalar_channel") public: //! Ctor CTestScalarJournal(QObject *parent) : CScalarJournal(parent) {} @@ -66,7 +66,7 @@ namespace MiscTest class CTestScalarObserver : public swift::misc::shared_state::CScalarObserver { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_scalar_channel") + SWIFT_SHARED_STATE_CHANNEL("test_scalar_channel") public: //! Ctor CTestScalarObserver(QObject *parent) : CScalarObserver(parent) {} @@ -77,7 +77,7 @@ namespace MiscTest class CTestListMutator : public swift::misc::shared_state::CListMutator> { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_list_channel") + SWIFT_SHARED_STATE_CHANNEL("test_list_channel") public: //! Ctor CTestListMutator(QObject *parent) : CListMutator(parent) {} @@ -87,7 +87,7 @@ namespace MiscTest class CTestListJournal : public swift::misc::shared_state::CListJournal> { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_list_channel") + SWIFT_SHARED_STATE_CHANNEL("test_list_channel") public: //! Ctor CTestListJournal(QObject *parent) : CListJournal(parent) {} @@ -97,7 +97,7 @@ namespace MiscTest class CTestListObserver : public swift::misc::shared_state::CListObserver, CTestFilter> { Q_OBJECT - BLACK_SHARED_STATE_CHANNEL("test_list_channel") + SWIFT_SHARED_STATE_CHANNEL("test_list_channel") public: //! Ctor CTestListObserver(QObject *parent) : CListObserver(parent) {} diff --git a/tests/misc/testslot/testslot.cpp b/tests/misc/testslot/testslot.cpp index c4c62b9f77..a110f9c050 100644 --- a/tests/misc/testslot/testslot.cpp +++ b/tests/misc/testslot/testslot.cpp @@ -41,7 +41,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestSlot); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestSlot); #include "testslot.moc" diff --git a/tests/misc/teststatusmessage/teststatusmessage.cpp b/tests/misc/teststatusmessage/teststatusmessage.cpp index 7a068df0bd..224ca931e7 100644 --- a/tests/misc/teststatusmessage/teststatusmessage.cpp +++ b/tests/misc/teststatusmessage/teststatusmessage.cpp @@ -71,7 +71,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestStatusMessage); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestStatusMessage); #include "teststatusmessage.moc" diff --git a/tests/misc/teststringutils/teststringutils.cpp b/tests/misc/teststringutils/teststringutils.cpp index 3144cd55e7..50e6747791 100644 --- a/tests/misc/teststringutils/teststringutils.cpp +++ b/tests/misc/teststringutils/teststringutils.cpp @@ -164,7 +164,7 @@ namespace MiscTest } //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestStringUtils); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestStringUtils); #include "teststringutils.moc" diff --git a/tests/misc/testvaluecache/testvaluecache.cpp b/tests/misc/testvaluecache/testvaluecache.cpp index 8e2efbc1c0..f8b80cbec1 100644 --- a/tests/misc/testvaluecache/testvaluecache.cpp +++ b/tests/misc/testvaluecache/testvaluecache.cpp @@ -333,7 +333,7 @@ namespace MiscTest } // ns //! main -BLACKTEST_MAIN(MiscTest::CTestValueCache); +SWIFTTEST_MAIN(MiscTest::CTestValueCache); #include "testvaluecache.moc" diff --git a/tests/misc/testvalueobject.h b/tests/misc/testvalueobject.h index d03e6f3a82..b4d5ec5773 100644 --- a/tests/misc/testvalueobject.h +++ b/tests/misc/testvalueobject.h @@ -109,11 +109,10 @@ namespace swift::misc QString m_name; QString m_description; - BLACK_METACLASS( + SWIFT_METACLASS( CTestValueObject, - BLACK_METAMEMBER(name), - BLACK_METAMEMBER(description) - ); + SWIFT_METAMEMBER(name), + SWIFT_METAMEMBER(description)); }; //! \cond NO_DOXYGEN diff --git a/tests/misc/testvariantandmap/testvariantandmap.cpp b/tests/misc/testvariantandmap/testvariantandmap.cpp index 5f942c8e4b..7f77a5c313 100644 --- a/tests/misc/testvariantandmap/testvariantandmap.cpp +++ b/tests/misc/testvariantandmap/testvariantandmap.cpp @@ -195,7 +195,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestVariantAndMap); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestVariantAndMap); #include "testvariantandmap.moc" diff --git a/tests/misc/testworker/testworker.cpp b/tests/misc/testworker/testworker.cpp index 6b642737fa..a3043de0ec 100644 --- a/tests/misc/testworker/testworker.cpp +++ b/tests/misc/testworker/testworker.cpp @@ -47,7 +47,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestWorker); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestWorker); #include "testworker.moc" diff --git a/tests/misc/weather/testweather/testweather.cpp b/tests/misc/weather/testweather/testweather.cpp index 7f422c1d77..313c0a350c 100644 --- a/tests/misc/weather/testweather/testweather.cpp +++ b/tests/misc/weather/testweather/testweather.cpp @@ -163,7 +163,7 @@ namespace MiscTest } // namespace //! main -BLACKTEST_APPLESS_MAIN(MiscTest::CTestWeather); +SWIFTTEST_APPLESS_MAIN(MiscTest::CTestWeather); #include "testweather.moc" diff --git a/tests/blacksimpluginfsxp3d/CMakeLists.txt b/tests/simpluginfsxp3d/CMakeLists.txt similarity index 75% rename from tests/blacksimpluginfsxp3d/CMakeLists.txt rename to tests/simpluginfsxp3d/CMakeLists.txt index 0063ce0d66..f9b70a5dbd 100644 --- a/tests/blacksimpluginfsxp3d/CMakeLists.txt +++ b/tests/simpluginfsxp3d/CMakeLists.txt @@ -5,6 +5,6 @@ include(${PROJECT_SOURCE_DIR}/cmake/swift_test.cmake) add_swift_test( NAME simpluginfsx - SOURCES blacksimpluginfsxp3dtest.h testblacksimpluginfsxp3d.cpp blacksimpluginfsxp3dtest.h + SOURCES simpluginfsxp3dtest.h testsimpluginfsxp3d.cpp simpluginfsxp3dtest.h LINK_LIBRARIES Qt::Core fsxcommon tests_test ) diff --git a/tests/blacksimpluginfsxp3d/blacksimpluginfsxp3dtest.h b/tests/simpluginfsxp3d/simpluginfsxp3dtest.h similarity index 59% rename from tests/blacksimpluginfsxp3d/blacksimpluginfsxp3dtest.h rename to tests/simpluginfsxp3d/simpluginfsxp3dtest.h index 0bf244f99d..bc00d80c8f 100644 --- a/tests/blacksimpluginfsxp3d/blacksimpluginfsxp3dtest.h +++ b/tests/simpluginfsxp3d/simpluginfsxp3dtest.h @@ -7,10 +7,10 @@ /*! * \namespace Plugins - * \defgroup testpluginsfsxp3d BlackSimPluginFsxP3D Unit Tests + * \defgroup testpluginsfsxp3d SimPluginFsxP3D Unit Tests * \ingroup tests - * Unit tests for BlackSimPluginFsxP3D. Unit tests do have their own namespace, so - * the regular namespace BlackSimPlugin is completely free of unit tests. + * Unit tests for SimPluginFsxP3D. Unit tests do have their own namespace, so + * the regular namespace SimPlugin is completely free of unit tests. * Add any new tests to TestMain::unitMain as shown there. */ diff --git a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.cpp b/tests/simpluginfsxp3d/testsimpluginfsxp3d.cpp similarity index 93% rename from tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.cpp rename to tests/simpluginfsxp3d/testsimpluginfsxp3d.cpp index 0bb2369315..7557674591 100644 --- a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.cpp +++ b/tests/simpluginfsxp3d/testsimpluginfsxp3d.cpp @@ -5,19 +5,19 @@ /*! * \file - * \ingroup testblacksimplugin + * \ingroup testsimplugin */ -#include "testblacksimpluginfsxp3d.h" +#include "testsimpluginfsxp3d.h" #include "plugins/simulator/fsxcommon/simconnectdatadefinition.h" #include "plugins/simulator/fsxcommon/simconnectsymbols.h" #include "plugins/simulator/fsxcommon/simulatorfsxcommon.h" #include -using namespace BlackSimPlugin::FsxCommon; +using namespace swift::simplugin::fsxcommon; -namespace BlackSimPluginFsxP3D +namespace swift::simplugin::fsxp3d { void CSimPluginFsxP3d::resolveSymbols() { @@ -70,6 +70,6 @@ namespace BlackSimPluginFsxP3D } // ns //! main -BLACKTEST_MAIN(BlackSimPluginFsxP3D::CSimPluginFsxP3d); +SWIFTTEST_MAIN(SwiftSimPluginFsxP3D::CSimPluginFsxP3d); //! \endcond diff --git a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.h b/tests/simpluginfsxp3d/testsimpluginfsxp3d.h similarity index 91% rename from tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.h rename to tests/simpluginfsxp3d/testsimpluginfsxp3d.h index 9f0b2b6336..a9546e0ad2 100644 --- a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.h +++ b/tests/simpluginfsxp3d/testsimpluginfsxp3d.h @@ -5,12 +5,12 @@ //! \cond PRIVATE_TESTS //! \file -//! \ingroup testblacksimplugin +//! \ingroup testsimplugin #include "test.h" #include -namespace BlackSimPluginFsxP3D +namespace SwiftSimPluginFsxP3D { //! FSX/P3D common tests class CSimPluginFsxP3d : public QObject diff --git a/tests/test.h b/tests/test.h index 23ae75dbff..9c80bc898a 100644 --- a/tests/test.h +++ b/tests/test.h @@ -14,7 +14,7 @@ //! Implements a main() function that executes all tests in TestObject //! without instantiating a QApplication object. //! Also adds arguments automatically to print test results to an xml file. -#define BLACKTEST_INIT(TestObject) \ +#define SWIFTTEST_INIT(TestObject) \ TestObject to; \ QTEST_SET_MAIN_SOURCE_PATH \ \ @@ -35,12 +35,12 @@ //! Implements a main() function that executes all tests in TestObject //! without instantiating a QApplication object. //! Also adds arguments automatically to print test results to an xml file. -#define BLACKTEST_APPLESS_MAIN(TestObject) \ +#define SWIFTTEST_APPLESS_MAIN(TestObject) \ int main(int argc, char *argv[]) \ { \ try \ { \ - BLACKTEST_INIT(TestObject) \ + SWIFTTEST_INIT(TestObject) \ return QTest::qExec(&to, args); \ } \ catch (...) \ @@ -53,13 +53,13 @@ //! Implements a main() function that executes all tests in TestObject //! including instantiating a QCoreApplication object. //! Also adds arguments automatically to print test results to an xml file. -#define BLACKTEST_MAIN(TestObject) \ +#define SWIFTTEST_MAIN(TestObject) \ int main(int argc, char *argv[]) \ { \ try \ { \ QCoreApplication app(argc, argv); \ - BLACKTEST_INIT(TestObject) \ + SWIFTTEST_INIT(TestObject) \ return QTest::qExec(&to, args); \ } \ catch (...) \