From 3a2447770ffe238ccd70129f88c40e683d84c4c7 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 10 Nov 2024 20:21:07 +0100 Subject: [PATCH] refactor: Rename blackcore to swift::core --- cmake/pch_config.cmake | 10 +- cppcheck.supp | 2 +- samples/afvclient/afvclientbridge.cpp | 2 +- samples/afvclient/afvclientbridge.h | 34 ++--- samples/afvclient/main.cpp | 20 +-- samples/fsd/main.cpp | 4 +- samples/misc/main.cpp | 4 +- samples/misc/samplesperformance.cpp | 4 +- samples/miscdbus/servicetool.cpp | 4 +- samples/miscquantities/main.cpp | 4 +- samples/miscsim/main.cpp | 4 +- samples/miscsim/samplesmodelmapping.cpp | 4 +- src/CMakeLists.txt | 2 +- src/blackcore/registermetadata.cpp | 62 -------- src/blackcore/registermetadata.h | 17 --- src/blackgui/components/aircraftcomponent.cpp | 10 +- .../aircraftmodelstringcompleter.cpp | 8 +- .../aircraftmodelvalidationcomponent.cpp | 4 +- .../components/aircraftpartscomponent.cpp | 10 +- .../components/aircraftpartshistory.cpp | 8 +- src/blackgui/components/airportcompleter.cpp | 4 +- .../components/airportsmallcompleter.cpp | 4 +- .../components/applicationclosedialog.cpp | 4 +- .../components/applicationclosedialog.h | 4 +- .../components/atcbuttoncomponent.cpp | 4 +- src/blackgui/components/atcbuttoncomponent.h | 2 +- .../components/atcstationcomponent.cpp | 10 +- .../audioadvanceddistributedcomponent.cpp | 8 +- .../audiodevicevolumesetupcomponent.cpp | 14 +- .../audiodevicevolumesetupcomponent.h | 4 +- .../components/audionotificationcomponent.cpp | 6 +- .../components/autopublishcomponent.cpp | 6 +- src/blackgui/components/callsigncompleter.cpp | 8 +- .../components/cockpitcomcomponent.cpp | 12 +- .../cockpittranspondermodeledscomponent.cpp | 6 +- src/blackgui/components/commandinput.cpp | 8 +- .../components/configsimulatorcomponent.h | 4 +- ...ymodelsfromotherswiftversionscomponent.cpp | 4 +- .../copysettingsandcachescomponent.cpp | 6 +- .../copysettingsandcachescomponent.h | 24 ++-- src/blackgui/components/countryselector.cpp | 4 +- .../components/datainfoareacomponent.cpp | 2 +- .../components/datasettingscomponent.cpp | 2 +- .../components/datasettingscomponent.h | 4 +- .../dbaircraftcategorycomponent.cpp | 4 +- .../components/dbaircrafticaocomponent.cpp | 4 +- .../dbaircrafticaoselectorcomponent.cpp | 6 +- .../components/dbairlineicaocomponent.cpp | 4 +- .../components/dbairlineicaoselectorbase.cpp | 4 +- .../dbairlineicaoselectorcomponent.cpp | 4 +- .../dbairlinenameselectorcomponent.cpp | 4 +- .../dbautosimulatorstashingcomponent.cpp | 4 +- .../dbautosimulatorstashingcomponent.h | 6 +- .../components/dbautostashingcomponent.cpp | 4 +- .../components/dbautostashingcomponent.h | 6 +- .../components/dbcountrycomponent.cpp | 6 +- .../components/dbcountryselectorcomponent.cpp | 4 +- .../components/dbdistributorcomponent.cpp | 4 +- .../dbdistributorselectorcomponent.cpp | 6 +- .../components/dbliverycolorsearch.cpp | 2 +- .../components/dbliverycolorsearchdialog.cpp | 2 +- src/blackgui/components/dbliverycomponent.cpp | 4 +- .../components/dbliveryselectorcomponent.cpp | 6 +- src/blackgui/components/dbloaddatadialog.cpp | 8 +- .../components/dbloadoverviewcomponent.cpp | 6 +- src/blackgui/components/dblogincomponent.cpp | 6 +- src/blackgui/components/dblogincomponent.h | 8 +- .../components/dbmappingcomponent.cpp | 4 +- src/blackgui/components/dbmappingcomponent.h | 4 +- src/blackgui/components/dbmodelcomponent.cpp | 6 +- .../components/dbmodelkeycompleter.cpp | 4 +- .../components/dbmodelworkbenchcomponent.cpp | 6 +- .../components/dbownmodelscomponent.cpp | 6 +- .../components/dbownmodelsetformdialog.cpp | 4 +- .../components/dbquickmappingwizard.cpp | 10 +- .../components/dbreducemodelduplicates.cpp | 2 +- .../components/dbreducemodelduplicates.h | 6 +- src/blackgui/components/dbstashcomponent.cpp | 12 +- src/blackgui/components/dbstashcomponent.h | 4 +- .../distributorpreferencescomponent.cpp | 2 +- .../components/firstmodelsetcomponent.cpp | 2 +- .../components/firstmodelsetcomponent.h | 2 +- .../components/flightplancomponent.cpp | 10 +- src/blackgui/components/hotkeydialog.cpp | 10 +- src/blackgui/components/hotkeydialog.h | 2 +- .../components/infobarstatuscomponent.cpp | 14 +- .../components/infobarstatuscomponent.h | 4 +- .../infobarwebreadersstatuscomponent.cpp | 4 +- .../components/installxswiftbuscomponent.h | 6 +- .../components/internalscomponent.cpp | 10 +- .../components/interpolationcomponent.cpp | 2 +- .../components/interpolationlogdisplay.cpp | 10 +- .../components/interpolationlogdisplay.h | 28 ++-- .../interpolationlogdisplaydialog.cpp | 4 +- .../interpolationlogdisplaydialog.h | 8 +- .../interpolationsetupcomponent.cpp | 4 +- .../components/legalinfocomponent.cpp | 4 +- src/blackgui/components/legalinfocomponent.h | 4 +- src/blackgui/components/logcomponent.cpp | 4 +- src/blackgui/components/logincomponent.cpp | 20 +-- src/blackgui/components/logincomponent.h | 6 +- .../components/mainkeypadareacomponent.cpp | 14 +- .../components/mainkeypadareacomponent.h | 6 +- src/blackgui/components/mappingcomponent.cpp | 8 +- .../matchingstatisticscomponent.cpp | 4 +- .../components/modelbrowsercomponent.cpp | 8 +- .../components/modelmatchercomponent.cpp | 4 +- .../components/modelmatchercomponent.h | 4 +- .../components/modelmatcherlogcomponent.cpp | 8 +- .../components/modelmatcherlogenable.cpp | 8 +- .../networkaircraftvaluescomponent.cpp | 6 +- .../components/networkdetailscomponent.cpp | 8 +- .../components/networkdetailscomponent.h | 4 +- .../components/ownaircraftcomponent.cpp | 14 +- src/blackgui/components/radarcomponent.cpp | 4 +- src/blackgui/components/radarcomponent.h | 6 +- .../components/rawfsdmessagescomponent.cpp | 14 +- .../components/rawfsdmessagescomponent.h | 4 +- src/blackgui/components/registercomponent.cpp | 6 +- src/blackgui/components/registercomponent.h | 2 +- .../components/remoteaircraftselector.cpp | 6 +- .../components/serverlistselector.cpp | 8 +- .../components/settingsadvancedcomponent.h | 4 +- src/blackgui/components/settingscomponent.cpp | 2 +- .../components/settingsguicomponent.cpp | 4 +- .../components/settingshotkeycomponent.cpp | 10 +- .../components/settingshotkeycomponent.h | 8 +- .../components/settingsmatchingcomponent.cpp | 4 +- .../components/settingsmatchingcomponent.h | 4 +- .../components/settingsmodelcomponent.cpp | 4 +- .../components/settingsmodelcomponent.h | 6 +- .../components/settingsnetworkcomponent.cpp | 4 +- .../components/settingsnetworkcomponent.h | 2 +- .../settingsnetworkserverscomponent.cpp | 8 +- .../components/settingssimulatorcomponent.cpp | 10 +- .../components/settingssimulatorcomponent.h | 8 +- .../settingsvatsimreaderscomponent.cpp | 4 +- .../settingsvatsimreaderscomponent.h | 6 +- .../components/setuploadingdialog.cpp | 6 +- .../components/simulatorcomponent.cpp | 10 +- src/blackgui/components/simulatorselector.cpp | 4 +- .../components/textmessagecomponent.cpp | 14 +- .../components/transpondermodecomponent.cpp | 4 +- .../components/updateinfocomponent.cpp | 2 +- src/blackgui/components/updateinfocomponent.h | 4 +- src/blackgui/components/usercomponent.cpp | 6 +- src/blackgui/copyxswiftbusdialog.cpp | 4 +- src/blackgui/editors/aircrafticaoform.cpp | 2 +- src/blackgui/editors/airlineicaoform.cpp | 2 +- src/blackgui/editors/cockpitcomform.cpp | 4 +- src/blackgui/editors/coordinateform.cpp | 6 +- src/blackgui/editors/form.h | 4 +- src/blackgui/editors/liveryform.cpp | 2 +- src/blackgui/editors/matchingform.cpp | 2 +- src/blackgui/editors/ownmodelsetform.cpp | 2 +- src/blackgui/editors/situationform.cpp | 2 +- .../filters/aircrafticaofilterbar.cpp | 4 +- src/blackgui/guiactionbind.cpp | 2 +- src/blackgui/guiactionbind.h | 16 +-- src/blackgui/guiapplication.cpp | 16 +-- src/blackgui/guiapplication.h | 16 +-- src/blackgui/loginmodebuttons.cpp | 6 +- src/blackgui/loginmodebuttons.h | 2 +- src/blackgui/menus/aircraftmodelmenus.cpp | 6 +- src/blackgui/menus/menuaction.cpp | 2 +- src/blackgui/models/actionmodel.cpp | 4 +- src/blackgui/overlaymessages.cpp | 8 +- src/blackgui/pluginconfig.h | 2 +- src/blackgui/qml/AFVMap.qml | 2 +- src/blackgui/views/flightplandialog.cpp | 4 +- src/blackgui/views/simulatedaircraftview.cpp | 6 +- src/blackgui/views/simulatedaircraftview.h | 6 +- src/config/buildconfig.h | 4 +- src/{blackcore => core}/CMakeLists.txt | 4 +- src/{blackcore => core}/actionbind.cpp | 4 +- src/{blackcore => core}/actionbind.h | 16 +-- .../afv/audio/callsigndelaycache.cpp | 4 +- .../afv/audio/callsigndelaycache.h | 6 +- .../afv/audio/callsignsampleprovider.cpp | 8 +- .../afv/audio/callsignsampleprovider.h | 10 +- src/{blackcore => core}/afv/audio/input.cpp | 4 +- src/{blackcore => core}/afv/audio/input.h | 6 +- src/{blackcore => core}/afv/audio/output.cpp | 4 +- src/{blackcore => core}/afv/audio/output.h | 6 +- .../afv/audio/receiversampleprovider.cpp | 4 +- .../afv/audio/receiversampleprovider.h | 10 +- .../afv/audio/soundcardsampleprovider.cpp | 4 +- .../afv/audio/soundcardsampleprovider.h | 8 +- .../afv/clients/afvclient.cpp | 18 +-- .../afv/clients/afvclient.h | 46 +++--- .../afv/connection/apiserverconnection.cpp | 4 +- .../afv/connection/apiserverconnection.h | 10 +- .../afv/connection/clientconnection.cpp | 6 +- .../afv/connection/clientconnection.h | 16 +-- .../afv/connection/clientconnectiondata.cpp | 6 +- .../afv/connection/clientconnectiondata.h | 14 +- src/{blackcore => core}/afv/constants.h | 6 +- .../afv/crypto/cryptodtochannel.cpp | 4 +- .../afv/crypto/cryptodtochannel.h | 10 +- .../afv/crypto/cryptodtoheaderdto.h | 8 +- .../afv/crypto/cryptodtomode.h | 8 +- .../afv/crypto/cryptodtoserializer.cpp | 4 +- .../afv/crypto/cryptodtoserializer.h | 12 +- src/{blackcore => core}/afv/dto.h | 6 +- .../afv/model/afvmapreader.cpp | 8 +- .../afv/model/afvmapreader.h | 12 +- .../afv/model/atcstationmodel.cpp | 6 +- .../afv/model/atcstationmodel.h | 14 +- src/{blackcore => core}/aircraftmatcher.cpp | 8 +- src/{blackcore => core}/aircraftmatcher.h | 12 +- src/{blackcore => core}/airspaceanalyzer.cpp | 8 +- src/{blackcore => core}/airspaceanalyzer.h | 14 +- src/{blackcore => core}/airspacemonitor.cpp | 22 +-- src/{blackcore => core}/airspacemonitor.h | 24 ++-- src/{blackcore => core}/application.cpp | 44 +++--- src/{blackcore => core}/application.h | 60 ++++---- .../application/applicationsettings.h | 6 +- .../application/updatesettings.h | 8 +- src/{blackcore => core}/audio/audiosettings.h | 6 +- src/{blackcore => core}/context/context.cpp | 6 +- src/{blackcore => core}/context/context.h | 14 +- .../context/contextapplication.cpp | 20 +-- .../context/contextapplication.h | 30 ++-- .../context/contextapplicationempty.h | 18 +-- .../context/contextapplicationimpl.cpp | 8 +- .../context/contextapplicationimpl.h | 50 +++---- .../context/contextapplicationproxy.cpp | 6 +- .../context/contextapplicationproxy.h | 46 +++--- .../context/contextaudio.cpp | 22 +-- .../context/contextaudio.h | 58 ++++---- .../context/contextaudioimpl.cpp | 8 +- .../context/contextaudioimpl.h | 34 ++--- .../context/contextaudioproxy.cpp | 8 +- .../context/contextaudioproxy.h | 32 ++--- .../context/contextnetwork.cpp | 14 +- .../context/contextnetwork.h | 26 ++-- .../context/contextnetworkempty.h | 12 +- .../context/contextnetworkimpl.cpp | 26 ++-- .../context/contextnetworkimpl.h | 124 ++++++++-------- .../context/contextnetworkproxy.cpp | 4 +- .../context/contextnetworkproxy.h | 130 ++++++++--------- .../context/contextownaircraft.cpp | 14 +- .../context/contextownaircraft.h | 26 ++-- .../context/contextownaircraftempty.h | 12 +- .../context/contextownaircraftimpl.cpp | 20 +-- .../context/contextownaircraftimpl.h | 34 ++--- .../context/contextownaircraftproxy.cpp | 4 +- .../context/contextownaircraftproxy.h | 46 +++--- .../context/contextsimulator.cpp | 14 +- .../context/contextsimulator.h | 26 ++-- .../context/contextsimulatorempty.h | 12 +- .../context/contextsimulatorimpl.cpp | 26 ++-- .../context/contextsimulatorimpl.h | 132 +++++++++--------- .../context/contextsimulatorproxy.cpp | 4 +- .../context/contextsimulatorproxy.h | 120 ++++++++-------- src/{blackcore => core}/cookiemanager.cpp | 4 +- src/{blackcore => core}/cookiemanager.h | 10 +- src/{blackcore => core}/corefacade.cpp | 40 +++--- src/{blackcore => core}/corefacade.h | 74 +++++----- src/{blackcore => core}/corefacadeconfig.cpp | 4 +- src/{blackcore => core}/corefacadeconfig.h | 10 +- src/{blackcore => core}/coremodeenums.h | 6 +- .../data/authenticateduser.h | 8 +- src/{blackcore => core}/data/dbcaches.h | 6 +- src/{blackcore => core}/data/globalsetup.cpp | 8 +- src/{blackcore => core}/data/globalsetup.h | 14 +- .../data/launchersetup.cpp | 6 +- src/{blackcore => core}/data/launchersetup.h | 20 +-- src/{blackcore => core}/data/networksetup.cpp | 6 +- src/{blackcore => core}/data/networksetup.h | 16 +-- src/{blackcore => core}/data/vatsimsetup.cpp | 6 +- src/{blackcore => core}/data/vatsimsetup.h | 14 +- .../db/airportdatareader.cpp | 8 +- .../db/airportdatareader.h | 18 +-- .../db/backgrounddataupdater.cpp | 16 +-- .../db/backgrounddataupdater.h | 12 +- .../db/databaseauthentication.cpp | 8 +- .../db/databaseauthentication.h | 14 +- src/{blackcore => core}/db/databasereader.cpp | 18 +-- src/{blackcore => core}/db/databasereader.h | 22 +-- .../db/databasereaderconfig.cpp | 8 +- .../db/databasereaderconfig.h | 24 ++-- src/{blackcore => core}/db/databaseutils.cpp | 8 +- src/{blackcore => core}/db/databaseutils.h | 14 +- src/{blackcore => core}/db/databasewriter.cpp | 12 +- src/{blackcore => core}/db/databasewriter.h | 10 +- src/{blackcore => core}/db/icaodatareader.cpp | 12 +- src/{blackcore => core}/db/icaodatareader.h | 24 ++-- src/{blackcore => core}/db/infodatareader.cpp | 10 +- src/{blackcore => core}/db/infodatareader.h | 12 +- .../db/modeldatareader.cpp | 16 +-- src/{blackcore => core}/db/modeldatareader.h | 22 +-- src/{blackcore => core}/fsd/addatc.cpp | 6 +- src/{blackcore => core}/fsd/addatc.h | 12 +- src/{blackcore => core}/fsd/addpilot.cpp | 6 +- src/{blackcore => core}/fsd/addpilot.h | 12 +- src/{blackcore => core}/fsd/atcdataupdate.cpp | 6 +- src/{blackcore => core}/fsd/atcdataupdate.h | 12 +- src/{blackcore => core}/fsd/authchallenge.cpp | 4 +- src/{blackcore => core}/fsd/authchallenge.h | 10 +- src/{blackcore => core}/fsd/authresponse.cpp | 4 +- src/{blackcore => core}/fsd/authresponse.h | 10 +- .../fsd/clientidentification.cpp | 4 +- .../fsd/clientidentification.h | 10 +- src/{blackcore => core}/fsd/clientquery.cpp | 6 +- src/{blackcore => core}/fsd/clientquery.h | 12 +- .../fsd/clientresponse.cpp | 6 +- src/{blackcore => core}/fsd/clientresponse.h | 12 +- src/{blackcore => core}/fsd/deleteatc.cpp | 4 +- src/{blackcore => core}/fsd/deleteatc.h | 10 +- src/{blackcore => core}/fsd/deletepilot.cpp | 4 +- src/{blackcore => core}/fsd/deletepilot.h | 10 +- src/{blackcore => core}/fsd/enums.h | 22 +-- .../fsd/euroscopesimdata.cpp | 4 +- .../fsd/euroscopesimdata.h | 12 +- src/{blackcore => core}/fsd/flightplan.cpp | 6 +- src/{blackcore => core}/fsd/flightplan.h | 12 +- src/{blackcore => core}/fsd/fsdclient.cpp | 74 +++++----- src/{blackcore => core}/fsd/fsdclient.h | 18 +-- .../fsd/fsdidentification.cpp | 4 +- .../fsd/fsdidentification.h | 10 +- .../fsd/interimpilotdataupdate.cpp | 6 +- .../fsd/interimpilotdataupdate.h | 10 +- src/{blackcore => core}/fsd/killrequest.cpp | 4 +- src/{blackcore => core}/fsd/killrequest.h | 10 +- src/{blackcore => core}/fsd/messagebase.cpp | 4 +- src/{blackcore => core}/fsd/messagebase.h | 10 +- src/{blackcore => core}/fsd/mute.cpp | 4 +- src/{blackcore => core}/fsd/mute.h | 10 +- src/{blackcore => core}/fsd/pbh.h | 6 +- .../fsd/pilotdataupdate.cpp | 8 +- src/{blackcore => core}/fsd/pilotdataupdate.h | 12 +- src/{blackcore => core}/fsd/ping.cpp | 4 +- src/{blackcore => core}/fsd/ping.h | 10 +- .../fsd/planeinforequest.cpp | 4 +- .../fsd/planeinforequest.h | 10 +- .../fsd/planeinforequestfsinn.cpp | 4 +- .../fsd/planeinforequestfsinn.h | 10 +- .../fsd/planeinformation.cpp | 4 +- .../fsd/planeinformation.h | 10 +- .../fsd/planeinformationfsinn.cpp | 4 +- .../fsd/planeinformationfsinn.h | 10 +- src/{blackcore => core}/fsd/pong.cpp | 4 +- src/{blackcore => core}/fsd/pong.h | 10 +- src/{blackcore => core}/fsd/rehost.cpp | 2 +- src/{blackcore => core}/fsd/rehost.h | 8 +- .../fsd/revbclientparts.cpp | 6 +- src/{blackcore => core}/fsd/revbclientparts.h | 12 +- src/{blackcore => core}/fsd/serializer.cpp | 4 +- src/{blackcore => core}/fsd/serializer.h | 6 +- src/{blackcore => core}/fsd/servererror.cpp | 4 +- src/{blackcore => core}/fsd/servererror.h | 12 +- src/{blackcore => core}/fsd/textmessage.cpp | 4 +- src/{blackcore => core}/fsd/textmessage.h | 10 +- .../fsd/visualpilotdataperiodic.cpp | 2 +- .../fsd/visualpilotdataperiodic.h | 8 +- .../fsd/visualpilotdatastopped.cpp | 2 +- .../fsd/visualpilotdatastopped.h | 8 +- .../fsd/visualpilotdatatoggle.cpp | 2 +- .../fsd/visualpilotdatatoggle.h | 8 +- .../fsd/visualpilotdataupdate.cpp | 2 +- .../fsd/visualpilotdataupdate.h | 8 +- .../githubpackagesreader.cpp | 6 +- .../githubpackagesreader.h | 6 +- src/{blackcore => core}/inputmanager.cpp | 4 +- src/{blackcore => core}/inputmanager.h | 14 +- src/{blackcore => core}/modelsetbuilder.cpp | 12 +- src/{blackcore => core}/modelsetbuilder.h | 16 +-- src/{blackcore => core}/pluginmanager.cpp | 6 +- src/{blackcore => core}/pluginmanager.h | 10 +- .../pluginmanagersimulator.cpp | 12 +- .../pluginmanagersimulator.h | 18 +-- src/{blackcore => core}/progress.h | 10 +- src/{blackcore => core}/readme.txt | 0 src/core/registermetadata.cpp | 62 ++++++++ src/core/registermetadata.h | 17 +++ src/{blackcore => core}/setupreader.cpp | 10 +- src/{blackcore => core}/setupreader.h | 24 ++-- src/{blackcore => core}/simulator.cpp | 16 +-- src/{blackcore => core}/simulator.h | 52 +++---- .../blackcore.dox => core/swiftcore.dox} | 14 +- .../swiftcoreexport.h} | 14 +- src/{blackcore => core}/threadedreader.cpp | 8 +- src/{blackcore => core}/threadedreader.h | 12 +- .../vatsim/vatsimdatafilereader.cpp | 8 +- .../vatsim/vatsimdatafilereader.h | 16 +-- .../vatsim/vatsimmetarreader.cpp | 8 +- .../vatsim/vatsimmetarreader.h | 16 +-- .../vatsim/vatsimserverfilereader.cpp | 8 +- .../vatsim/vatsimserverfilereader.h | 18 +-- .../vatsim/vatsimsettings.cpp | 8 +- .../vatsim/vatsimsettings.h | 32 ++--- .../vatsim/vatsimstatusfilereader.cpp | 10 +- .../vatsim/vatsimstatusfilereader.h | 16 +-- src/{blackcore => core}/webdataservices.cpp | 40 +++--- src/{blackcore => core}/webdataservices.h | 60 ++++---- src/{blackcore => core}/webdataservicesms.cpp | 8 +- src/{blackcore => core}/webdataservicesms.h | 10 +- src/{blackcore => core}/webreaderflags.cpp | 4 +- src/{blackcore => core}/webreaderflags.h | 16 +-- src/misc/network/data/lastserver.h | 6 +- src/misc/sharedstate/dbus/hub.h | 2 +- src/misc/simulation/aircraftmodelloader.h | 2 +- src/misc/simulation/remoteaircraftprovider.h | 2 +- .../simulation/settings/fgswiftbussettings.h | 2 +- src/misc/simulation/simulatorplugininfo.h | 2 +- .../simulator/emulated/simulatoremulated.cpp | 6 +- .../simulator/emulated/simulatoremulated.h | 16 +-- .../emulated/simulatoremulatedfactory.cpp | 10 +- .../emulated/simulatoremulatedfactory.h | 16 +-- .../simulatoremulatedmonitordialog.cpp | 2 +- .../flightgear/flightgearmpaircraft.cpp | 4 +- .../flightgear/flightgearmpaircraft.h | 4 +- .../flightgear/simulatorflightgear.cpp | 4 +- .../flightgear/simulatorflightgear.h | 22 +-- .../simulatorflightgearconfigwindow.cpp | 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/lobbyclient.cpp | 4 +- src/plugins/simulator/fs9/simulatorfs9.cpp | 2 +- src/plugins/simulator/fs9/simulatorfs9.h | 26 ++-- .../simulator/fscommon/simulatorfscommon.cpp | 4 +- .../simulator/fscommon/simulatorfscommon.h | 4 +- src/plugins/simulator/fsx/simulatorfsx.cpp | 2 +- src/plugins/simulator/fsx/simulatorfsx.h | 2 +- .../simulator/fsx/simulatorfsxfactory.cpp | 2 +- .../simulator/fsx/simulatorfsxfactory.h | 16 +-- .../fsxcommon/fsxsettingscomponent.cpp | 6 +- .../simulator/fsxcommon/simconnectobject.cpp | 6 +- .../fsxcommon/simconnectsettingscomponent.cpp | 4 +- .../fsxcommon/simulatorfsxcommon.cpp | 4 +- .../simulator/fsxcommon/simulatorfsxcommon.h | 16 +-- .../fsxcommon/simulatorfsxsimconnectproc.cpp | 4 +- src/plugins/simulator/msfs/simulatormsfs.cpp | 2 +- src/plugins/simulator/msfs/simulatormsfs.h | 2 +- .../simulator/msfs/simulatormsfsfactory.cpp | 2 +- .../simulator/msfs/simulatormsfsfactory.h | 16 +-- src/plugins/simulator/p3d/simulatorp3d.cpp | 2 +- src/plugins/simulator/p3d/simulatorp3d.h | 6 +- .../simulator/p3d/simulatorp3dfactory.cpp | 10 +- .../simulator/p3d/simulatorp3dfactory.h | 16 +-- .../plugincommon/simulatorplugincommon.cpp | 2 +- .../plugincommon/simulatorplugincommon.h | 6 +- .../simulator/xplane/simulatorxplane.cpp | 4 +- .../simulator/xplane/simulatorxplane.h | 22 +-- .../simulator/xplane/xplanempaircraft.cpp | 4 +- .../simulator/xplane/xplanempaircraft.h | 4 +- .../simulatorxplaneconfigwindow.cpp | 4 +- src/swiftcore/main.cpp | 4 +- src/swiftcore/swiftcore.cpp | 8 +- src/swiftcore/swiftcore.h | 2 +- src/swiftdata/main.cpp | 8 +- src/swiftdata/swiftdata.cpp | 8 +- src/swiftdata/swiftdata.h | 6 +- src/swiftdata/swiftdatamenus.cpp | 2 +- src/swiftguistandard/main.cpp | 2 +- src/swiftguistandard/swiftguistd.cpp | 16 +-- src/swiftguistandard/swiftguistd.h | 6 +- src/swiftguistandard/swiftguistdaircraft.cpp | 4 +- .../swiftguistdapplication.cpp | 8 +- src/swiftguistandard/swiftguistdinit.cpp | 12 +- src/swiftguistandard/swiftguistdmenus.cpp | 2 +- src/swiftlauncher/main.cpp | 10 +- src/swiftlauncher/swiftlauncher.cpp | 14 +- src/swiftlauncher/swiftlauncher.h | 10 +- tests/CMakeLists.txt | 2 +- tests/{blackcore => core}/CMakeLists.txt | 0 tests/{blackcore => core}/blackcoretest.h | 8 +- .../context/CMakeLists.txt | 0 .../context/testcontext/testcontext.cpp | 22 +-- tests/{blackcore => core}/fsd/CMakeLists.txt | 0 .../fsd/testfsdclient/testfsdclient.cpp | 4 +- .../fsd/testfsdmessages/testfsdmessages.cpp | 60 ++++---- .../scripts/perllib/BlackCore/Expect/Dict.pm | 24 ++-- .../scripts/perllib/BlackCore/Expect/Test.pm | 8 +- .../scripts/test_sample_cli_client.pl | 4 +- .../testconnectivity/CMakeLists.txt | 0 .../testconnectivity/testconnectivity.cpp | 16 +-- .../testconnectivity/testconnectivity.h | 4 +- .../testreaders/CMakeLists.txt | 0 .../testreaders/testreaders.cpp | 26 ++-- 482 files changed, 2611 insertions(+), 2611 deletions(-) delete mode 100644 src/blackcore/registermetadata.cpp delete mode 100644 src/blackcore/registermetadata.h rename src/{blackcore => core}/CMakeLists.txt (98%) rename src/{blackcore => core}/actionbind.cpp (96%) rename src/{blackcore => core}/actionbind.h (88%) rename src/{blackcore => core}/afv/audio/callsigndelaycache.cpp (95%) rename src/{blackcore => core}/afv/audio/callsigndelaycache.h (90%) rename src/{blackcore => core}/afv/audio/callsignsampleprovider.cpp (97%) rename src/{blackcore => core}/afv/audio/callsignsampleprovider.h (93%) rename src/{blackcore => core}/afv/audio/input.cpp (99%) rename src/{blackcore => core}/afv/audio/input.h (97%) rename src/{blackcore => core}/afv/audio/output.cpp (98%) rename src/{blackcore => core}/afv/audio/output.h (96%) rename src/{blackcore => core}/afv/audio/receiversampleprovider.cpp (98%) rename src/{blackcore => core}/afv/audio/receiversampleprovider.h (93%) rename src/{blackcore => core}/afv/audio/soundcardsampleprovider.cpp (98%) rename src/{blackcore => core}/afv/audio/soundcardsampleprovider.h (91%) rename src/{blackcore => core}/afv/clients/afvclient.cpp (99%) rename src/{blackcore => core}/afv/clients/afvclient.h (91%) rename src/{blackcore => core}/afv/connection/apiserverconnection.cpp (99%) rename src/{blackcore => core}/afv/connection/apiserverconnection.h (96%) rename src/{blackcore => core}/afv/connection/clientconnection.cpp (98%) rename src/{blackcore => core}/afv/connection/clientconnection.h (90%) rename src/{blackcore => core}/afv/connection/clientconnectiondata.cpp (94%) rename src/{blackcore => core}/afv/connection/clientconnectiondata.h (89%) rename src/{blackcore => core}/afv/constants.h (78%) rename src/{blackcore => core}/afv/crypto/cryptodtochannel.cpp (98%) rename src/{blackcore => core}/afv/crypto/cryptodtochannel.h (87%) rename src/{blackcore => core}/afv/crypto/cryptodtoheaderdto.h (73%) rename src/{blackcore => core}/afv/crypto/cryptodtomode.h (68%) rename src/{blackcore => core}/afv/crypto/cryptodtoserializer.cpp (97%) rename src/{blackcore => core}/afv/crypto/cryptodtoserializer.h (95%) rename src/{blackcore => core}/afv/dto.h (98%) rename src/{blackcore => core}/afv/model/afvmapreader.cpp (95%) rename src/{blackcore => core}/afv/model/afvmapreader.h (78%) rename src/{blackcore => core}/afv/model/atcstationmodel.cpp (96%) rename src/{blackcore => core}/afv/model/atcstationmodel.h (87%) rename src/{blackcore => core}/aircraftmatcher.cpp (99%) rename src/{blackcore => core}/aircraftmatcher.h (99%) rename src/{blackcore => core}/airspaceanalyzer.cpp (98%) rename src/{blackcore => core}/airspaceanalyzer.h (95%) rename src/{blackcore => core}/airspacemonitor.cpp (99%) rename src/{blackcore => core}/airspacemonitor.h (97%) rename src/{blackcore => core}/application.cpp (98%) rename src/{blackcore => core}/application.h (94%) rename src/{blackcore => core}/application/applicationsettings.h (95%) rename src/{blackcore => core}/application/updatesettings.h (89%) rename src/{blackcore => core}/audio/audiosettings.h (94%) rename src/{blackcore => core}/context/context.cpp (96%) rename src/{blackcore => core}/context/context.h (94%) rename src/{blackcore => core}/context/contextapplication.cpp (91%) rename src/{blackcore => core}/context/contextapplication.h (86%) rename src/{blackcore => core}/context/contextapplicationempty.h (91%) rename src/{blackcore => core}/context/contextapplicationimpl.cpp (97%) rename src/{blackcore => core}/context/contextapplicationimpl.h (58%) rename src/{blackcore => core}/context/contextapplicationproxy.cpp (98%) rename src/{blackcore => core}/context/contextapplicationproxy.h (67%) rename src/{blackcore => core}/context/contextaudio.cpp (97%) rename src/{blackcore => core}/context/contextaudio.h (90%) rename src/{blackcore => core}/context/contextaudioimpl.cpp (93%) rename src/{blackcore => core}/context/contextaudioimpl.h (64%) rename src/{blackcore => core}/context/contextaudioproxy.cpp (96%) rename src/{blackcore => core}/context/contextaudioproxy.h (72%) rename src/{blackcore => core}/context/contextnetwork.cpp (89%) rename src/{blackcore => core}/context/contextnetwork.h (95%) rename src/{blackcore => core}/context/contextnetworkempty.h (98%) rename src/{blackcore => core}/context/contextnetworkimpl.cpp (99%) rename src/{blackcore => core}/context/contextnetworkimpl.h (83%) rename src/{blackcore => core}/context/contextnetworkproxy.cpp (99%) rename src/{blackcore => core}/context/contextnetworkproxy.h (64%) rename src/{blackcore => core}/context/contextownaircraft.cpp (88%) rename src/{blackcore => core}/context/contextownaircraft.h (88%) rename src/{blackcore => core}/context/contextownaircraftempty.h (94%) rename src/{blackcore => core}/context/contextownaircraftimpl.cpp (97%) rename src/{blackcore => core}/context/contextownaircraftimpl.h (93%) rename src/{blackcore => core}/context/contextownaircraftproxy.cpp (98%) rename src/{blackcore => core}/context/contextownaircraftproxy.h (71%) rename src/{blackcore => core}/context/contextsimulator.cpp (83%) rename src/{blackcore => core}/context/contextsimulator.h (95%) rename src/{blackcore => core}/context/contextsimulatorempty.h (98%) rename src/{blackcore => core}/context/contextsimulatorimpl.cpp (99%) rename src/{blackcore => core}/context/contextsimulatorimpl.h (76%) rename src/{blackcore => core}/context/contextsimulatorproxy.cpp (99%) rename src/{blackcore => core}/context/contextsimulatorproxy.h (61%) rename src/{blackcore => core}/cookiemanager.cpp (96%) rename src/{blackcore => core}/cookiemanager.h (88%) rename src/{blackcore => core}/corefacade.cpp (96%) rename src/{blackcore => core}/corefacade.h (71%) rename src/{blackcore => core}/corefacadeconfig.cpp (97%) rename src/{blackcore => core}/corefacadeconfig.h (95%) rename src/{blackcore => core}/coremodeenums.h (94%) rename src/{blackcore => core}/data/authenticateduser.h (85%) rename src/{blackcore => core}/data/dbcaches.h (97%) rename src/{blackcore => core}/data/globalsetup.cpp (97%) rename src/{blackcore => core}/data/globalsetup.h (96%) rename src/{blackcore => core}/data/launchersetup.cpp (93%) rename src/{blackcore => core}/data/launchersetup.h (85%) rename src/{blackcore => core}/data/networksetup.cpp (95%) rename src/{blackcore => core}/data/networksetup.h (83%) rename src/{blackcore => core}/data/vatsimsetup.cpp (95%) rename src/{blackcore => core}/data/vatsimsetup.h (94%) rename src/{blackcore => core}/db/airportdatareader.cpp (98%) rename src/{blackcore => core}/db/airportdatareader.h (86%) rename src/{blackcore => core}/db/backgrounddataupdater.cpp (96%) rename src/{blackcore => core}/db/backgrounddataupdater.h (90%) rename src/{blackcore => core}/db/databaseauthentication.cpp (97%) rename src/{blackcore => core}/db/databaseauthentication.h (78%) rename src/{blackcore => core}/db/databasereader.cpp (99%) rename src/{blackcore => core}/db/databasereader.h (97%) rename src/{blackcore => core}/db/databasereaderconfig.cpp (98%) rename src/{blackcore => core}/db/databasereaderconfig.h (87%) rename src/{blackcore => core}/db/databaseutils.cpp (99%) rename src/{blackcore => core}/db/databaseutils.h (95%) rename src/{blackcore => core}/db/databasewriter.cpp (98%) rename src/{blackcore => core}/db/databasewriter.h (95%) rename src/{blackcore => core}/db/icaodatareader.cpp (99%) rename src/{blackcore => core}/db/icaodatareader.h (90%) rename src/{blackcore => core}/db/infodatareader.cpp (98%) rename src/{blackcore => core}/db/infodatareader.h (93%) rename src/{blackcore => core}/db/modeldatareader.cpp (99%) rename src/{blackcore => core}/db/modeldatareader.h (91%) rename src/{blackcore => core}/fsd/addatc.cpp (93%) rename src/{blackcore => core}/fsd/addatc.h (90%) rename src/{blackcore => core}/fsd/addpilot.cpp (94%) rename src/{blackcore => core}/fsd/addpilot.h (90%) rename src/{blackcore => core}/fsd/atcdataupdate.cpp (95%) rename src/{blackcore => core}/fsd/atcdataupdate.h (89%) rename src/{blackcore => core}/fsd/authchallenge.cpp (94%) rename src/{blackcore => core}/fsd/authchallenge.h (85%) rename src/{blackcore => core}/fsd/authresponse.cpp (94%) rename src/{blackcore => core}/fsd/authresponse.h (86%) rename src/{blackcore => core}/fsd/clientidentification.cpp (96%) rename src/{blackcore => core}/fsd/clientidentification.h (91%) rename src/{blackcore => core}/fsd/clientquery.cpp (92%) rename src/{blackcore => core}/fsd/clientquery.h (88%) rename src/{blackcore => core}/fsd/clientresponse.cpp (92%) rename src/{blackcore => core}/fsd/clientresponse.h (86%) rename src/{blackcore => core}/fsd/deleteatc.cpp (93%) rename src/{blackcore => core}/fsd/deleteatc.h (84%) rename src/{blackcore => core}/fsd/deletepilot.cpp (94%) rename src/{blackcore => core}/fsd/deletepilot.h (86%) rename src/{blackcore => core}/fsd/enums.h (93%) rename src/{blackcore => core}/fsd/euroscopesimdata.cpp (98%) rename src/{blackcore => core}/fsd/euroscopesimdata.h (91%) rename src/{blackcore => core}/fsd/flightplan.cpp (96%) rename src/{blackcore => core}/fsd/flightplan.h (92%) rename src/{blackcore => core}/fsd/fsdclient.cpp (98%) rename src/{blackcore => core}/fsd/fsdclient.h (98%) rename src/{blackcore => core}/fsd/fsdidentification.cpp (94%) rename src/{blackcore => core}/fsd/fsdidentification.h (80%) rename src/{blackcore => core}/fsd/interimpilotdataupdate.cpp (95%) rename src/{blackcore => core}/fsd/interimpilotdataupdate.h (89%) rename src/{blackcore => core}/fsd/killrequest.cpp (94%) rename src/{blackcore => core}/fsd/killrequest.h (86%) rename src/{blackcore => core}/fsd/messagebase.cpp (86%) rename src/{blackcore => core}/fsd/messagebase.h (92%) rename src/{blackcore => core}/fsd/mute.cpp (94%) rename src/{blackcore => core}/fsd/mute.h (86%) rename src/{blackcore => core}/fsd/pbh.h (97%) rename src/{blackcore => core}/fsd/pilotdataupdate.cpp (95%) rename src/{blackcore => core}/fsd/pilotdataupdate.h (91%) rename src/{blackcore => core}/fsd/ping.cpp (94%) rename src/{blackcore => core}/fsd/ping.h (86%) rename src/{blackcore => core}/fsd/planeinforequest.cpp (93%) rename src/{blackcore => core}/fsd/planeinforequest.h (84%) rename src/{blackcore => core}/fsd/planeinforequestfsinn.cpp (96%) rename src/{blackcore => core}/fsd/planeinforequestfsinn.h (89%) rename src/{blackcore => core}/fsd/planeinformation.cpp (96%) rename src/{blackcore => core}/fsd/planeinformation.h (87%) rename src/{blackcore => core}/fsd/planeinformationfsinn.cpp (96%) rename src/{blackcore => core}/fsd/planeinformationfsinn.h (89%) rename src/{blackcore => core}/fsd/pong.cpp (94%) rename src/{blackcore => core}/fsd/pong.h (86%) rename src/{blackcore => core}/fsd/rehost.cpp (97%) rename src/{blackcore => core}/fsd/rehost.h (87%) rename src/{blackcore => core}/fsd/revbclientparts.cpp (91%) rename src/{blackcore => core}/fsd/revbclientparts.h (86%) rename src/{blackcore => core}/fsd/serializer.cpp (99%) rename src/{blackcore => core}/fsd/serializer.h (94%) rename src/{blackcore => core}/fsd/servererror.cpp (96%) rename src/{blackcore => core}/fsd/servererror.h (89%) rename src/{blackcore => core}/fsd/textmessage.cpp (96%) rename src/{blackcore => core}/fsd/textmessage.h (84%) rename src/{blackcore => core}/fsd/visualpilotdataperiodic.cpp (99%) rename src/{blackcore => core}/fsd/visualpilotdataperiodic.h (93%) rename src/{blackcore => core}/fsd/visualpilotdatastopped.cpp (99%) rename src/{blackcore => core}/fsd/visualpilotdatastopped.h (91%) rename src/{blackcore => core}/fsd/visualpilotdatatoggle.cpp (97%) rename src/{blackcore => core}/fsd/visualpilotdatatoggle.h (86%) rename src/{blackcore => core}/fsd/visualpilotdataupdate.cpp (99%) rename src/{blackcore => core}/fsd/visualpilotdataupdate.h (94%) rename src/{blackcore => core}/githubpackagesreader.cpp (93%) rename src/{blackcore => core}/githubpackagesreader.h (89%) rename src/{blackcore => core}/inputmanager.cpp (99%) rename src/{blackcore => core}/inputmanager.h (94%) rename src/{blackcore => core}/modelsetbuilder.cpp (93%) rename src/{blackcore => core}/modelsetbuilder.h (78%) rename src/{blackcore => core}/pluginmanager.cpp (97%) rename src/{blackcore => core}/pluginmanager.h (94%) rename src/{blackcore => core}/pluginmanagersimulator.cpp (91%) rename src/{blackcore => core}/pluginmanagersimulator.h (81%) rename src/{blackcore => core}/progress.h (82%) rename src/{blackcore => core}/readme.txt (100%) create mode 100644 src/core/registermetadata.cpp create mode 100644 src/core/registermetadata.h rename src/{blackcore => core}/setupreader.cpp (94%) rename src/{blackcore => core}/setupreader.h (73%) rename src/{blackcore => core}/simulator.cpp (99%) rename src/{blackcore => core}/simulator.h (96%) rename src/{blackcore/blackcore.dox => core/swiftcore.dox} (76%) rename src/{blackcore/blackcoreexport.h => core/swiftcoreexport.h} (55%) rename src/{blackcore => core}/threadedreader.cpp (98%) rename src/{blackcore => core}/threadedreader.h (95%) rename src/{blackcore => core}/vatsim/vatsimdatafilereader.cpp (98%) rename src/{blackcore => core}/vatsim/vatsimdatafilereader.h (92%) rename src/{blackcore => core}/vatsim/vatsimmetarreader.cpp (97%) rename src/{blackcore => core}/vatsim/vatsimmetarreader.h (80%) rename src/{blackcore => core}/vatsim/vatsimserverfilereader.cpp (97%) rename src/{blackcore => core}/vatsim/vatsimserverfilereader.h (80%) rename src/{blackcore => core}/vatsim/vatsimsettings.cpp (95%) rename src/{blackcore => core}/vatsim/vatsimsettings.h (82%) rename src/{blackcore => core}/vatsim/vatsimstatusfilereader.cpp (96%) rename src/{blackcore => core}/vatsim/vatsimstatusfilereader.h (76%) rename src/{blackcore => core}/webdataservices.cpp (98%) rename src/{blackcore => core}/webdataservices.h (93%) rename src/{blackcore => core}/webdataservicesms.cpp (86%) rename src/{blackcore => core}/webdataservicesms.h (77%) rename src/{blackcore => core}/webreaderflags.cpp (98%) rename src/{blackcore => core}/webreaderflags.h (85%) rename tests/{blackcore => core}/CMakeLists.txt (100%) rename tests/{blackcore => core}/blackcoretest.h (62%) rename tests/{blackcore => core}/context/CMakeLists.txt (100%) rename tests/{blackcore => core}/context/testcontext/testcontext.cpp (87%) rename tests/{blackcore => core}/fsd/CMakeLists.txt (100%) rename tests/{blackcore => core}/fsd/testfsdclient/testfsdclient.cpp (99%) rename tests/{blackcore => core}/fsd/testfsdmessages/testfsdmessages.cpp (96%) rename tests/{blackcore => core}/scripts/perllib/BlackCore/Expect/Dict.pm (98%) rename tests/{blackcore => core}/scripts/perllib/BlackCore/Expect/Test.pm (97%) rename tests/{blackcore => core}/scripts/test_sample_cli_client.pl (94%) rename tests/{blackcore => core}/testconnectivity/CMakeLists.txt (100%) rename tests/{blackcore => core}/testconnectivity/testconnectivity.cpp (90%) rename tests/{blackcore => core}/testconnectivity/testconnectivity.h (86%) rename tests/{blackcore => core}/testreaders/CMakeLists.txt (100%) rename tests/{blackcore => core}/testreaders/testreaders.cpp (92%) diff --git a/cmake/pch_config.cmake b/cmake/pch_config.cmake index 43db06196..d9c86da0a 100644 --- a/cmake/pch_config.cmake +++ b/cmake/pch_config.cmake @@ -123,11 +123,11 @@ set(SWIFT_CORE_PCH ) set(SWIFT_GUI_PCH - [["blackcore/context/contextapplication.h"]] - [["blackcore/context/contextaudio.h"]] - [["blackcore/context/contextnetwork.h"]] - [["blackcore/context/contextownaircraft.h"]] - [["blackcore/context/contextsimulator.h"]] + [["core/context/contextapplication.h"]] + [["core/context/contextaudio.h"]] + [["core/context/contextnetwork.h"]] + [["core/context/contextownaircraft.h"]] + [["core/context/contextsimulator.h"]] diff --git a/cppcheck.supp b/cppcheck.supp index 5419509d3..f986b2c4d 100644 --- a/cppcheck.supp +++ b/cppcheck.supp @@ -33,7 +33,7 @@ unreadVariable:samples/misc/samplesperformance.* // False positives returnDanglingLifetime:src/misc/iterator.h -unreadVariable:tests/blackcore/testreaders/testreaders.cpp +unreadVariable:tests/core/testreaders/testreaders.cpp unknownMacro:src/misc/aviation/altitude.h unknownMacro:src/misc/geo/coordinategeodetic.cpp unknownMacro:src/misc/geo/elevationplane.h diff --git a/samples/afvclient/afvclientbridge.cpp b/samples/afvclient/afvclientbridge.cpp index 123eae2ef..1c677480f 100644 --- a/samples/afvclient/afvclientbridge.cpp +++ b/samples/afvclient/afvclientbridge.cpp @@ -3,7 +3,7 @@ #include "afvclientbridge.h" -using namespace BlackCore::Afv::Clients; +using namespace swift::core::afv::clients; CAfvClientBridge::CAfvClientBridge(CAfvClient *afvClient, QObject *parent) : QObject(parent), m_afvClient(afvClient) diff --git a/samples/afvclient/afvclientbridge.h b/samples/afvclient/afvclientbridge.h index 3a5278a06..3d7614fe7 100644 --- a/samples/afvclient/afvclientbridge.h +++ b/samples/afvclient/afvclientbridge.h @@ -6,7 +6,7 @@ #ifndef SAMPLES_AFVCLIENTBRIDGE_H #define SAMPLES_AFVCLIENTBRIDGE_H -#include "blackcore/afv/clients/afvclient.h" +#include "core/afv/clients/afvclient.h" #include //! Bridge, running in main thread -> voice client in own thread @@ -18,14 +18,14 @@ class CAfvClientBridge : public QObject //! @{ Q_PROPERTY(double inputVolumePeakVU READ getInputVolumePeakVU NOTIFY inputVolumePeakVU) Q_PROPERTY(double outputVolumePeakVU READ getOutputVolumePeakVU NOTIFY outputVolumePeakVU) - Q_PROPERTY(BlackCore::Afv::Clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged) + Q_PROPERTY(swift::core::afv::clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged) Q_PROPERTY(QString receivingCallsignsCom1 READ getReceivingCallsignsCom1 NOTIFY receivingCallsignsChanged) Q_PROPERTY(QString receivingCallsignsCom2 READ getReceivingCallsignsCom2 NOTIFY receivingCallsignsChanged) //! @} public: //! Ctor - CAfvClientBridge(BlackCore::Afv::Clients::CAfvClient *afvClient, QObject *parent = nullptr); + CAfvClientBridge(swift::core::afv::clients::CAfvClient *afvClient, QObject *parent = nullptr); //! VU values, 0..1 //! @{ @@ -33,8 +33,8 @@ public: double getOutputVolumePeakVU() const { return m_afvClient->getOutputVolumePeakVU(); } //! @} - //! \copydoc BlackCore::Afv::Clients::CAfvClient::getConnectionStatus - BlackCore::Afv::Clients::CAfvClient::ConnectionStatus getConnectionStatus() const + //! \copydoc swift::core::afv::clients::CAfvClient::getConnectionStatus + swift::core::afv::clients::CAfvClient::ConnectionStatus getConnectionStatus() const { return m_afvClient->getConnectionStatus(); } @@ -45,14 +45,14 @@ public: QString getReceivingCallsignsCom2() { return m_afvClient->getReceivingCallsignsStringCom2(); } //! @} - //! \copydoc BlackCore::Afv::Clients::CAfvClient::connectTo + //! \copydoc swift::core::afv::clients::CAfvClient::connectTo Q_INVOKABLE void connectTo(const QString &cid, const QString &password, const QString &callsign) { const QString client = "swift " % swift::config::CBuildConfig::getShortVersionString(); m_afvClient->connectTo(cid, password, callsign, client); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::disconnectFrom + //! \copydoc swift::core::afv::clients::CAfvClient::disconnectFrom Q_INVOKABLE void disconnectFrom() { m_afvClient->disconnectFrom(); } //! Audio devices @@ -64,22 +64,22 @@ public: //! Enable/disable VHF simulation, true means effects are NOT used Q_INVOKABLE void setBypassEffects(bool value) { m_afvClient->setBypassEffects(value); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::startAudio + //! \copydoc swift::core::afv::clients::CAfvClient::startAudio Q_INVOKABLE void startAudio(const QString &inputDeviceName, const QString &outputDeviceName) { m_afvClient->startAudio(inputDeviceName, outputDeviceName); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::enableTransceiver + //! \copydoc swift::core::afv::clients::CAfvClient::enableTransceiver Q_INVOKABLE void enableTransceiver(quint16 id, bool enable) { m_afvClient->enableTransceiver(id, enable); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::updateComFrequency + //! \copydoc swift::core::afv::clients::CAfvClient::updateComFrequency Q_INVOKABLE void updateComFrequency(quint16 id, quint32 frequencyHz) { m_afvClient->updateComFrequency(id, frequencyHz); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::updatePosition + //! \copydoc swift::core::afv::clients::CAfvClient::updatePosition Q_INVOKABLE void updatePosition(double latitudeDeg, double longitudeDeg, double heightMeters) { m_afvClient->updatePosition(latitudeDeg, longitudeDeg, heightMeters); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::setPtt + //! \copydoc swift::core::afv::clients::CAfvClient::setPtt Q_INVOKABLE void setPtt(bool active) { m_afvClient->setPtt(active); } //! Loopback @@ -88,19 +88,19 @@ public: Q_INVOKABLE bool isLoopback() const { return m_afvClient->isLoopback(); } //! @} - //! \copydoc BlackCore::Afv::Clients::CAfvClient::setInputVolumeDb + //! \copydoc swift::core::afv::clients::CAfvClient::setInputVolumeDb Q_INVOKABLE void setInputVolumeDb(double valueDb) { m_afvClient->setInputVolumeDb(valueDb); } - //! \copydoc BlackCore::Afv::Clients::CAfvClient::setNormalizedMasterOutputVolume + //! \copydoc swift::core::afv::clients::CAfvClient::setNormalizedMasterOutputVolume Q_INVOKABLE void setNormalizedMasterOutputVolume(double valueDb) { m_afvClient->setNormalizedMasterOutputVolume(valueDb); } signals: //! Receiving callsigns have been changed //! \remark callsigns I do receive - void receivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args); + void receivingCallsignsChanged(const swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs &args); //! Connection status has been changed - void connectionStatusChanged(BlackCore::Afv::Clients::CAfvClient::ConnectionStatus status); + void connectionStatusChanged(swift::core::afv::clients::CAfvClient::ConnectionStatus status); //! Client updated from own aicraft data void updatedFromOwnAircraftCockpit(); @@ -115,7 +115,7 @@ signals: //! @} private: - BlackCore::Afv::Clients::CAfvClient *m_afvClient = nullptr; + swift::core::afv::clients::CAfvClient *m_afvClient = nullptr; }; #endif // guard diff --git a/samples/afvclient/main.cpp b/samples/afvclient/main.cpp index 225db5d21..9fcf5bb24 100644 --- a/samples/afvclient/main.cpp +++ b/samples/afvclient/main.cpp @@ -2,12 +2,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "afvclientbridge.h" -#include "blackcore/afv/model/atcstationmodel.h" -#include "blackcore/afv/model/afvmapreader.h" -#include "blackcore/afv/clients/afvclient.h" -#include "blackcore/registermetadata.h" +#include "core/afv/model/atcstationmodel.h" +#include "core/afv/model/afvmapreader.h" +#include "core/afv/clients/afvclient.h" +#include "core/registermetadata.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/network/user.h" #include "misc/obfuscation.h" #include "config/buildconfig.h" @@ -22,17 +22,17 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Afv::Clients; -using namespace BlackCore::Afv::Model; +using namespace swift::core; +using namespace swift::core::afv::clients; +using namespace swift::core::afv::model; int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication qa(argc, argv); - BlackCore::registerMetadata(); - BlackCore::CApplication a("sampleafvclient", CApplicationInfo::Sample); + swift::core::registerMetadata(); + swift::core::CApplication a("sampleafvclient", CApplicationInfo::Sample); CAfvMapReader *afvMapReader = new CAfvMapReader(&a); afvMapReader->updateFromMap(); diff --git a/samples/fsd/main.cpp b/samples/fsd/main.cpp index 0de4e3b81..0065b52d9 100644 --- a/samples/fsd/main.cpp +++ b/samples/fsd/main.cpp @@ -4,7 +4,7 @@ //! \file //! \ingroup samplefsd -#include "blackcore/fsd/fsdclient.h" +#include "core/fsd/fsdclient.h" #include "misc/network/clientprovider.h" #include "misc/simulation/ownaircraftproviderdummy.h" #include "misc/simulation/remoteaircraftproviderdummy.h" @@ -13,7 +13,7 @@ using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore::Fsd; +using namespace swift::core::fsd; //! main int main(int argc, char *argv[]) diff --git a/samples/misc/main.cpp b/samples/misc/main.cpp index 477557c3f..f4a2b9fa2 100644 --- a/samples/misc/main.cpp +++ b/samples/misc/main.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" +#include "core/application.h" #include "misc/directoryutils.h" #include "samplesalgorithm.h" #include "sampleschangeobject.h" @@ -21,7 +21,7 @@ using namespace swift::misc; using namespace BlackSample; -using namespace BlackCore; +using namespace swift::core; //! main int main(int argc, char *argv[]) diff --git a/samples/misc/samplesperformance.cpp b/samples/misc/samplesperformance.cpp index 431277f4f..05ae952b0 100644 --- a/samples/misc/samplesperformance.cpp +++ b/samples/misc/samplesperformance.cpp @@ -5,7 +5,7 @@ //! \ingroup samplemisc #include "samplesperformance.h" -#include "blackcore/db/databasereader.h" +#include "core/db/databasereader.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/distributorlist.h" #include "misc/aviation/aircrafticaocodelist.h" @@ -48,7 +48,7 @@ using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; using namespace swift::misc::test; -using namespace BlackCore::Db; +using namespace swift::core::db; namespace BlackSample { diff --git a/samples/miscdbus/servicetool.cpp b/samples/miscdbus/servicetool.cpp index a8e1f96e6..3f097a5cd 100644 --- a/samples/miscdbus/servicetool.cpp +++ b/samples/miscdbus/servicetool.cpp @@ -5,7 +5,7 @@ //! \ingroup samplemiscdbus #include "servicetool.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/test/testservice.h" #include "misc/test/testserviceinterface.h" #include "misc/dbusserver.h" @@ -46,7 +46,7 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::simulation::fscommon; using namespace swift::misc::test; -using namespace BlackCore; +using namespace swift::core; namespace BlackSample { diff --git a/samples/miscquantities/main.cpp b/samples/miscquantities/main.cpp index 8e7e05a2c..ed6335308 100644 --- a/samples/miscquantities/main.cpp +++ b/samples/miscquantities/main.cpp @@ -7,7 +7,7 @@ #include "samplesaviation.h" #include "samplesgeo.h" #include "samplesphysicalquantities.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/directoryutils.h" #include @@ -18,7 +18,7 @@ using namespace swift::misc; using namespace BlackSample; -using namespace BlackCore; +using namespace swift::core; //! main int main(int argc, char *argv[]) diff --git a/samples/miscsim/main.cpp b/samples/miscsim/main.cpp index e1dc13ee3..99fc2ad17 100644 --- a/samples/miscsim/main.cpp +++ b/samples/miscsim/main.cpp @@ -10,7 +10,7 @@ #include "samplesfsuipc.h" #include "samplesmodelmapping.h" #include "samplesvpilotrules.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/directoryutils.h" #include @@ -28,7 +28,7 @@ using namespace BlackSample; int main(int argc, char *argv[]) { QCoreApplication qa(argc, argv); - BlackCore::CApplication a; + swift::core::CApplication a; Q_UNUSED(a); Q_UNUSED(qa); diff --git a/samples/miscsim/samplesmodelmapping.cpp b/samples/miscsim/samplesmodelmapping.cpp index 1514de181..5ee0a6abc 100644 --- a/samples/miscsim/samplesmodelmapping.cpp +++ b/samples/miscsim/samplesmodelmapping.cpp @@ -6,7 +6,7 @@ #include "samplesmodelmapping.h" #include "sampleutils.h" -#include "blackcore/aircraftmatcher.h" +#include "core/aircraftmatcher.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/airlineicaocode.h" #include "misc/simulation/aircraftmodellist.h" @@ -23,7 +23,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b08dccd11..a1ab7fbc2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 add_subdirectory(config) -add_subdirectory(blackcore) +add_subdirectory(core) add_subdirectory(misc) add_subdirectory(blackgui) add_subdirectory(input) diff --git a/src/blackcore/registermetadata.cpp b/src/blackcore/registermetadata.cpp deleted file mode 100644 index c84426c1c..000000000 --- a/src/blackcore/registermetadata.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include "blackcore/registermetadata.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/data/launchersetup.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/data/vatsimsetup.h" -#include "blackcore/db/databasereader.h" -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/fsd/fsdclient.h" -#include "blackcore/afv/clients/afvclient.h" -#include "blackcore/simulator.h" -#include "blackcore/webreaderflags.h" -#include "blackcore/aircraftmatcher.h" -#include "misc/network/loginmode.h" -#include "misc/dbus.h" -#include "misc/valueobject.h" - -#include -#include - -using namespace BlackCore::Fsd; - -namespace BlackCore -{ - void registerMetadata() - { - // not really clear when a type here has to be registered with qRegisterMetaType - // however, does not harm if it is redundant - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType("ConnectionStatus"); - qRegisterMetaType(); - qRegisterMetaType("TransceiverReceivingCallsignsChangedArgs"); - - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - - Db::CDatabaseReaderConfig::registerMetadata(); - Db::CDatabaseReaderConfigList::registerMetadata(); - Data::CGlobalSetup::registerMetadata(); - Data::CVatsimSetup::registerMetadata(); - Data::CLauncherSetup::registerMetadata(); - Vatsim::CReaderSettings::registerMetadata(); - Vatsim::CRawFsdMessageSettings::registerMetadata(); - - // not really clear when a type here has to be registered with qRegisterMetaType - // however, does not harm if it is redundant - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - } -} // namespace diff --git a/src/blackcore/registermetadata.h b/src/blackcore/registermetadata.h deleted file mode 100644 index a73beaa6c..000000000 --- a/src/blackcore/registermetadata.h +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -#ifndef BLACKCORE_REGISTERMETADATA_H -#define BLACKCORE_REGISTERMETADATA_H - -#include "blackcore/blackcoreexport.h" - -namespace BlackCore -{ - //! Register all relevant metadata in BlackCore - BLACKCORE_EXPORT void registerMetadata(); -} // ns - -#endif // guard diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp index 090786ab0..49e03e8b4 100644 --- a/src/blackgui/components/aircraftcomponent.cpp +++ b/src/blackgui/components/aircraftcomponent.cpp @@ -9,9 +9,9 @@ #include "blackgui/views/airportview.h" #include "blackgui/views/simulatedaircraftview.h" #include "blackgui/views/viewbase.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" #include "misc/network/server.h" #include "misc/network/fsdsetup.h" #include "ui_aircraftcomponent.h" @@ -25,8 +25,8 @@ using namespace BlackGui; using namespace BlackGui::Views; using namespace BlackGui::Models; using namespace BlackGui::Settings; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; diff --git a/src/blackgui/components/aircraftmodelstringcompleter.cpp b/src/blackgui/components/aircraftmodelstringcompleter.cpp index b5e62c161..7d6abe289 100644 --- a/src/blackgui/components/aircraftmodelstringcompleter.cpp +++ b/src/blackgui/components/aircraftmodelstringcompleter.cpp @@ -5,15 +5,15 @@ #include "ui_aircraftmodelstringcompleter.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" -#include "blackcore/context/contextsimulator.h" +#include "core/webdataservices.h" +#include "core/context/contextsimulator.h" #include #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc::simulation; using namespace swift::misc::simulation::data; diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp index d012cbe85..8617dda28 100644 --- a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp +++ b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp @@ -4,13 +4,13 @@ #include "ui_aircraftmodelvalidationcomponent.h" #include "aircraftmodelvalidationcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/aircraftpartscomponent.cpp b/src/blackgui/components/aircraftpartscomponent.cpp index 516346b8a..85a9f3886 100644 --- a/src/blackgui/components/aircraftpartscomponent.cpp +++ b/src/blackgui/components/aircraftpartscomponent.cpp @@ -5,9 +5,9 @@ #include "ui_aircraftpartscomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" #include "misc/aviation/aircraftenginelist.h" #include "misc/aviation/aircraftlights.h" @@ -17,8 +17,8 @@ using namespace swift::misc::network; using namespace swift::misc::math; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/aircraftpartshistory.cpp b/src/blackgui/components/aircraftpartshistory.cpp index af28641eb..1cc5514f3 100644 --- a/src/blackgui/components/aircraftpartshistory.cpp +++ b/src/blackgui/components/aircraftpartshistory.cpp @@ -6,8 +6,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" #include "misc/propertyindexlist.h" #include "misc/htmlutils.h" @@ -19,8 +19,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/airportcompleter.cpp b/src/blackgui/components/airportcompleter.cpp index 8280462bc..2bfe5b94a 100644 --- a/src/blackgui/components/airportcompleter.cpp +++ b/src/blackgui/components/airportcompleter.cpp @@ -5,11 +5,11 @@ #include "ui_airportcompleter.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/airportlist.h" #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::aviation; namespace BlackGui::Components diff --git a/src/blackgui/components/airportsmallcompleter.cpp b/src/blackgui/components/airportsmallcompleter.cpp index d4e1b994f..bacd29ccc 100644 --- a/src/blackgui/components/airportsmallcompleter.cpp +++ b/src/blackgui/components/airportsmallcompleter.cpp @@ -7,11 +7,11 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/airportlist.h" #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::aviation; namespace BlackGui::Components diff --git a/src/blackgui/components/applicationclosedialog.cpp b/src/blackgui/components/applicationclosedialog.cpp index a1c7e64be..83e208962 100644 --- a/src/blackgui/components/applicationclosedialog.cpp +++ b/src/blackgui/components/applicationclosedialog.cpp @@ -5,7 +5,7 @@ #include "ui_applicationclosedialog.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/context/contextapplication.h" +#include "core/context/contextapplication.h" #include "misc/settingscache.h" #include "misc/logmessage.h" #include @@ -15,7 +15,7 @@ using namespace swift::misc; using namespace BlackGui; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/applicationclosedialog.h b/src/blackgui/components/applicationclosedialog.h index a22ee06a7..902a0cc83 100644 --- a/src/blackgui/components/applicationclosedialog.h +++ b/src/blackgui/components/applicationclosedialog.h @@ -9,7 +9,7 @@ #include #include #include -#include "blackcore/context/contextapplication.h" +#include "core/context/contextapplication.h" namespace Ui { @@ -34,7 +34,7 @@ namespace BlackGui::Components private: QScopedPointer ui; QStringList m_settingsDescriptions; //!< values as displayed - BlackCore::Context::CSettingsDictionary m_settingsDictionary; //!< values and descriptions, unsorted + swift::core::context::CSettingsDictionary m_settingsDictionary; //!< values and descriptions, unsorted //! Accepted void onAccepted(); diff --git a/src/blackgui/components/atcbuttoncomponent.cpp b/src/blackgui/components/atcbuttoncomponent.cpp index ef82b18a7..6853e15af 100644 --- a/src/blackgui/components/atcbuttoncomponent.cpp +++ b/src/blackgui/components/atcbuttoncomponent.cpp @@ -15,8 +15,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/atcbuttoncomponent.h b/src/blackgui/components/atcbuttoncomponent.h index 745fa990e..2bdf3f548 100644 --- a/src/blackgui/components/atcbuttoncomponent.h +++ b/src/blackgui/components/atcbuttoncomponent.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_COMPONENTS_ATCBUTTONCOMPONENT_H #define BLACKGUI_COMPONENTS_ATCBUTTONCOMPONENT_H -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "misc/network/connectionstatus.h" #include #include diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 0fb5d5cc5..913bea779 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -11,9 +11,9 @@ #include "blackgui/guiutility.h" #include "blackgui/dockwidgetinfoarea.h" #include "blackgui/infoarea.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/webdataservices.h" #include "misc/aviation/atcstationlist.h" #include "misc/aviation/informationmessage.h" #include "misc/weather/metar.h" @@ -45,8 +45,8 @@ using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::weather; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/audioadvanceddistributedcomponent.cpp b/src/blackgui/components/audioadvanceddistributedcomponent.cpp index b7f59e8b1..683b06c30 100644 --- a/src/blackgui/components/audioadvanceddistributedcomponent.cpp +++ b/src/blackgui/components/audioadvanceddistributedcomponent.cpp @@ -5,12 +5,12 @@ #include "ui_audioadvanceddistributedcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/afv/clients/afvclient.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/afv/clients/afvclient.h" using namespace swift::misc::audio; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp index d53e4c79e..ed0bc3020 100644 --- a/src/blackgui/components/audiodevicevolumesetupcomponent.cpp +++ b/src/blackgui/components/audiodevicevolumesetupcomponent.cpp @@ -4,9 +4,9 @@ #include "blackgui/components/audiodevicevolumesetupcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/afv/clients/afvclient.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextaudioimpl.h" +#include "core/afv/clients/afvclient.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextaudioimpl.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/audio/audiodeviceinfo.h" @@ -23,10 +23,10 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Afv::Audio; -using namespace BlackCore::Afv::Clients; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::afv::audio; +using namespace swift::core::afv::clients; +using namespace swift::core::context; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::audio; diff --git a/src/blackgui/components/audiodevicevolumesetupcomponent.h b/src/blackgui/components/audiodevicevolumesetupcomponent.h index 793a6c03a..1cc2cc5e6 100644 --- a/src/blackgui/components/audiodevicevolumesetupcomponent.h +++ b/src/blackgui/components/audiodevicevolumesetupcomponent.h @@ -23,7 +23,7 @@ namespace Ui { class CAudioDeviceVolumeSetupComponent; } -namespace BlackCore::Afv::Clients +namespace swift::core::afv::clients { class CAfvClient; } @@ -146,7 +146,7 @@ namespace BlackGui::Components void setVolumeSlidersReadOnly(bool readonly); //! Direct access to client - static BlackCore::Afv::Clients::CAfvClient *afvClient(); + static swift::core::afv::clients::CAfvClient *afvClient(); bool m_init = false; swift::misc::CConnectionGuard m_afvConnections; diff --git a/src/blackgui/components/audionotificationcomponent.cpp b/src/blackgui/components/audionotificationcomponent.cpp index 976099bfb..119cc9690 100644 --- a/src/blackgui/components/audionotificationcomponent.cpp +++ b/src/blackgui/components/audionotificationcomponent.cpp @@ -3,7 +3,7 @@ #include "blackgui/components/audionotificationcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextaudio.h" +#include "core/context/contextaudio.h" #include "misc/audio/notificationsounds.h" #include "misc/audio/audiosettings.h" #include "misc/sequence.h" @@ -16,8 +16,8 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::audio; diff --git a/src/blackgui/components/autopublishcomponent.cpp b/src/blackgui/components/autopublishcomponent.cpp index f5b5d4f37..cb3463aad 100644 --- a/src/blackgui/components/autopublishcomponent.cpp +++ b/src/blackgui/components/autopublishcomponent.cpp @@ -6,8 +6,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databasewriter.h" +#include "core/webdataservices.h" +#include "core/db/databasewriter.h" #include "misc/simulation/aircraftmodellist.h" #include @@ -18,7 +18,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Db; +using namespace swift::core::db; namespace BlackGui::Components { diff --git a/src/blackgui/components/callsigncompleter.cpp b/src/blackgui/components/callsigncompleter.cpp index 326816fd0..b9a29f7a0 100644 --- a/src/blackgui/components/callsigncompleter.cpp +++ b/src/blackgui/components/callsigncompleter.cpp @@ -6,8 +6,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/led.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" #include "misc/simulation/simulatedaircraftlist.h" #include @@ -16,8 +16,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index a180ef891..68bc275bd 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" #include "blackgui/components/cockpitcomcomponent.h" #include "blackgui/components/selcalcodeselector.h" #include "blackgui/components/transpondercodespinbox.h" @@ -31,8 +31,8 @@ using namespace BlackGui; using namespace BlackGui::Editors; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc; using namespace swift::misc::audio; using namespace swift::misc::aviation; diff --git a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp index bf5c02060..a873a0db4 100644 --- a/src/blackgui/components/cockpittranspondermodeledscomponent.cpp +++ b/src/blackgui/components/cockpittranspondermodeledscomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextownaircraft.h" #include "blackgui/components/cockpittranspondermodeledscomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/led.h" @@ -14,8 +14,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/commandinput.cpp b/src/blackgui/components/commandinput.cpp index 7af49ee02..3090d5f55 100644 --- a/src/blackgui/components/commandinput.cpp +++ b/src/blackgui/components/commandinput.cpp @@ -3,15 +3,15 @@ #include "blackgui/components/commandinput.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextapplication.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextnetwork.h" #include "misc/simplecommandparser.h" using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/configsimulatorcomponent.h b/src/blackgui/components/configsimulatorcomponent.h index 300a87439..f4e92922a 100644 --- a/src/blackgui/components/configsimulatorcomponent.h +++ b/src/blackgui/components/configsimulatorcomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_COMPONENTS_CONFIGSIMULATORCOMPONENT_H #include "misc/simulation/data/modelcaches.h" -#include "blackcore/application/applicationsettings.h" +#include "core/application/applicationsettings.h" #include #include #include @@ -48,7 +48,7 @@ namespace BlackGui::Components //! Get the plugin ids QStringList selectedSimsToPluginIds(); - swift::misc::CSetting m_enabledSimulators { this }; + swift::misc::CSetting m_enabledSimulators { this }; swift::misc::simulation::data::CModelSetCaches m_modelSets { true, this }; QScopedPointer ui; }; diff --git a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp index 83c8e3bf2..a60a89038 100644 --- a/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp +++ b/src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp @@ -4,7 +4,7 @@ #include "copymodelsfromotherswiftversionscomponent.h" #include "ui_copymodelsfromotherswiftversionscomponent.h" #include "blackgui/models/aircraftmodellistmodel.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/stringutils.h" #include "misc/fileutils.h" #include "misc/swiftdirectories.h" @@ -15,7 +15,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::simulation; using namespace BlackGui::Models; diff --git a/src/blackgui/components/copysettingsandcachescomponent.cpp b/src/blackgui/components/copysettingsandcachescomponent.cpp index fc2989076..2531e01c2 100644 --- a/src/blackgui/components/copysettingsandcachescomponent.cpp +++ b/src/blackgui/components/copysettingsandcachescomponent.cpp @@ -22,9 +22,9 @@ using namespace swift::misc::network::data; using namespace swift::misc::network::settings; using namespace swift::misc::settings; using namespace swift::misc::simulation::settings; -using namespace BlackCore::Audio; -using namespace BlackCore::Application; -using namespace BlackCore::Data; +using namespace swift::core::audio; +using namespace swift::core::application; +using namespace swift::core::data; using namespace BlackGui::Settings; namespace BlackGui::Components diff --git a/src/blackgui/components/copysettingsandcachescomponent.h b/src/blackgui/components/copysettingsandcachescomponent.h index 59fb98ce8..71b4e98ec 100644 --- a/src/blackgui/components/copysettingsandcachescomponent.h +++ b/src/blackgui/components/copysettingsandcachescomponent.h @@ -12,11 +12,11 @@ #include "blackgui/settings/textmessagesettings.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/blackguiexport.h" -#include "blackcore/data/launchersetup.h" -#include "blackcore/data/vatsimsetup.h" -#include "blackcore/audio/audiosettings.h" -#include "blackcore/application/applicationsettings.h" -#include "blackcore/application/updatesettings.h" +#include "core/data/launchersetup.h" +#include "core/data/vatsimsetup.h" +#include "core/audio/audiosettings.h" +#include "core/application/applicationsettings.h" +#include "core/application/updatesettings.h" #include "misc/simulation/data/modelcaches.h" #include "misc/simulation/data/lastmodel.h" #include "misc/simulation/settings/simulatorsettings.h" @@ -109,15 +109,15 @@ namespace BlackGui::Components QScopedPointer ui; - swift::misc::CSetting m_settingsAudioInputDevice { this }; - swift::misc::CSetting m_settingsAudioOutputDevice { this }; + swift::misc::CSetting m_settingsAudioInputDevice { this }; + swift::misc::CSetting m_settingsAudioOutputDevice { this }; swift::misc::CSetting m_settingsGuiGeneral { this }; swift::misc::CSetting m_settingsDockWidget { this }; swift::misc::CSetting m_settingsViewUpdate { this }; swift::misc::CSetting m_settingsConsolidation { this }; //!< consolidation time swift::misc::CSetting m_settingsTextMessage { this }; - swift::misc::CSetting m_settingsEnabledSimulators { this }; - swift::misc::CSetting m_settingsActionHotkeys { this }; + swift::misc::CSetting m_settingsEnabledSimulators { this }; + swift::misc::CSetting m_settingsActionHotkeys { this }; swift::misc::CSetting m_settingsAudio { this }; swift::misc::CSetting m_settingsDirectories { this }; swift::misc::CSetting m_settingsNetworkServers { this }; @@ -127,9 +127,9 @@ namespace BlackGui::Components swift::misc::CSetting m_settingsSimulatorXPlane { this }; //!< XP settings swift::misc::CSetting m_settingsModel { this }; //!< model setting - swift::misc::CData m_cacheLastVatsimServer { this }; //!< recently used VATSIM server - swift::misc::CData m_cacheLauncherSetup { this }; - swift::misc::CData m_cacheVatsimSetup { this }; + swift::misc::CData m_cacheLastVatsimServer { this }; //!< recently used VATSIM server + swift::misc::CData m_cacheLauncherSetup { this }; + swift::misc::CData m_cacheVatsimSetup { this }; swift::misc::CData m_cacheLastNetworkServer { this }; //!< recently used server (VATSIM, other) swift::misc::CData m_cacheModelSetCurrentSimulator { this }; swift::misc::CData m_cacheModelsCurrentSimulator { this }; diff --git a/src/blackgui/components/countryselector.cpp b/src/blackgui/components/countryselector.cpp index 79f747fc6..16fa6ba79 100644 --- a/src/blackgui/components/countryselector.cpp +++ b/src/blackgui/components/countryselector.cpp @@ -6,12 +6,12 @@ #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/countrylist.h" #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Components { diff --git a/src/blackgui/components/datainfoareacomponent.cpp b/src/blackgui/components/datainfoareacomponent.cpp index 9256be19f..f0f71ee02 100644 --- a/src/blackgui/components/datainfoareacomponent.cpp +++ b/src/blackgui/components/datainfoareacomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/datainfoareacomponent.h" #include "blackgui/components/dbaircrafticaocomponent.h" #include "blackgui/components/dbairlineicaocomponent.h" diff --git a/src/blackgui/components/datasettingscomponent.cpp b/src/blackgui/components/datasettingscomponent.cpp index 645f27325..54f20e7ae 100644 --- a/src/blackgui/components/datasettingscomponent.cpp +++ b/src/blackgui/components/datasettingscomponent.cpp @@ -5,7 +5,7 @@ #include "ui_datasettingscomponent.h" using namespace BlackGui; -using namespace BlackCore::Db; +using namespace swift::core::db; namespace BlackGui::Components { diff --git a/src/blackgui/components/datasettingscomponent.h b/src/blackgui/components/datasettingscomponent.h index 6d679a201..3d5921c3e 100644 --- a/src/blackgui/components/datasettingscomponent.h +++ b/src/blackgui/components/datasettingscomponent.h @@ -17,7 +17,7 @@ namespace Ui { class CDataSettingsComponent; } -namespace BlackCore::Db +namespace swift::core::db { class CBackgroundDataUpdater; } @@ -38,7 +38,7 @@ namespace BlackGui::Components virtual ~CDataSettingsComponent(); //! Background updater - void setBackgroundUpdater(const BlackCore::Db::CBackgroundDataUpdater *updater); + void setBackgroundUpdater(const swift::core::db::CBackgroundDataUpdater *updater); private: QScopedPointer ui; diff --git a/src/blackgui/components/dbaircraftcategorycomponent.cpp b/src/blackgui/components/dbaircraftcategorycomponent.cpp index 724cbcc74..ee52097d0 100644 --- a/src/blackgui/components/dbaircraftcategorycomponent.cpp +++ b/src/blackgui/components/dbaircraftcategorycomponent.cpp @@ -4,11 +4,11 @@ #include "dbaircraftcategorycomponent.h" #include "ui_dbaircraftcategorycomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; using namespace swift::misc::aviation; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbaircrafticaocomponent.cpp b/src/blackgui/components/dbaircrafticaocomponent.cpp index 306cd8a88..d0b33f7c7 100644 --- a/src/blackgui/components/dbaircrafticaocomponent.cpp +++ b/src/blackgui/components/dbaircrafticaocomponent.cpp @@ -6,7 +6,7 @@ #include "blackgui/views/aircrafticaoview.h" #include "blackgui/views/viewbase.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "dbaircrafticaocomponent.h" #include "ui_dbaircrafticaocomponent.h" @@ -14,7 +14,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; using namespace swift::misc::aviation; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp index 4282ab349..5a0204631 100644 --- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "ui_dbaircrafticaoselectorcomponent.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "blackgui/components/dbaircrafticaoselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" @@ -25,7 +25,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::db; diff --git a/src/blackgui/components/dbairlineicaocomponent.cpp b/src/blackgui/components/dbairlineicaocomponent.cpp index c46c10a2f..7ea9f7f51 100644 --- a/src/blackgui/components/dbairlineicaocomponent.cpp +++ b/src/blackgui/components/dbairlineicaocomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbairlineicaocomponent.h" #include "blackgui/filters/airlineicaofilterbar.h" #include "blackgui/guiapplication.h" @@ -13,7 +13,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; using namespace BlackGui; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbairlineicaoselectorbase.cpp b/src/blackgui/components/dbairlineicaoselectorbase.cpp index e80953996..323f1f368 100644 --- a/src/blackgui/components/dbairlineicaoselectorbase.cpp +++ b/src/blackgui/components/dbairlineicaoselectorbase.cpp @@ -3,7 +3,7 @@ #include "blackgui/components/dbairlineicaoselectorbase.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/airlineicaocodelist.h" #include "misc/db/datastoreutility.h" #include "misc/mixin/mixincompare.h" @@ -20,7 +20,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp index b2b7c1350..7600e6f48 100644 --- a/src/blackgui/components/dbairlineicaoselectorcomponent.cpp +++ b/src/blackgui/components/dbairlineicaoselectorcomponent.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "ui_dbairlineicaoselectorcomponent.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbairlineicaoselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" @@ -15,7 +15,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::db; diff --git a/src/blackgui/components/dbairlinenameselectorcomponent.cpp b/src/blackgui/components/dbairlinenameselectorcomponent.cpp index 2af23c6fd..f559ea7f8 100644 --- a/src/blackgui/components/dbairlinenameselectorcomponent.cpp +++ b/src/blackgui/components/dbairlinenameselectorcomponent.cpp @@ -4,7 +4,7 @@ #include "ui_dbairlinenameselectorcomponent.h" #include "blackgui/components/dbairlinenameselectorcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/airlineicaocodelist.h" #include "misc/db/datastoreutility.h" @@ -13,7 +13,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::aviation; diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp b/src/blackgui/components/dbautosimulatorstashingcomponent.cpp index 784f32e4e..d54228a88 100644 --- a/src/blackgui/components/dbautosimulatorstashingcomponent.cpp +++ b/src/blackgui/components/dbautosimulatorstashingcomponent.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/databaseutils.h" +#include "core/db/databaseutils.h" #include "dbautosimulatorstashingcomponent.h" #include "blackgui/components/dbmappingcomponent.h" #include "ui_dbautosimulatorstashingcomponent.h" #include using namespace BlackGui; -using namespace BlackCore::Db; +using namespace swift::core::db; using namespace swift::misc; using namespace swift::misc::simulation; diff --git a/src/blackgui/components/dbautosimulatorstashingcomponent.h b/src/blackgui/components/dbautosimulatorstashingcomponent.h index 5246471c8..3c5840058 100644 --- a/src/blackgui/components/dbautosimulatorstashingcomponent.h +++ b/src/blackgui/components/dbautosimulatorstashingcomponent.h @@ -9,7 +9,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/components/dbmappingcomponentaware.h" #include "blackgui/views/aircraftmodelview.h" -#include "blackcore/progress.h" +#include "core/progress.h" #include "misc/simulation/aircraftmodel.h" #include "misc/statusmessage.h" #include @@ -28,7 +28,7 @@ namespace BlackGui::Components class BLACKGUI_EXPORT CDbAutoSimulatorStashingComponent : public QDialog, public Components::CDbMappingComponentAware, - public BlackCore::IProgressIndicator + public swift::core::IProgressIndicator { Q_OBJECT Q_INTERFACES(BlackGui::Components::CDbMappingComponentAware) @@ -51,7 +51,7 @@ namespace BlackGui::Components //! At least run once and completed bool isCompleted() const { return m_state == Completed; } - //! \copydoc BlackCore::IProgressIndicator::updateProgressIndicator + //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator virtual void updateProgressIndicator(int percent) override; public slots: diff --git a/src/blackgui/components/dbautostashingcomponent.cpp b/src/blackgui/components/dbautostashingcomponent.cpp index 0b89d5a37..ae45937cf 100644 --- a/src/blackgui/components/dbautostashingcomponent.cpp +++ b/src/blackgui/components/dbautostashingcomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbautostashingcomponent.h" #include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbstashcomponent.h" @@ -30,7 +30,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/blackgui/components/dbautostashingcomponent.h index 02509da3e..daa557689 100644 --- a/src/blackgui/components/dbautostashingcomponent.h +++ b/src/blackgui/components/dbautostashingcomponent.h @@ -8,7 +8,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/components/dbmappingcomponentaware.h" -#include "blackcore/progress.h" +#include "core/progress.h" #include "misc/network/entityflags.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/statusmessage.h" @@ -43,7 +43,7 @@ namespace BlackGui class BLACKGUI_EXPORT CDbAutoStashingComponent : public QDialog, public CDbMappingComponentAware, - public BlackCore::IProgressIndicator + public swift::core::IProgressIndicator { Q_OBJECT Q_INTERFACES(BlackGui::Components::CDbMappingComponentAware) @@ -69,7 +69,7 @@ namespace BlackGui //! At least run once and completed bool isCompleted() const { return m_state == Completed; } - //! \copydoc BlackCore::IProgressIndicator::updateProgressIndicator + //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator virtual void updateProgressIndicator(int percent) override; public slots: diff --git a/src/blackgui/components/dbcountrycomponent.cpp b/src/blackgui/components/dbcountrycomponent.cpp index 77a819890..534f07bd8 100644 --- a/src/blackgui/components/dbcountrycomponent.cpp +++ b/src/blackgui/components/dbcountrycomponent.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "blackgui/components/dbcountrycomponent.h" #include "blackgui/filters/countryfilterbar.h" #include "blackgui/guiapplication.h" @@ -12,7 +12,7 @@ #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbcountryselectorcomponent.cpp b/src/blackgui/components/dbcountryselectorcomponent.cpp index ec380c516..71e1729d3 100644 --- a/src/blackgui/components/dbcountryselectorcomponent.cpp +++ b/src/blackgui/components/dbcountryselectorcomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbcountryselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" @@ -23,7 +23,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbdistributorcomponent.cpp b/src/blackgui/components/dbdistributorcomponent.cpp index 35ea0ae38..ea3a70fa9 100644 --- a/src/blackgui/components/dbdistributorcomponent.cpp +++ b/src/blackgui/components/dbdistributorcomponent.cpp @@ -6,14 +6,14 @@ #include "blackgui/guiapplication.h" #include "blackgui/views/distributorview.h" #include "blackgui/views/viewbase.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/simulation/simulatorinfo.h" #include #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace BlackGui::Views; diff --git a/src/blackgui/components/dbdistributorselectorcomponent.cpp b/src/blackgui/components/dbdistributorselectorcomponent.cpp index 15aaca4ce..12982deb7 100644 --- a/src/blackgui/components/dbdistributorselectorcomponent.cpp +++ b/src/blackgui/components/dbdistributorselectorcomponent.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "blackgui/components/dbdistributorselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" @@ -25,7 +25,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::simulation; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbliverycolorsearch.cpp b/src/blackgui/components/dbliverycolorsearch.cpp index aebde3203..ef8685bd3 100644 --- a/src/blackgui/components/dbliverycolorsearch.cpp +++ b/src/blackgui/components/dbliverycolorsearch.cpp @@ -3,7 +3,7 @@ #include "blackgui/components/dbliverycolorsearch.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/liverylist.h" #include "ui_dbliverycolorsearch.h" diff --git a/src/blackgui/components/dbliverycolorsearchdialog.cpp b/src/blackgui/components/dbliverycolorsearchdialog.cpp index 86cf7baff..98005cd5c 100644 --- a/src/blackgui/components/dbliverycolorsearchdialog.cpp +++ b/src/blackgui/components/dbliverycolorsearchdialog.cpp @@ -3,7 +3,7 @@ #include "dbliverycolorsearchdialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/liverylist.h" #include "ui_dbliverycolorsearchdialog.h" diff --git a/src/blackgui/components/dbliverycomponent.cpp b/src/blackgui/components/dbliverycomponent.cpp index 68f9472c2..2227b902b 100644 --- a/src/blackgui/components/dbliverycomponent.cpp +++ b/src/blackgui/components/dbliverycomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbliverycomponent.h" #include "blackgui/filters/liveryfilterbar.h" #include "blackgui/guiapplication.h" @@ -11,7 +11,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui::Views; using namespace swift::misc::aviation; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbliveryselectorcomponent.cpp b/src/blackgui/components/dbliveryselectorcomponent.cpp index 66ed54506..a677cfc2a 100644 --- a/src/blackgui/components/dbliveryselectorcomponent.cpp +++ b/src/blackgui/components/dbliveryselectorcomponent.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "blackgui/components/dbliveryselectorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" @@ -27,7 +27,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::db; diff --git a/src/blackgui/components/dbloaddatadialog.cpp b/src/blackgui/components/dbloaddatadialog.cpp index 5f697fe27..44ad889ed 100644 --- a/src/blackgui/components/dbloaddatadialog.cpp +++ b/src/blackgui/components/dbloaddatadialog.cpp @@ -4,8 +4,8 @@ #include "blackgui/components/dbloaddatadialog.h" #include "ui_dbloaddatadialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/db/databaseutils.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/logmessage.h" @@ -18,8 +18,8 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::data; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; namespace BlackGui::Components { diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp index c056c9f25..088941ff0 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.cpp +++ b/src/blackgui/components/dbloadoverviewcomponent.cpp @@ -6,8 +6,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/infodatareader.h" +#include "core/webdataservices.h" +#include "core/db/infodatareader.h" #include "misc/network/networkutils.h" #include "misc/htmlutils.h" @@ -15,7 +15,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::network; diff --git a/src/blackgui/components/dblogincomponent.cpp b/src/blackgui/components/dblogincomponent.cpp index 0216bcc8c..9fbd0a327 100644 --- a/src/blackgui/components/dblogincomponent.cpp +++ b/src/blackgui/components/dblogincomponent.cpp @@ -6,7 +6,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/overlaymessagesframe.h" -#include "blackcore/data/globalsetup.h" +#include "core/data/globalsetup.h" #include "misc/network/authenticateduser.h" #include "misc/network/url.h" #include "misc/htmlutils.h" @@ -25,8 +25,8 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; using namespace BlackGui; using namespace swift::config; using namespace swift::misc; diff --git a/src/blackgui/components/dblogincomponent.h b/src/blackgui/components/dblogincomponent.h index e3af17af7..ba927fbc9 100644 --- a/src/blackgui/components/dblogincomponent.h +++ b/src/blackgui/components/dblogincomponent.h @@ -6,8 +6,8 @@ #ifndef BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H #define BLACKGUI_COMPONENTS_DBLOGINCOMPONENT_H -#include "blackcore/db/databaseauthentication.h" -#include "blackcore/data/globalsetup.h" +#include "core/db/databaseauthentication.h" +#include "core/data/globalsetup.h" #include "blackgui/blackguiexport.h" #include "blackgui/loadindicator.h" #include "misc/statusmessagelist.h" @@ -28,7 +28,7 @@ namespace BlackGui::Components { /*! * Login to DB - * \sa BlackCore::Db::CDatabaseAuthenticationService + * \sa swift::core::db::CDatabaseAuthenticationService */ class BLACKGUI_EXPORT CDbLoginComponent : public QFrame, @@ -51,7 +51,7 @@ namespace BlackGui::Components private: QScopedPointer ui; - BlackCore::Db::CDatabaseAuthenticationService m_loginService { this }; //!< login service + swift::core::db::CDatabaseAuthenticationService m_loginService { this }; //!< login service //! Overlay messages void displayOverlayMessages(const swift::misc::CStatusMessageList &msgs); diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index aec7355fa..3d8cfd9a4 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/dbautostashingcomponent.h" #include "blackgui/components/dbautosimulatorstashingcomponent.h" #include "blackgui/components/dbmappingcomponent.h" @@ -47,7 +47,7 @@ #include #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index 57509c9af..3cda42b0e 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -11,7 +11,7 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/enablefordockwidgetinfoarea.h" #include "blackgui/blackguiexport.h" -#include "blackcore/data/authenticateduser.h" +#include "core/data/authenticateduser.h" #include "misc/aviation/airlineicaocode.h" #include "misc/network/entityflags.h" #include "misc/simulation/aircraftmodellist.h" @@ -329,7 +329,7 @@ namespace BlackGui QScopedPointer m_modelModifyDialog; //!< dialog when modifying models swift::misc::simulation::fscommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules swift::misc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::onStashedModelsChangedDigest, 750, 25 }; - swift::misc::CDataReadOnly m_swiftDbUser { this, &CDbMappingComponent::onUserChanged }; + swift::misc::CDataReadOnly m_swiftDbUser { this, &CDbMappingComponent::onUserChanged }; const bool vPilotSupport = true; //!< vPilot support (will be removed in future) bool m_vPilot1stInit = true; //!< vPilot extensions initalized? bool m_vPilotEnabled = false; //!< use vPilot extensions diff --git a/src/blackgui/components/dbmodelcomponent.cpp b/src/blackgui/components/dbmodelcomponent.cpp index ce709efb6..4974c8083 100644 --- a/src/blackgui/components/dbmodelcomponent.cpp +++ b/src/blackgui/components/dbmodelcomponent.cpp @@ -5,8 +5,8 @@ #include "blackgui/filters/aircraftmodelfilterbar.h" #include "blackgui/models/aircraftmodellistmodel.h" #include "blackgui/guiapplication.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "blackgui/views/aircraftmodelview.h" #include "blackgui/views/viewbase.h" #include "misc/simulation/aircraftmodel.h" @@ -20,7 +20,7 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui::Views; using namespace BlackGui::Models; diff --git a/src/blackgui/components/dbmodelkeycompleter.cpp b/src/blackgui/components/dbmodelkeycompleter.cpp index 6157d0935..7727c5ba7 100644 --- a/src/blackgui/components/dbmodelkeycompleter.cpp +++ b/src/blackgui/components/dbmodelkeycompleter.cpp @@ -4,10 +4,10 @@ #include "dbmodelkeycompleter.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::simulation; namespace BlackGui::Components diff --git a/src/blackgui/components/dbmodelworkbenchcomponent.cpp b/src/blackgui/components/dbmodelworkbenchcomponent.cpp index 908ffea1b..5129840b5 100644 --- a/src/blackgui/components/dbmodelworkbenchcomponent.cpp +++ b/src/blackgui/components/dbmodelworkbenchcomponent.cpp @@ -8,8 +8,8 @@ #include "blackgui/views/aircraftmodelview.h" #include "blackgui/models/aircraftmodellistmodel.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/db/databaseutils.h" #include "misc/icons.h" #include "misc/logmessage.h" #include "misc/statusmessage.h" @@ -25,7 +25,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Db; +using namespace swift::core::db; using namespace BlackGui::Menus; using namespace BlackGui::Views; using namespace BlackGui::Models; diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 199f33285..dc00c9c08 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -8,8 +8,8 @@ #include "blackgui/views/aircraftmodelview.h" #include "blackgui/models/aircraftmodellistmodel.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/db/databaseutils.h" #include "misc/simulation/aircraftmodelloaderprovider.h" #include "misc/icons.h" #include "misc/swiftdirectories.h" @@ -30,7 +30,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Db; +using namespace swift::core::db; using namespace BlackGui::Menus; using namespace BlackGui::Views; using namespace BlackGui::Models; diff --git a/src/blackgui/components/dbownmodelsetformdialog.cpp b/src/blackgui/components/dbownmodelsetformdialog.cpp index a34e47f93..514fd2b20 100644 --- a/src/blackgui/components/dbownmodelsetformdialog.cpp +++ b/src/blackgui/components/dbownmodelsetformdialog.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/modelsetbuilder.h" +#include "core/modelsetbuilder.h" #include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbownmodelsetformdialog.h" #include "blackgui/editors/ownmodelsetform.h" @@ -17,7 +17,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui::Editors; namespace BlackGui::Components diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp index bce770c1c..9e99daf82 100644 --- a/src/blackgui/components/dbquickmappingwizard.cpp +++ b/src/blackgui/components/dbquickmappingwizard.cpp @@ -11,15 +11,15 @@ #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/db/databasewriter.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextsimulator.h" +#include "core/db/databasewriter.h" +#include "core/webdataservices.h" #include "config/buildconfig.h" #include -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; using namespace swift::config; using namespace swift::misc; using namespace swift::misc::aviation; diff --git a/src/blackgui/components/dbreducemodelduplicates.cpp b/src/blackgui/components/dbreducemodelduplicates.cpp index d3dc17a63..51321c0ba 100644 --- a/src/blackgui/components/dbreducemodelduplicates.cpp +++ b/src/blackgui/components/dbreducemodelduplicates.cpp @@ -6,7 +6,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/statusmessage.h" #include diff --git a/src/blackgui/components/dbreducemodelduplicates.h b/src/blackgui/components/dbreducemodelduplicates.h index e1d8f34a6..907ac23c3 100644 --- a/src/blackgui/components/dbreducemodelduplicates.h +++ b/src/blackgui/components/dbreducemodelduplicates.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H #define BLACKGUI_COMPONENTS_DBREDUCEMODELDUPLICATES_H -#include "blackcore/progress.h" +#include "core/progress.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/settings/modelsettings.h" #include "misc/settingscache.h" @@ -23,7 +23,7 @@ namespace BlackGui::Components //! Reduce modelss class CDbReduceModelDuplicates : public QDialog, - public BlackCore::IProgressIndicator + public swift::core::IProgressIndicator { Q_OBJECT @@ -40,7 +40,7 @@ namespace BlackGui::Components //! Process models void process(); - //! \copydoc BlackCore::IProgressIndicator::updateProgressIndicator + //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator virtual void updateProgressIndicator(int percentage) override; //! The models to be removed diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index 9d23320f9..239813559 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -7,10 +7,10 @@ #include "blackgui/views/viewbase.h" #include "blackgui/guiapplication.h" #include "blackgui/models/aircraftmodellistmodel.h" -#include "blackcore/db/databasewriter.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/db/databasewriter.h" +#include "core/db/databaseutils.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/distributorlist.h" #include "misc/aviation/aircrafticaocode.h" @@ -29,8 +29,8 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; using namespace swift::misc; using namespace swift::misc::simulation; using namespace swift::misc::aviation; diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h index cb02dd57c..cc5189746 100644 --- a/src/blackgui/components/dbstashcomponent.h +++ b/src/blackgui/components/dbstashcomponent.h @@ -9,7 +9,7 @@ #include "blackgui/components/dbmappingcomponentaware.h" #include "blackgui/enablefordockwidgetinfoarea.h" #include "blackgui/blackguiexport.h" -#include "blackcore/data/authenticateduser.h" +#include "core/data/authenticateduser.h" #include "misc/aviation/airlineicaocode.h" #include "misc/propertyindexvariantmap.h" #include "misc/network/authenticateduser.h" @@ -143,7 +143,7 @@ namespace BlackGui private: QScopedPointer ui; - swift::misc::CDataReadOnly m_swiftDbUser { this, &CDbStashComponent::onUserChanged }; //!< authenticated user + swift::misc::CDataReadOnly m_swiftDbUser { this, &CDbStashComponent::onUserChanged }; //!< authenticated user //! Unstash pressed void onUnstashPressed(); diff --git a/src/blackgui/components/distributorpreferencescomponent.cpp b/src/blackgui/components/distributorpreferencescomponent.cpp index fcf557ee2..19f0fd778 100644 --- a/src/blackgui/components/distributorpreferencescomponent.cpp +++ b/src/blackgui/components/distributorpreferencescomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/distributorpreferencescomponent.h" #include "blackgui/components/simulatorselector.h" #include "blackgui/views/distributorview.h" diff --git a/src/blackgui/components/firstmodelsetcomponent.cpp b/src/blackgui/components/firstmodelsetcomponent.cpp index 32880cbd9..cfc837c9f 100644 --- a/src/blackgui/components/firstmodelsetcomponent.cpp +++ b/src/blackgui/components/firstmodelsetcomponent.cpp @@ -10,7 +10,7 @@ #include "blackgui/views/distributorview.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/directoryutils.h" #include "misc/verify.h" #include "config/buildconfig.h" diff --git a/src/blackgui/components/firstmodelsetcomponent.h b/src/blackgui/components/firstmodelsetcomponent.h index d07dd42bf..3827cc002 100644 --- a/src/blackgui/components/firstmodelsetcomponent.h +++ b/src/blackgui/components/firstmodelsetcomponent.h @@ -8,7 +8,7 @@ #include "blackgui/blackguiexport.h" #include "blackgui/overlaymessagesframe.h" -#include "blackcore/application/applicationsettings.h" +#include "core/application/applicationsettings.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/simulation/aircraftmodelloader.h" #include "misc/simulation/simulatorinfo.h" diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 43362c50c..23454aefd 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -9,10 +9,10 @@ #include "blackgui/uppercasevalidator.h" #include "blackgui/eventfilter.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextsimulator.h" +#include "core/webdataservices.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/airportlist.h" @@ -57,7 +57,7 @@ using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace swift::config; namespace BlackGui::Components diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index bf7294e5d..6f496e292 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -4,8 +4,8 @@ #include "blackgui/components/hotkeydialog.h" #include "blackgui/guiapplication.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/inputmanager.h" +#include "core/context/contextapplication.h" +#include "core/inputmanager.h" #include "misc/icons.h" #include "misc/identifier.h" #include "misc/input/hotkeycombination.h" @@ -34,7 +34,7 @@ using namespace swift::misc; using namespace swift::misc::input; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui::Models; namespace BlackGui::Components @@ -105,8 +105,8 @@ namespace BlackGui::Components if (sGui && sGui->getInputManager()) { - connect(sGui->getInputManager(), &BlackCore::CInputManager::combinationSelectionChanged, this, &CHotkeyDialog::combinationSelectionChanged); - connect(sGui->getInputManager(), &BlackCore::CInputManager::combinationSelectionFinished, this, &CHotkeyDialog::combinationSelectionFinished); + connect(sGui->getInputManager(), &swift::core::CInputManager::combinationSelectionChanged, this, &CHotkeyDialog::combinationSelectionChanged); + connect(sGui->getInputManager(), &swift::core::CInputManager::combinationSelectionFinished, this, &CHotkeyDialog::combinationSelectionFinished); } initStyleSheet(); diff --git a/src/blackgui/components/hotkeydialog.h b/src/blackgui/components/hotkeydialog.h index ed61a9e3a..537cea691 100644 --- a/src/blackgui/components/hotkeydialog.h +++ b/src/blackgui/components/hotkeydialog.h @@ -22,7 +22,7 @@ namespace Ui { class CHotkeyDialog; } -namespace BlackCore +namespace swift::core { class CInputManager; } diff --git a/src/blackgui/components/infobarstatuscomponent.cpp b/src/blackgui/components/infobarstatuscomponent.cpp index 80ae7cb5d..ec0377600 100644 --- a/src/blackgui/components/infobarstatuscomponent.cpp +++ b/src/blackgui/components/infobarstatuscomponent.cpp @@ -6,11 +6,11 @@ #include "blackgui/guiapplication.h" #include "blackgui/led.h" #include "blackgui/guiutility.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/simulator.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatorplugininfo.h" #include "misc/network/server.h" #include "misc/audio/audioutils.h" @@ -29,8 +29,8 @@ #include using namespace swift::config; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::audio; diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h index d82764503..aa6da397b 100644 --- a/src/blackgui/components/infobarstatuscomponent.h +++ b/src/blackgui/components/infobarstatuscomponent.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_INFOBARSTATUSCOMPONENT_H #define BLACKGUI_INFOBARSTATUSCOMPONENT_H -#include "blackcore/actionbind.h" +#include "core/actionbind.h" #include "blackgui/blackguiexport.h" #include "misc/audio/audiodeviceinfo.h" @@ -57,7 +57,7 @@ namespace BlackGui::Components private: QScopedPointer ui; - BlackCore::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; + swift::core::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::input::pttHotkeyIcon(), this, &CInfoBarStatusComponent::onPttChanged }; swift::misc::CDigestSignal m_dsResize { this, &CInfoBarStatusComponent::adjustTextSize, 1000, 50 }; diff --git a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp b/src/blackgui/components/infobarwebreadersstatuscomponent.cpp index 7d9add4b5..b1068b4d7 100644 --- a/src/blackgui/components/infobarwebreadersstatuscomponent.cpp +++ b/src/blackgui/components/infobarwebreadersstatuscomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/components/infobarwebreadersstatuscomponent.h" #include "blackgui/guiapplication.h" #include "misc/verify.h" @@ -11,7 +11,7 @@ using namespace BlackGui; using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc::network; namespace BlackGui::Components diff --git a/src/blackgui/components/installxswiftbuscomponent.h b/src/blackgui/components/installxswiftbuscomponent.h index 4e5225893..a54a45316 100644 --- a/src/blackgui/components/installxswiftbuscomponent.h +++ b/src/blackgui/components/installxswiftbuscomponent.h @@ -8,8 +8,8 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/loadindicator.h" -#include "blackcore/application/applicationsettings.h" -#include "blackcore/application/updatesettings.h" +#include "core/application/applicationsettings.h" +#include "core/application/updatesettings.h" #include "misc/db/updateinfo.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/network/remotefilelist.h" @@ -49,7 +49,7 @@ namespace BlackGui::Components QScopedPointer ui; swift::misc::simulation::settings::CMultiSimulatorSettings m_simulatorSettings { this }; //!< for directories of XPlane swift::misc::CDataReadOnly m_updates { this, &CInstallXSwiftBusComponent::updatesChanged }; - swift::misc::CSettingReadOnly m_updateSettings { this }; //!< channel/platform selected + swift::misc::CSettingReadOnly m_updateSettings { this }; //!< channel/platform selected const QFileDialog::Options m_fileDialogOptions { QFileDialog::ShowDirsOnly | QFileDialog::ReadOnly | QFileDialog::DontResolveSymlinks }; // the xSwiftBus artifacts diff --git a/src/blackgui/components/internalscomponent.cpp b/src/blackgui/components/internalscomponent.cpp index 8635f9c0d..7e1513eed 100644 --- a/src/blackgui/components/internalscomponent.cpp +++ b/src/blackgui/components/internalscomponent.cpp @@ -5,11 +5,11 @@ #include "blackgui/components/remoteaircraftselector.h" #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/interpolation/interpolationlogger.h" #include "misc/simulation/interpolation/interpolationrenderingsetup.h" #include "misc/aviation/callsign.h" diff --git a/src/blackgui/components/interpolationcomponent.cpp b/src/blackgui/components/interpolationcomponent.cpp index 35d4e26c8..c580054c0 100644 --- a/src/blackgui/components/interpolationcomponent.cpp +++ b/src/blackgui/components/interpolationcomponent.cpp @@ -6,7 +6,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/views/statusmessageview.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" using namespace swift::misc; using namespace swift::misc::aviation; diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index b906b2aa5..a69b2031f 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -5,16 +5,16 @@ #include "ui_interpolationlogdisplay.h" #include "blackgui/editors/coordinateform.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetworkimpl.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/airspacemonitor.h" +#include "core/context/contextnetworkimpl.h" +#include "core/context/contextsimulator.h" +#include "core/airspacemonitor.h" #include "misc/timestampobjectlist.h" #include "misc/stringutils.h" #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui::Views; using namespace BlackGui::Editors; using namespace swift::misc; diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index 1cbc1d9d5..ee4ef78ef 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/src/blackgui/components/interpolationlogdisplay.h @@ -8,7 +8,7 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/blackguiexport.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/interpolation/interpolationlogger.h" #include "misc/aviation/aircraftsituationlist.h" #include "misc/aviation/callsign.h" @@ -25,7 +25,7 @@ namespace Ui { class CInterpolationLogDisplay; } -namespace BlackCore +namespace swift::core { class CAirspaceMonitor; } @@ -62,10 +62,10 @@ namespace BlackGui::Components virtual ~CInterpolationLogDisplay() override; //! Set simulator - void setSimulator(BlackCore::ISimulator *simulator); + void setSimulator(swift::core::ISimulator *simulator); //! Set corresponding airspace monitor - void setAirspaceMonitor(BlackCore::CAirspaceMonitor *airspaceMonitor); + void setAirspaceMonitor(swift::core::CAirspaceMonitor *airspaceMonitor); //! If possible link with airspace monitor void linkWithAirspaceMonitor(); @@ -113,19 +113,19 @@ namespace BlackGui::Components //! Simulator unloaded void onSimulatorUnloaded(); - //! \copydoc BlackCore::CAirspaceMonitor::addedAircraftSituation + //! \copydoc swift::core::CAirspaceMonitor::addedAircraftSituation void onSituationAdded(const swift::misc::aviation::CAircraftSituation &situation); - //! \copydoc BlackCore::CAirspaceMonitor::addedAircraftSituation + //! \copydoc swift::core::CAirspaceMonitor::addedAircraftSituation void onPartsAdded(const swift::misc::aviation::CCallsign &callsign, const swift::misc::aviation::CAircraftParts &parts); - //! \copydoc BlackCore::ISimulator::simulatorStatusChanged - void onSimulatorStatusChanged(BlackCore::ISimulator::SimulatorStatus status); + //! \copydoc swift::core::ISimulator::simulatorStatusChanged + void onSimulatorStatusChanged(swift::core::ISimulator::SimulatorStatus status); - //! \copydoc BlackCore::ISimulator::receivedRequestedElevation + //! \copydoc swift::core::ISimulator::receivedRequestedElevation void onElevationReceived(const swift::misc::geo::CElevationPlane &elevationPlane, const swift::misc::aviation::CCallsign &callsign); - //! \copydoc BlackCore::ISimulator::requestedElevation + //! \copydoc swift::core::ISimulator::requestedElevation void onElevationRequested(const swift::misc::aviation::CCallsign &callsign); //! Call the callback of requested elevations as it would come from the simulator @@ -134,10 +134,10 @@ namespace BlackGui::Components //! Entering a count failed void onElevationHistoryCountFinished(); - //! \copydoc BlackCore::ISimulator::resetAircraftStatistics + //! \copydoc swift::core::ISimulator::resetAircraftStatistics void resetStatistics(); - //! \copydoc BlackCore::ISimulator::resetLastSentValues + //! \copydoc Blackswift::coreCore::ISimulator::resetLastSentValues void resetLastSentValues(); //! Clear @@ -187,8 +187,8 @@ namespace BlackGui::Components QScopedPointer ui; QTimer m_updateTimer; - QPointer m_simulator; //!< related simulator - QPointer m_airspaceMonitor; //!< related airspace monitor + QPointer m_simulator; //!< related simulator + QPointer m_airspaceMonitor; //!< related airspace monitor swift::misc::aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations swift::misc::aviation::CCallsign m_callsign; //!< current callsign diff --git a/src/blackgui/components/interpolationlogdisplaydialog.cpp b/src/blackgui/components/interpolationlogdisplaydialog.cpp index c63cb3e10..1cfc43bd2 100644 --- a/src/blackgui/components/interpolationlogdisplaydialog.cpp +++ b/src/blackgui/components/interpolationlogdisplaydialog.cpp @@ -4,9 +4,9 @@ #include "interpolationlogdisplaydialog.h" #include "ui_interpolationlogdisplaydialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Components { diff --git a/src/blackgui/components/interpolationlogdisplaydialog.h b/src/blackgui/components/interpolationlogdisplaydialog.h index 31fe92ad9..2d2f08830 100644 --- a/src/blackgui/components/interpolationlogdisplaydialog.h +++ b/src/blackgui/components/interpolationlogdisplaydialog.h @@ -10,7 +10,7 @@ #include #include -namespace BlackCore +namespace swift::core { class ISimulator; class CAirspaceMonitor; @@ -31,17 +31,17 @@ namespace BlackGui::Components public: //! Constructor explicit CInterpolationLogDisplayDialog( - BlackCore::ISimulator *simulator, BlackCore::CAirspaceMonitor *airspaceMonitor, + swift::core::ISimulator *simulator, swift::core::CAirspaceMonitor *airspaceMonitor, QWidget *parent = nullptr); //! Destructor virtual ~CInterpolationLogDisplayDialog() override; //! Set simulator - void setSimulator(BlackCore::ISimulator *simulator); + void setSimulator(swift::core::ISimulator *simulator); //! Set airspace monitor - void setAirspaceMonitor(BlackCore::CAirspaceMonitor *airspaceMonitor); + void setAirspaceMonitor(swift::core::CAirspaceMonitor *airspaceMonitor); protected: //! \copydoc QObject::event diff --git a/src/blackgui/components/interpolationsetupcomponent.cpp b/src/blackgui/components/interpolationsetupcomponent.cpp index b27f3a357..b73b1ea6f 100644 --- a/src/blackgui/components/interpolationsetupcomponent.cpp +++ b/src/blackgui/components/interpolationsetupcomponent.cpp @@ -5,7 +5,7 @@ #include "ui_interpolationsetupcomponent.h" #include "blackgui/views/interpolationsetupview.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/interpolation/interpolationsetuplist.h" #include "misc/statusmessage.h" #include @@ -14,7 +14,7 @@ using namespace BlackGui::Views; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/legalinfocomponent.cpp b/src/blackgui/components/legalinfocomponent.cpp index 79884420d..fb4e6958a 100644 --- a/src/blackgui/components/legalinfocomponent.cpp +++ b/src/blackgui/components/legalinfocomponent.cpp @@ -5,7 +5,7 @@ #include "ui_legalinfocomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/data/globalsetup.h" +#include "core/data/globalsetup.h" #include "misc/network/url.h" #include "misc/logmessage.h" #include "misc/statusmessage.h" @@ -15,7 +15,7 @@ using namespace swift::misc; using namespace swift::misc::network; -using namespace BlackCore::Data; +using namespace swift::core::data; using namespace swift::config; namespace BlackGui::Components diff --git a/src/blackgui/components/legalinfocomponent.h b/src/blackgui/components/legalinfocomponent.h index 6bd3192eb..0e7788041 100644 --- a/src/blackgui/components/legalinfocomponent.h +++ b/src/blackgui/components/legalinfocomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_COMPONENTS_LEGALINFOCOMPONENT_H #include "blackgui/overlaymessagesframe.h" -#include "blackcore/application/applicationsettings.h" +#include "core/application/applicationsettings.h" #include #include #include @@ -46,7 +46,7 @@ namespace BlackGui::Components void setChecklistInfo(); QScopedPointer ui; - swift::misc::CSetting m_crashDumpUploadEnabled { this }; + swift::misc::CSetting m_crashDumpUploadEnabled { this }; }; /*! diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index bfa27dd74..6c9e7d050 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -7,7 +7,7 @@ #include "blackgui/views/statusmessageview.h" #include "blackgui/views/viewbase.h" #include "blackgui/guiutility.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/icons.h" #include "misc/logpattern.h" #include "misc/sharedstate/datalinkdbus.h" @@ -20,7 +20,7 @@ #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; using namespace BlackGui::Views; using namespace BlackGui::Menus; diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp index 509138a05..9a47ecd0c 100644 --- a/src/blackgui/components/logincomponent.cpp +++ b/src/blackgui/components/logincomponent.cpp @@ -10,13 +10,13 @@ #include "blackgui/loginmodebuttons.h" #include "blackgui/ticklabel.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/webdataservices.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/simulator.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextsimulator.h" +#include "core/webdataservices.h" +#include "core/data/globalsetup.h" +#include "core/simulator.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/airlineicaocode.h" #include "misc/aviation/airporticaocode.h" @@ -52,9 +52,9 @@ using namespace swift::misc::aviation; using namespace swift::misc::audio; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Data; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::data; +using namespace swift::core::context; using namespace BlackGui; namespace BlackGui::Components diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h index bcf149b0a..2b03c62db 100644 --- a/src/blackgui/components/logincomponent.h +++ b/src/blackgui/components/logincomponent.h @@ -6,8 +6,8 @@ #ifndef BLACKGUI_LOGINCOMPONENT_H #define BLACKGUI_LOGINCOMPONENT_H -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/data/networksetup.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/data/networksetup.h" #include "blackgui/settings/guisettings.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/blackguiexport.h" @@ -190,7 +190,7 @@ namespace BlackGui::Components QTimer m_logoffCountdownTimer; //!< timer for logoff countdown swift::misc::CData m_lastAircraftModel { this }; //!< recently used aircraft model - BlackCore::Data::CNetworkSetup m_networkSetup; //!< servers last used + swift::core::data::CNetworkSetup m_networkSetup; //!< servers last used }; } // namespace diff --git a/src/blackgui/components/mainkeypadareacomponent.cpp b/src/blackgui/components/mainkeypadareacomponent.cpp index 505f9ee4f..35faa7f10 100644 --- a/src/blackgui/components/mainkeypadareacomponent.cpp +++ b/src/blackgui/components/mainkeypadareacomponent.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/corefacade.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/corefacade.h" #include "blackgui/components/mainkeypadareacomponent.h" #include "blackgui/guiapplication.h" #include "misc/aviation/transponder.h" @@ -21,8 +21,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h index a1d421348..a69d35792 100644 --- a/src/blackgui/components/mainkeypadareacomponent.h +++ b/src/blackgui/components/mainkeypadareacomponent.h @@ -75,13 +75,13 @@ namespace BlackGui::Components //! Button was clicked void buttonSelected(); - //! \copydoc BlackCore::Context::IContextNetwork::connectionStatusChanged + //! \copydoc swift::core::context::IContextNetwork::connectionStatusChanged void connectionStatusChanged(const swift::misc::network::CConnectionStatus &from, const swift::misc::network::CConnectionStatus &to); - //! \copydoc BlackCore::Context::IContextOwnAircraft::changedAircraftCockpit + //! \copydoc swift::core::context::IContextOwnAircraft::changedAircraftCockpit void ownAircraftCockpitChanged(const swift::misc::simulation::CSimulatedAircraft &aircraft, const swift::misc::CIdentifier &originator); - //! \copydoc BlackCore::Context::IContextAudio::changedOutputMute + //! \copydoc swift::core::context::IContextAudio::changedOutputMute void outputMuteChanged(bool muted); //! If button is info area, identify it diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index e6ae2c818..67d5aadc7 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -10,8 +10,8 @@ #include "blackgui/views/checkboxdelegate.h" #include "blackgui/views/simulatedaircraftview.h" #include "blackgui/views/viewbase.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" #include "misc/network/connectionstatus.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/simulatedaircraftlist.h" @@ -40,8 +40,8 @@ using namespace swift::misc::simulation; using namespace swift::misc::network; using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui::Views; using namespace BlackGui::Models; using namespace BlackGui::Filters; diff --git a/src/blackgui/components/matchingstatisticscomponent.cpp b/src/blackgui/components/matchingstatisticscomponent.cpp index 8c0f5186b..e0925ae8f 100644 --- a/src/blackgui/components/matchingstatisticscomponent.cpp +++ b/src/blackgui/components/matchingstatisticscomponent.cpp @@ -4,10 +4,10 @@ #include "matchingstatisticscomponent.h" #include "ui_matchingstatisticscomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; using namespace BlackGui::Views; namespace BlackGui::Components diff --git a/src/blackgui/components/modelbrowsercomponent.cpp b/src/blackgui/components/modelbrowsercomponent.cpp index ce2bc769c..d35aa74c3 100644 --- a/src/blackgui/components/modelbrowsercomponent.cpp +++ b/src/blackgui/components/modelbrowsercomponent.cpp @@ -4,8 +4,8 @@ #include "modelbrowsercomponent.h" #include "ui_modelbrowsercomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextsimulator.h" #include "misc/aviation/heading.h" #include "misc/pq/angle.h" #include "misc/pq/speed.h" @@ -17,8 +17,8 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::geo; using namespace BlackGui::Editors; using namespace BlackGui::Views; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/modelmatchercomponent.cpp b/src/blackgui/components/modelmatchercomponent.cpp index 34c7cc27d..3ff74c379 100644 --- a/src/blackgui/components/modelmatchercomponent.cpp +++ b/src/blackgui/components/modelmatchercomponent.cpp @@ -14,7 +14,7 @@ #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/simulation/data/modelcaches.h" #include "misc/simulation/matchingutils.h" #include "misc/aviation/aircrafticaocode.h" @@ -42,7 +42,7 @@ using namespace swift::misc::simulation::data; using namespace swift::misc::network; using namespace BlackGui::Models; using namespace BlackGui::Views; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Components { diff --git a/src/blackgui/components/modelmatchercomponent.h b/src/blackgui/components/modelmatchercomponent.h index 0f76f1b54..833aa7fd3 100644 --- a/src/blackgui/components/modelmatchercomponent.h +++ b/src/blackgui/components/modelmatchercomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_COMPONENT_MODELMATCHERCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/aircraftmatcher.h" +#include "core/aircraftmatcher.h" #include "misc/simulation/settings/modelmatchersettings.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/simulatedaircraft.h" @@ -101,7 +101,7 @@ namespace BlackGui QScopedPointer ui; QPointer m_workbenchView; //!< an external workbenc CSettingsMatchingDialog *m_settingsDialog = nullptr; //!< matching settings as dialog - BlackCore::CAircraftMatcher m_matcher { this }; //!< used matcher + swift::core::CAircraftMatcher m_matcher { this }; //!< used matcher swift::misc::CSettingReadOnly m_matchingSettings { this }; //!< settings }; } // ns diff --git a/src/blackgui/components/modelmatcherlogcomponent.cpp b/src/blackgui/components/modelmatcherlogcomponent.cpp index bb85b58be..6d82a4628 100644 --- a/src/blackgui/components/modelmatcherlogcomponent.cpp +++ b/src/blackgui/components/modelmatcherlogcomponent.cpp @@ -6,8 +6,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/uppercasevalidator.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" #include "misc/propertyindexlist.h" #include "misc/htmlutils.h" @@ -16,8 +16,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/modelmatcherlogenable.cpp b/src/blackgui/components/modelmatcherlogenable.cpp index fd51e03be..05f4cab65 100644 --- a/src/blackgui/components/modelmatcherlogenable.cpp +++ b/src/blackgui/components/modelmatcherlogenable.cpp @@ -4,14 +4,14 @@ #include "modelmatcherlogenable.h" #include "blackgui/guiapplication.h" #include "ui_modelmatcherlogenable.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc::network; using namespace swift::misc::simulation; diff --git a/src/blackgui/components/networkaircraftvaluescomponent.cpp b/src/blackgui/components/networkaircraftvaluescomponent.cpp index 0041f5c87..bd712ddd7 100644 --- a/src/blackgui/components/networkaircraftvaluescomponent.cpp +++ b/src/blackgui/components/networkaircraftvaluescomponent.cpp @@ -5,10 +5,10 @@ #include "ui_networkaircraftvaluescomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/networkdetailscomponent.cpp b/src/blackgui/components/networkdetailscomponent.cpp index fb8de31f0..b624f27ac 100644 --- a/src/blackgui/components/networkdetailscomponent.cpp +++ b/src/blackgui/components/networkdetailscomponent.cpp @@ -5,16 +5,16 @@ #include "ui_networkdetailscomponent.h" #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextnetwork.h" +#include "core/webdataservices.h" #include using namespace swift::misc::network; using namespace swift::misc::audio; using namespace swift::misc::aviation; -using namespace BlackCore; -using namespace BlackCore::Data; +using namespace swift::core; +using namespace swift::core::data; namespace BlackGui::Components { diff --git a/src/blackgui/components/networkdetailscomponent.h b/src/blackgui/components/networkdetailscomponent.h index 6c0cc3644..997bde2ef 100644 --- a/src/blackgui/components/networkdetailscomponent.h +++ b/src/blackgui/components/networkdetailscomponent.h @@ -9,7 +9,7 @@ #include #include -#include "blackcore/data/networksetup.h" +#include "core/data/networksetup.h" #include "misc/network/data/lastserver.h" #include "misc/network/entityflags.h" #include "misc/network/fsdsetup.h" @@ -93,7 +93,7 @@ namespace BlackGui::Components //! VATSIM data file was loaded void onWebServiceDataRead(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CEntityFlags::ReadState state, int number, const QUrl &url); - BlackCore::Data::CNetworkSetup m_networkSetup; //!< servers last used + swift::core::data::CNetworkSetup m_networkSetup; //!< servers last used bool m_updatePilotOnServerChanges = true; QScopedPointer ui; }; diff --git a/src/blackgui/components/ownaircraftcomponent.cpp b/src/blackgui/components/ownaircraftcomponent.cpp index 30e4443f0..077b052b4 100644 --- a/src/blackgui/components/ownaircraftcomponent.cpp +++ b/src/blackgui/components/ownaircraftcomponent.cpp @@ -6,11 +6,11 @@ #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/webdataservices.h" -#include "blackcore/simulator.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/webdataservices.h" +#include "core/simulator.h" #include "misc/simulation/aircraftmodel.h" #include "misc/crashhandler.h" #include "misc/logmessage.h" @@ -23,8 +23,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/radarcomponent.cpp b/src/blackgui/components/radarcomponent.cpp index 490a09806..3c002ccc8 100644 --- a/src/blackgui/components/radarcomponent.cpp +++ b/src/blackgui/components/radarcomponent.cpp @@ -5,8 +5,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/infoarea.h" #include "blackgui/components/radarcomponent.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" #include "misc/simulation/simulatedaircraft.h" #include diff --git a/src/blackgui/components/radarcomponent.h b/src/blackgui/components/radarcomponent.h index 2e14bb6dc..672aace4c 100644 --- a/src/blackgui/components/radarcomponent.h +++ b/src/blackgui/components/radarcomponent.h @@ -8,7 +8,7 @@ #include "blackgui/enablefordockwidgetinfoarea.h" #include "blackgui/blackguiexport.h" -#include "blackcore/actionbind.h" +#include "core/actionbind.h" #include "misc/input/actionhotkeydefs.h" #include @@ -77,8 +77,8 @@ namespace BlackGui::Components QFont m_tagFont; - BlackCore::CActionBind m_actionZoomIn { swift::misc::input::radarZoomInHotkeyAction(), swift::misc::input::radarZoomInHotkeyIcon(), this, &CRadarComponent::rangeZoomIn }; - BlackCore::CActionBind m_actionZoomOut { swift::misc::input::radarZoomOutHotkeyAction(), swift::misc::input::radarZoomOutHotkeyIcon(), this, &CRadarComponent::rangeZoomOut }; + swift::core::CActionBind m_actionZoomIn { swift::misc::input::radarZoomInHotkeyAction(), swift::misc::input::radarZoomInHotkeyIcon(), this, &CRadarComponent::rangeZoomIn }; + swift::core::CActionBind m_actionZoomOut { swift::misc::input::radarZoomOutHotkeyAction(), swift::misc::input::radarZoomOutHotkeyIcon(), this, &CRadarComponent::rangeZoomOut }; void rangeZoomIn(bool keydown) { if (keydown) { changeRangeInSteps(true); } diff --git a/src/blackgui/components/rawfsdmessagescomponent.cpp b/src/blackgui/components/rawfsdmessagescomponent.cpp index 78169b571..7edb58259 100644 --- a/src/blackgui/components/rawfsdmessagescomponent.cpp +++ b/src/blackgui/components/rawfsdmessagescomponent.cpp @@ -4,7 +4,7 @@ #include "ui_rawfsdmessagescomponent.h" #include "blackgui/components/rawfsdmessagescomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "misc/directoryutils.h" #include @@ -14,8 +14,8 @@ using namespace swift::misc; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Vatsim; +using namespace swift::core; +using namespace swift::core::vatsim; namespace BlackGui::Components { @@ -89,7 +89,7 @@ namespace BlackGui::Components ui->lbl_EnabledDisabled->setText("Disabled (Display + File)"); ui->lbl_EnabledDisabled->setStyleSheet("background: darkred;"); } - m_setting.setProperty(Vatsim::CRawFsdMessageSettings::IndexRawFsdMessagesEnabled, CVariant::fromValue(enable)); + m_setting.setProperty(vatsim::CRawFsdMessageSettings::IndexRawFsdMessagesEnabled, CVariant::fromValue(enable)); } void CRawFsdMessagesComponent::expandFilters(bool expand) @@ -180,13 +180,13 @@ namespace BlackGui::Components fileDir = QFileDialog::getExistingDirectory(this, tr("Select File Directory"), fileDir); if (fileDir.isEmpty()) { return; } ui->le_FileDir->setText(fileDir); - m_setting.setProperty(Vatsim::CRawFsdMessageSettings::IndexFileDir, CVariant::fromValue(fileDir)); + m_setting.setProperty(vatsim::CRawFsdMessageSettings::IndexFileDir, CVariant::fromValue(fileDir)); } void CRawFsdMessagesComponent::changeFileWritingMode() { const CRawFsdMessageSettings::FileWriteMode mode = ui->cb_FileWritingMode->currentData().value(); - m_setting.setProperty(Vatsim::CRawFsdMessageSettings::IndexFileWriteMode, CVariant::fromValue(mode)); + m_setting.setProperty(vatsim::CRawFsdMessageSettings::IndexFileWriteMode, CVariant::fromValue(mode)); } void CRawFsdMessagesComponent::addFsdMessage(const CRawFsdMessage &rawFsdMessage) @@ -207,7 +207,7 @@ namespace BlackGui::Components void CRawFsdMessagesComponent::readSettings() { - const Vatsim::CRawFsdMessageSettings setting = m_setting.get(); + const vatsim::CRawFsdMessageSettings setting = m_setting.get(); const bool enable = setting.areRawFsdMessagesEnabled(); if (enable) { diff --git a/src/blackgui/components/rawfsdmessagescomponent.h b/src/blackgui/components/rawfsdmessagescomponent.h index b52e0efc7..500f8e93e 100644 --- a/src/blackgui/components/rawfsdmessagescomponent.h +++ b/src/blackgui/components/rawfsdmessagescomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_RAWFSDMESSAGESCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/vatsim/vatsimsettings.h" +#include "core/vatsim/vatsimsettings.h" #include "misc/network/rawfsdmessagelist.h" #include "misc/connectionguard.h" @@ -48,7 +48,7 @@ namespace BlackGui::Components static QString rawFsdMessageToString(const swift::misc::network::CRawFsdMessage &rawFsdMessage); - swift::misc::CSetting m_setting { this }; + swift::misc::CSetting m_setting { this }; QScopedPointer ui; swift::misc::CConnectionGuard m_signalConnections; //!< connected signal/slots diff --git a/src/blackgui/components/registercomponent.cpp b/src/blackgui/components/registercomponent.cpp index 5458e5f12..4660e5e8d 100644 --- a/src/blackgui/components/registercomponent.cpp +++ b/src/blackgui/components/registercomponent.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextapplication.h" +#include "core/context/contextapplication.h" #include "blackgui/components/registercomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/views/identifierview.h" @@ -9,8 +9,8 @@ #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui::Views; namespace BlackGui::Components diff --git a/src/blackgui/components/registercomponent.h b/src/blackgui/components/registercomponent.h index 130e47ede..28c3f43bd 100644 --- a/src/blackgui/components/registercomponent.h +++ b/src/blackgui/components/registercomponent.h @@ -18,7 +18,7 @@ namespace Ui namespace BlackGui::Components { //! Show registered applications (registered with core) in the GUI - //! \sa BlackCore::Context::IContextApplication::getRegisteredApplications + //! \sa swift::core::context::IContextApplication::getRegisteredApplications class BLACKGUI_EXPORT CRegisterComponent : public QFrame { Q_OBJECT diff --git a/src/blackgui/components/remoteaircraftselector.cpp b/src/blackgui/components/remoteaircraftselector.cpp index 9b68a65d1..0bc5fc11c 100644 --- a/src/blackgui/components/remoteaircraftselector.cpp +++ b/src/blackgui/components/remoteaircraftselector.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "blackgui/components/remoteaircraftselector.h" #include "blackgui/guiapplication.h" #include "misc/aviation/aircrafticaocode.h" @@ -19,8 +19,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/serverlistselector.cpp b/src/blackgui/components/serverlistselector.cpp index 798e1633c..0acf4c868 100644 --- a/src/blackgui/components/serverlistselector.cpp +++ b/src/blackgui/components/serverlistselector.cpp @@ -4,16 +4,16 @@ #include "blackgui/components/serverlistselector.h" #include "blackgui/guiapplication.h" #include "misc/sequence.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/icaodatareader.h" +#include "core/webdataservices.h" +#include "core/db/icaodatareader.h" #include using namespace swift::misc; using namespace swift::misc::network; using namespace BlackGui; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsadvancedcomponent.h b/src/blackgui/components/settingsadvancedcomponent.h index f2f45f272..8983e9610 100644 --- a/src/blackgui/components/settingsadvancedcomponent.h +++ b/src/blackgui/components/settingsadvancedcomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_COMPONENTS_SETTINGSGENERALCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/application/applicationsettings.h" +#include "core/application/applicationsettings.h" #include "misc/settingscache.h" #include @@ -36,7 +36,7 @@ namespace BlackGui::Components void crashDumpUploadEnabledChanged(int state); QScopedPointer ui; - swift::misc::CSetting m_crashDumpUploadEnabled { this }; + swift::misc::CSetting m_crashDumpUploadEnabled { this }; }; } // ns diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 403a23076..c166b0334 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -22,7 +22,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::input; using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; using namespace swift::config; diff --git a/src/blackgui/components/settingsguicomponent.cpp b/src/blackgui/components/settingsguicomponent.cpp index d3d42520e..b96544c0f 100644 --- a/src/blackgui/components/settingsguicomponent.cpp +++ b/src/blackgui/components/settingsguicomponent.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "settingsguicomponent.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "blackgui/guiapplication.h" #include "misc/logmessage.h" #include "ui_settingsguicomponent.h" @@ -14,7 +14,7 @@ using namespace swift::misc; using namespace BlackGui::Settings; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp index 9e3004bf0..8525395d3 100644 --- a/src/blackgui/components/settingshotkeycomponent.cpp +++ b/src/blackgui/components/settingshotkeycomponent.cpp @@ -5,9 +5,9 @@ #include "blackgui/components/settingshotkeycomponent.h" #include "blackgui/components/hotkeydialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/inputmanager.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/inputmanager.h" #include "misc/input/actionhotkeydefs.h" #include "misc/metadatautils.h" #include "ui_settingshotkeycomponent.h" @@ -28,8 +28,8 @@ using namespace swift::misc; using namespace swift::misc::input; using namespace BlackGui::Models; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/blackgui/components/settingshotkeycomponent.h index 3b9deba30..8c5886214 100644 --- a/src/blackgui/components/settingshotkeycomponent.h +++ b/src/blackgui/components/settingshotkeycomponent.h @@ -8,8 +8,8 @@ #include "blackgui/blackguiexport.h" #include "blackgui/models/actionhotkeylistmodel.h" -#include "blackcore/actionbind.h" -#include "blackcore/application/applicationsettings.h" +#include "core/actionbind.h" +#include "core/application/applicationsettings.h" #include "misc/identifierlist.h" #include "misc/settingscache.h" #include "misc/icons.h" @@ -60,8 +60,8 @@ namespace BlackGui::Components QScopedPointer ui; Models::CActionHotkeyListModel m_model; //!< hotkeys model - swift::misc::CSetting m_actionHotkeys { this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings }; - BlackCore::CActionBind m_action { "/Test/Message", swift::misc::CIcons::StandardIconWrench16, this, &CSettingsHotkeyComponent::hotkeySlot }; + swift::misc::CSetting m_actionHotkeys { this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings }; + swift::core::CActionBind m_action { "/Test/Message", swift::misc::CIcons::StandardIconWrench16, this, &CSettingsHotkeyComponent::hotkeySlot }; }; /*! diff --git a/src/blackgui/components/settingsmatchingcomponent.cpp b/src/blackgui/components/settingsmatchingcomponent.cpp index 787c5f96e..1ef30cfac 100644 --- a/src/blackgui/components/settingsmatchingcomponent.cpp +++ b/src/blackgui/components/settingsmatchingcomponent.cpp @@ -4,14 +4,14 @@ #include "settingsmatchingcomponent.h" #include "ui_settingsmatchingcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/aircraftmatchersetup.h" #include "misc/logmessage.h" #include using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsmatchingcomponent.h b/src/blackgui/components/settingsmatchingcomponent.h index 692c8e4a5..917449e50 100644 --- a/src/blackgui/components/settingsmatchingcomponent.h +++ b/src/blackgui/components/settingsmatchingcomponent.h @@ -10,7 +10,7 @@ #include #include -namespace BlackCore::Context +namespace swift::core::context { class IContextSimulator; } @@ -60,7 +60,7 @@ namespace BlackGui::Components void deferredReload(int deferMs); //! Network context - static BlackCore::Context::IContextSimulator *simulatorContext(); + static swift::core::context::IContextSimulator *simulatorContext(); }; } // ns diff --git a/src/blackgui/components/settingsmodelcomponent.cpp b/src/blackgui/components/settingsmodelcomponent.cpp index d39dc1e75..39bf5f357 100644 --- a/src/blackgui/components/settingsmodelcomponent.cpp +++ b/src/blackgui/components/settingsmodelcomponent.cpp @@ -4,7 +4,7 @@ #include "settingsmodelcomponent.h" #include "ui_settingsmodelcomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/db/backgrounddataupdater.h" +#include "core/db/backgrounddataupdater.h" #include "misc/logmessage.h" #include @@ -12,7 +12,7 @@ using namespace swift::misc; using namespace swift::misc::simulation::settings; using namespace BlackGui::Settings; -using namespace BlackCore::Db; +using namespace swift::core::db; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsmodelcomponent.h b/src/blackgui/components/settingsmodelcomponent.h index 387323c29..635d8a5be 100644 --- a/src/blackgui/components/settingsmodelcomponent.h +++ b/src/blackgui/components/settingsmodelcomponent.h @@ -14,7 +14,7 @@ namespace Ui { class CSettingsModelComponent; } -namespace BlackCore::Db +namespace swift::core::db { class CBackgroundDataUpdater; } @@ -38,13 +38,13 @@ namespace BlackGui::Components int getBackgroundUpdaterIntervallSecs() const; //! Updater (the updater this setting is for) - void setBackgroundUpdater(const BlackCore::Db::CBackgroundDataUpdater *updater); + void setBackgroundUpdater(const swift::core::db::CBackgroundDataUpdater *updater); private: QScopedPointer ui; swift::misc::CSetting m_consolidationSetting { this, &CSettingsModelComponent::cacheChanged }; //!< consolidation time swift::misc::CSetting m_modelSettings { this, &CSettingsModelComponent::cacheChanged }; //!< model setting - const BlackCore::Db::CBackgroundDataUpdater *m_updater = nullptr; //!< externally (i.e. other component) provided existing updater + const swift::core::db::CBackgroundDataUpdater *m_updater = nullptr; //!< externally (i.e. other component) provided existing updater //! Consolidation time entered void consolidationEntered(); diff --git a/src/blackgui/components/settingsnetworkcomponent.cpp b/src/blackgui/components/settingsnetworkcomponent.cpp index 1af79a4b8..dcae10981 100644 --- a/src/blackgui/components/settingsnetworkcomponent.cpp +++ b/src/blackgui/components/settingsnetworkcomponent.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "blackgui/components/settingsnetworkcomponent.h" #include "blackgui/guiapplication.h" #include "ui_settingsnetworkcomponent.h" #include -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsnetworkcomponent.h b/src/blackgui/components/settingsnetworkcomponent.h index ea3fa9474..7d5941ba9 100644 --- a/src/blackgui/components/settingsnetworkcomponent.h +++ b/src/blackgui/components/settingsnetworkcomponent.h @@ -7,7 +7,7 @@ #define BLACKGUI_COMPONENTS_SETTINGSNETWORKCOMPONENT_H #include "blackgui/blackguiexport.h" -#include "blackcore/vatsim/vatsimsettings.h" +#include "core/vatsim/vatsimsettings.h" #include #include diff --git a/src/blackgui/components/settingsnetworkserverscomponent.cpp b/src/blackgui/components/settingsnetworkserverscomponent.cpp index b98c4bc21..c8cd3fb34 100644 --- a/src/blackgui/components/settingsnetworkserverscomponent.cpp +++ b/src/blackgui/components/settingsnetworkserverscomponent.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "config/buildconfig.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/data/globalsetup.h" +#include "core/context/contextapplication.h" +#include "core/data/globalsetup.h" #include "blackgui/editors/serverform.h" #include "blackgui/components/settingsnetworkserverscomponent.h" #include "blackgui/guiapplication.h" @@ -20,8 +20,8 @@ #include using namespace swift::config; -using namespace BlackCore; -using namespace BlackCore::Data; +using namespace swift::core; +using namespace swift::core::data; using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::network; diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index 011d5889e..24d3a81d0 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/pluginmanagersimulator.h" +#include "core/context/contextapplication.h" +#include "core/context/contextsimulator.h" +#include "core/pluginmanagersimulator.h" #include "blackgui/components/settingssimulatorcomponent.h" #include "blackgui/guiapplication.h" #include "blackgui/led.h" @@ -38,8 +38,8 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h index d8ef84ca5..826bf0f62 100644 --- a/src/blackgui/components/settingssimulatorcomponent.h +++ b/src/blackgui/components/settingssimulatorcomponent.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H #define BLACKGUI_COMPONENTS_SETTINGSSIMULATORCOMPONENT_H -#include "blackcore/application/applicationsettings.h" +#include "core/application/applicationsettings.h" #include "blackgui/blackguiexport.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/simulation/simulatorplugininfolist.h" @@ -21,7 +21,7 @@ namespace Ui { class CSettingsSimulatorComponent; } -namespace BlackCore +namespace swift::core { class CPluginManagerSimulator; } @@ -106,8 +106,8 @@ namespace BlackGui::Components QScopedPointer ui; //!< UI bool m_pluginLoaded = false; //!< plugin loaded? - BlackCore::CPluginManagerSimulator *m_plugins = nullptr; - swift::misc::CSetting m_enabledSimulators { this, &CSettingsSimulatorComponent::onEnabledSimulatorsChanged }; + swift::core::CPluginManagerSimulator *m_plugins = nullptr; + swift::misc::CSetting m_enabledSimulators { this, &CSettingsSimulatorComponent::onEnabledSimulatorsChanged }; }; } // namespace diff --git a/src/blackgui/components/settingsvatsimreaderscomponent.cpp b/src/blackgui/components/settingsvatsimreaderscomponent.cpp index ccaff0068..799531aee 100644 --- a/src/blackgui/components/settingsvatsimreaderscomponent.cpp +++ b/src/blackgui/components/settingsvatsimreaderscomponent.cpp @@ -6,8 +6,8 @@ using namespace swift::misc; using namespace swift::misc::physical_quantities; -using namespace BlackCore; -using namespace BlackCore::Vatsim; +using namespace swift::core; +using namespace swift::core::vatsim; namespace BlackGui::Components { diff --git a/src/blackgui/components/settingsvatsimreaderscomponent.h b/src/blackgui/components/settingsvatsimreaderscomponent.h index e6e457f0b..177267788 100644 --- a/src/blackgui/components/settingsvatsimreaderscomponent.h +++ b/src/blackgui/components/settingsvatsimreaderscomponent.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H #define BLACKGUI_COMPONENTS_SETTINGSVATSIMREADERSCOMPONENT_H -#include "blackcore/vatsim/vatsimsettings.h" +#include "core/vatsim/vatsimsettings.h" #include #include @@ -38,8 +38,8 @@ namespace BlackGui::Components void initValues(); QScopedPointer ui; - swift::misc::CSetting m_settingsDataFile { this, &CSettingsVatsimReadersComponent::onSettingsChanged }; - swift::misc::CSetting m_settingsMetars { this, &CSettingsVatsimReadersComponent::onSettingsChanged }; + swift::misc::CSetting m_settingsDataFile { this, &CSettingsVatsimReadersComponent::onSettingsChanged }; + swift::misc::CSetting m_settingsMetars { this, &CSettingsVatsimReadersComponent::onSettingsChanged }; }; } // ns diff --git a/src/blackgui/components/setuploadingdialog.cpp b/src/blackgui/components/setuploadingdialog.cpp index 6a67cac3a..a8bb82ffe 100644 --- a/src/blackgui/components/setuploadingdialog.cpp +++ b/src/blackgui/components/setuploadingdialog.cpp @@ -5,7 +5,7 @@ #include "blackgui/components/copymodelsfromotherswiftversionsdialog.h" #include "ui_setuploadingdialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/setupreader.h" +#include "core/setupreader.h" #include "misc/swiftdirectories.h" #include @@ -13,8 +13,8 @@ using namespace swift::misc; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Data; +using namespace swift::core; +using namespace swift::core::data; namespace BlackGui::Components { diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 3b0410a58..69528f9e8 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -2,11 +2,11 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "ui_simulatorcomponent.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "blackgui/components/simulatorcomponent.h" #include "blackgui/views/namevariantpairview.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextsimulator.h" #include "blackgui/guiapplication.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/simulatorplugininfo.h" @@ -26,8 +26,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/simulatorselector.cpp b/src/blackgui/components/simulatorselector.cpp index bead54b66..72972a05d 100644 --- a/src/blackgui/components/simulatorselector.cpp +++ b/src/blackgui/components/simulatorselector.cpp @@ -4,7 +4,7 @@ #include "blackgui/components/simulatorselector.h" #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/icons.h" #include "misc/mixin/mixincompare.h" #include "config/buildconfig.h" @@ -19,7 +19,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index 708e6647d..950badeaf 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -7,11 +7,11 @@ #include "blackgui/dockwidgetinfoarea.h" #include "blackgui/guiapplication.h" #include "blackgui/textmessagetextedit.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/application.h" -#include "blackcore/corefacade.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextownaircraft.h" +#include "core/application.h" +#include "core/corefacade.h" #include "misc/audio/notificationsounds.h" #include "misc/network/textmessage.h" #include "misc/network/user.h" @@ -39,8 +39,8 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc; using namespace BlackGui; using namespace BlackGui::Settings; diff --git a/src/blackgui/components/transpondermodecomponent.cpp b/src/blackgui/components/transpondermodecomponent.cpp index c4795f08a..71dc0733a 100644 --- a/src/blackgui/components/transpondermodecomponent.cpp +++ b/src/blackgui/components/transpondermodecomponent.cpp @@ -4,7 +4,7 @@ #include "transpondermodecomponent.h" #include "ui_transpondermodecomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextownaircraft.h" #include "misc/aviation/transponder.h" #include @@ -13,7 +13,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/components/updateinfocomponent.cpp b/src/blackgui/components/updateinfocomponent.cpp index 71b22c2e2..7083e0612 100644 --- a/src/blackgui/components/updateinfocomponent.cpp +++ b/src/blackgui/components/updateinfocomponent.cpp @@ -16,7 +16,7 @@ #include using namespace swift::config; -using namespace BlackCore::Application; +using namespace swift::core::application; using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; diff --git a/src/blackgui/components/updateinfocomponent.h b/src/blackgui/components/updateinfocomponent.h index ab7427c42..efa0cf700 100644 --- a/src/blackgui/components/updateinfocomponent.h +++ b/src/blackgui/components/updateinfocomponent.h @@ -6,7 +6,7 @@ #ifndef BLACKGUI_COMPONENTS_UPDATEINFOCOMPONENT_H #define BLACKGUI_COMPONENTS_UPDATEINFOCOMPONENT_H -#include "blackcore/application/updatesettings.h" +#include "core/application/updatesettings.h" #include "blackgui/blackguiexport.h" #include "misc/db/updateinfo.h" #include "misc/db/artifact.h" @@ -64,7 +64,7 @@ namespace BlackGui::Components QScopedPointer m_installXSwiftBusDialog; //!< dialog, install XSwiftXBus QScopedPointer m_downloadDialog; //!< dialog, download installer swift::misc::CDataReadOnly m_updateInfo { this, &CUpdateInfoComponent::changedUpdateInfo }; //!< version cache - swift::misc::CSetting m_updateSettings { this }; //!< channel/platform selected + swift::misc::CSetting m_updateSettings { this }; //!< channel/platform selected swift::misc::CDigestSignal m_dsDistributionAvailable { this, &CUpdateInfoComponent::updateInfoAvailable, 15000, 2 }; //! Load latest version diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index cdfa3e656..fb8c5fc1e 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -6,7 +6,7 @@ #include "blackgui/guiutility.h" #include "blackgui/views/clientview.h" #include "blackgui/views/userview.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "misc/network/connectionstatus.h" #include "misc/network/userlist.h" #include "ui_usercomponent.h" @@ -18,8 +18,8 @@ using namespace swift::misc::network; using namespace BlackGui; using namespace BlackGui::Views; using namespace BlackGui::Settings; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackGui::Components { diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/blackgui/copyxswiftbusdialog.cpp index 1f8c2b3ad..31c6985bc 100644 --- a/src/blackgui/copyxswiftbusdialog.cpp +++ b/src/blackgui/copyxswiftbusdialog.cpp @@ -4,7 +4,7 @@ #include #include "copyxswiftbusdialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/xplane/xplaneutil.h" #include "misc/swiftdirectories.h" #include "misc/directoryutils.h" @@ -13,7 +13,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::simulation::xplane; -using namespace BlackCore::Context; +using namespace swift::core::context; namespace BlackGui { diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp index 0b5ea2cda..9dff435f0 100644 --- a/src/blackgui/editors/aircrafticaoform.cpp +++ b/src/blackgui/editors/aircrafticaoform.cpp @@ -12,7 +12,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/labelandicon.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/aircrafticaocodelist.h" #include "misc/db/datastore.h" #include "misc/mixin/mixincompare.h" diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/blackgui/editors/airlineicaoform.cpp index 220bcbfe7..241bb96e1 100644 --- a/src/blackgui/editors/airlineicaoform.cpp +++ b/src/blackgui/editors/airlineicaoform.cpp @@ -10,7 +10,7 @@ #include "blackgui/guiutility.h" #include "blackgui/labelandicon.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/airlineicaocodelist.h" #include "misc/mixin/mixincompare.h" #include "misc/icons.h" diff --git a/src/blackgui/editors/cockpitcomform.cpp b/src/blackgui/editors/cockpitcomform.cpp index 1cc584102..0243aea0e 100644 --- a/src/blackgui/editors/cockpitcomform.cpp +++ b/src/blackgui/editors/cockpitcomform.cpp @@ -4,7 +4,7 @@ #include "cockpitcomform.h" #include "ui_cockpitcomform.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/math/mathutils.h" #include "misc/logmessage.h" #include "misc/icons.h" @@ -17,7 +17,7 @@ using namespace swift::misc::audio; using namespace swift::misc::physical_quantities; using namespace swift::misc::math; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; using namespace BlackGui::Components; namespace BlackGui::Editors diff --git a/src/blackgui/editors/coordinateform.cpp b/src/blackgui/editors/coordinateform.cpp index 29b4164d4..f9895bdcb 100644 --- a/src/blackgui/editors/coordinateform.cpp +++ b/src/blackgui/editors/coordinateform.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "coordinateform.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/db/airportdatareader.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextownaircraft.h" +#include "core/db/airportdatareader.h" +#include "core/webdataservices.h" #include "blackgui/guiapplication.h" #include "misc/aviation/airport.h" #include "ui_coordinateform.h" diff --git a/src/blackgui/editors/form.h b/src/blackgui/editors/form.h index 78ba97949..a785e17e0 100644 --- a/src/blackgui/editors/form.h +++ b/src/blackgui/editors/form.h @@ -8,7 +8,7 @@ #include "blackgui/overlaymessagesframe.h" #include "blackgui/blackguiexport.h" -#include "blackcore/data/authenticateduser.h" +#include "core/data/authenticateduser.h" #include "misc/datacache.h" #include #include @@ -83,7 +83,7 @@ namespace BlackGui::Editors //! User has been changed virtual void userChanged(); - swift::misc::CDataReadOnly m_swiftDbUser { this, &CFormDbUser::userChanged }; //!< authenticated user + swift::misc::CDataReadOnly m_swiftDbUser { this, &CFormDbUser::userChanged }; //!< authenticated user }; } // ns diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp index e7dd388a5..e12831365 100644 --- a/src/blackgui/editors/liveryform.cpp +++ b/src/blackgui/editors/liveryform.cpp @@ -12,7 +12,7 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/labelandicon.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/liverylist.h" #include "misc/mixin/mixincompare.h" #include "misc/icons.h" diff --git a/src/blackgui/editors/matchingform.cpp b/src/blackgui/editors/matchingform.cpp index 961fa5876..a43f2f919 100644 --- a/src/blackgui/editors/matchingform.cpp +++ b/src/blackgui/editors/matchingform.cpp @@ -10,7 +10,7 @@ using namespace swift::misc; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Editors { diff --git a/src/blackgui/editors/ownmodelsetform.cpp b/src/blackgui/editors/ownmodelsetform.cpp index 0cb59e0e8..f8afabd0d 100644 --- a/src/blackgui/editors/ownmodelsetform.cpp +++ b/src/blackgui/editors/ownmodelsetform.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "blackgui/editors/ownmodelsetform.h" #include "blackgui/models/distributorlistmodel.h" #include "blackgui/guiapplication.h" diff --git a/src/blackgui/editors/situationform.cpp b/src/blackgui/editors/situationform.cpp index 3dd3a2ab5..15032116d 100644 --- a/src/blackgui/editors/situationform.cpp +++ b/src/blackgui/editors/situationform.cpp @@ -4,7 +4,7 @@ #include "situationform.h" #include "ui_situationform.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextownaircraft.h" #include "misc/pq/pressure.h" #include "misc/pq/angle.h" #include "misc/stringutils.h" diff --git a/src/blackgui/filters/aircrafticaofilterbar.cpp b/src/blackgui/filters/aircrafticaofilterbar.cpp index f8dd5b4d1..026da21c8 100644 --- a/src/blackgui/filters/aircrafticaofilterbar.cpp +++ b/src/blackgui/filters/aircrafticaofilterbar.cpp @@ -7,7 +7,7 @@ #include "blackgui/models/aircrafticaofilter.h" #include "blackgui/uppercasevalidator.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/aircrafticaocodelist.h" #include "ui_aircrafticaofilterbar.h" @@ -19,7 +19,7 @@ using namespace swift::misc::aviation; using namespace BlackGui; using namespace BlackGui::Models; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Filters { diff --git a/src/blackgui/guiactionbind.cpp b/src/blackgui/guiactionbind.cpp index 73e54afa3..d01394b9f 100644 --- a/src/blackgui/guiactionbind.cpp +++ b/src/blackgui/guiactionbind.cpp @@ -6,7 +6,7 @@ #include "misc/imageutils.h" using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui { diff --git a/src/blackgui/guiactionbind.h b/src/blackgui/guiactionbind.h index 6b19551a1..d7fe0af62 100644 --- a/src/blackgui/guiactionbind.h +++ b/src/blackgui/guiactionbind.h @@ -7,7 +7,7 @@ #define BLACKGUI_GUIACTIONBIND_H #include "blackgui/blackguiexport.h" -#include "blackcore/actionbind.h" +#include "core/actionbind.h" #include #include @@ -17,7 +17,7 @@ namespace BlackGui { - //! QObject derived handler to be registered with BlackCore::CActionBind + //! QObject derived handler to be registered with swift::core::CActionBind class BLACKGUI_EXPORT CGuiActionBindHandler : public QObject { Q_OBJECT @@ -26,18 +26,18 @@ namespace BlackGui //! Destructor virtual ~CGuiActionBindHandler(); - //! Bound function for BlackCore::CActionBind + //! Bound function for swift::core::CActionBind void boundFunction(bool enabled); //! Bind whole menu - //! \remark keep BlackCore::CActionBindings as long you want to keep this binding alive - static BlackCore::CActionBindings bindMenu(QMenu *menu, const QString &path = {}); + //! \remark keep swift::core::CActionBindings as long you want to keep this binding alive + static swift::core::CActionBindings bindMenu(QMenu *menu, const QString &path = {}); //! Bind button, with relative name - //! \remark keep BlackCore::CActionBinding as long you want to keep this binding alive - static BlackCore::CActionBinding bindButton(QAbstractButton *button, const QString &path, bool absoluteName); + //! \remark keep swift::core::CActionBinding as long you want to keep this binding alive + static swift::core::CActionBinding bindButton(QAbstractButton *button, const QString &path, bool absoluteName); - //! Corresponding BlackCore::CActionBind died, so delete CGuiActionBindHandler + //! Corresponding swift::core::CActionBind died, so delete CGuiActionBindHandler static void actionBindWasDestroyed(CGuiActionBindHandler *bindHandler); //! Path diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index f076ede50..0634c3591 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -9,11 +9,11 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/registermetadata.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/infodatareader.h" -#include "blackcore/webdataservices.h" -#include "blackcore/setupreader.h" +#include "core/context/contextnetwork.h" +#include "core/data/globalsetup.h" +#include "core/db/infodatareader.h" +#include "core/webdataservices.h" +#include "core/setupreader.h" #include "misc/slot.h" #include "misc/stringutils.h" #include "misc/swiftdirectories.h" @@ -57,9 +57,9 @@ using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; using namespace BlackGui::Components; -using namespace BlackCore; -using namespace BlackCore::Data; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::data; +using namespace swift::core::context; BlackGui::CGuiApplication *sGui = nullptr; // set by constructor diff --git a/src/blackgui/guiapplication.h b/src/blackgui/guiapplication.h index 1199682f0..88b5ec1e6 100644 --- a/src/blackgui/guiapplication.h +++ b/src/blackgui/guiapplication.h @@ -13,7 +13,7 @@ #include "blackgui/splashscreen.h" #include "blackgui/stylesheetutility.h" #include "blackgui/blackguiexport.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/network/networkutils.h" #include "misc/icons.h" #include "misc/statusmessage.h" @@ -44,7 +44,7 @@ namespace BlackGui::Components namespace BlackGui { /*! - * \brief GUI application, a specialized version of BlackCore::CApplication for GUI applications. + * \brief GUI application, a specialized version of swift::core::CApplication for GUI applications. * * \details Analog to QCoreApplication and QApplication this class provides more details for swift * GUI applications. It is normally used via the global sGui pointer. As an example of how to extend this @@ -56,7 +56,7 @@ namespace BlackGui * */ class BLACKGUI_EXPORT CGuiApplication : - public BlackCore::CApplication, + public swift::core::CApplication, public IMainWindowAccess { Q_OBJECT @@ -196,7 +196,7 @@ namespace BlackGui //! \deprecated kept for experimental tests void setMinimumSizeInCharacters(int widthChars, int heightChars); - //! \copydoc BlackCore::CApplication::displaySetupLoadFailure + //! \copydoc swift::core::CApplication::displaySetupLoadFailure void displaySetupLoadFailure(swift::misc::CStatusMessageList msgs) override; //! Show close dialog @@ -206,7 +206,7 @@ namespace BlackGui //! Trigger new version check void triggerNewVersionCheck(int delayedMs); - //! \copydoc BlackCore::CApplication::gracefulShutdown + //! \copydoc swift::core::CApplication::gracefulShutdown void gracefulShutdown() override; //! Toggle stay on top @@ -244,7 +244,7 @@ namespace BlackGui //! \copydoc BlackGui::CGuiUtility::registerMainApplicationWidget void registerMainApplicationWidget(QWidget *mainWidget); - //! \copydoc BlackCore::CApplication::hasMinimumMappingVersion + //! \copydoc swift::core::CApplication::hasMinimumMappingVersion bool hasMinimumMappingVersion() const override; //! Main application window @@ -300,10 +300,10 @@ namespace BlackGui //! Handle parsing of special GUI cmd arguments bool parsingHookIn() override; - //! \copydoc BlackCore::CApplication::onCoreFacadeStarted + //! \copydoc swift::core::CApplication::onCoreFacadeStarted void onCoreFacadeStarted() override; - //! \copydoc BlackCore::CApplication::onStartUpCompleted + //! \copydoc swift::core::CApplication::onStartUpCompleted void onStartUpCompleted() override; //! Check for a new version (update) diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index c82dc0c8d..5c7444bc6 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -6,14 +6,14 @@ #include "config/buildconfig.h" #include "blackgui/loginmodebuttons.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/verify.h" #include using namespace swift::config; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc::network; namespace BlackGui diff --git a/src/blackgui/loginmodebuttons.h b/src/blackgui/loginmodebuttons.h index 103444075..549da81e0 100644 --- a/src/blackgui/loginmodebuttons.h +++ b/src/blackgui/loginmodebuttons.h @@ -32,7 +32,7 @@ namespace BlackGui //! Destructor virtual ~CLoginModeButtons() override; - //! Get login mode, \sa BlackCore::INetwork::LoginMode + //! Get login mode, \sa swift::core::INetwork::LoginMode swift::misc::network::CLoginMode getLoginMode() const; //! Set login mode diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp index e7dca3a1f..a6a378e1f 100644 --- a/src/blackgui/menus/aircraftmodelmenus.cpp +++ b/src/blackgui/menus/aircraftmodelmenus.cpp @@ -5,8 +5,8 @@ #include "blackgui/guiapplication.h" #include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbmappingcomponentaware.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/db/databaseutils.h" #include "misc/verify.h" #include "misc/icons.h" #include "misc/logmessage.h" @@ -22,7 +22,7 @@ using namespace BlackGui; using namespace BlackGui::Views; using namespace BlackGui::Models; using namespace BlackGui::Components; -using namespace BlackCore::Db; +using namespace swift::core::db; namespace BlackGui::Menus { diff --git a/src/blackgui/menus/menuaction.cpp b/src/blackgui/menus/menuaction.cpp index 557c2b26f..7bff23b37 100644 --- a/src/blackgui/menus/menuaction.cpp +++ b/src/blackgui/menus/menuaction.cpp @@ -3,7 +3,7 @@ #include "blackgui/menus/menuaction.h" #include "blackgui/guiapplication.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/icons.h" #include "misc/slot.h" #include "misc/verify.h" diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp index 8ff112f4a..cb802dfcd 100644 --- a/src/blackgui/models/actionmodel.cpp +++ b/src/blackgui/models/actionmodel.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" +#include "core/application.h" #include "blackgui/models/actionitem.h" #include "blackgui/models/actionmodel.h" #include "misc/icons.h" @@ -12,7 +12,7 @@ #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; namespace BlackGui::Models { diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp index 3ccc3cf23..720bac26a 100644 --- a/src/blackgui/overlaymessages.cpp +++ b/src/blackgui/overlaymessages.cpp @@ -12,8 +12,8 @@ #include "misc/aviation/callsign.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/network/textmessage.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/application.h" +#include "core/context/contextownaircraft.h" +#include "core/application.h" #include "ui_overlaymessages.h" #include @@ -35,8 +35,8 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui::Models; using namespace BlackGui::Views; using namespace BlackGui::Settings; diff --git a/src/blackgui/pluginconfig.h b/src/blackgui/pluginconfig.h index 14680535b..b3d21628e 100644 --- a/src/blackgui/pluginconfig.h +++ b/src/blackgui/pluginconfig.h @@ -21,7 +21,7 @@ namespace BlackGui * The plugin config plugin is always called from the GUI process in order * to make it possible to create a config window. * - * \sa BlackCore::ISimulator. + * \sa swift::core::ISimulator. */ class BLACKGUI_EXPORT IPluginConfig { diff --git a/src/blackgui/qml/AFVMap.qml b/src/blackgui/qml/AFVMap.qml index 1d73a58ef..48506f745 100644 --- a/src/blackgui/qml/AFVMap.qml +++ b/src/blackgui/qml/AFVMap.qml @@ -14,7 +14,7 @@ Rectangle { width: 1200 height: 800 visible: true - // title: "Audio For Vatsim" + // title: "Audio For VATSIM" Plugin { id: mapPlugin diff --git a/src/blackgui/views/flightplandialog.cpp b/src/blackgui/views/flightplandialog.cpp index 0fc831722..10f952f3f 100644 --- a/src/blackgui/views/flightplandialog.cpp +++ b/src/blackgui/views/flightplandialog.cpp @@ -5,11 +5,11 @@ #include "ui_flightplandialog.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "misc/aviation/flightplan.h" using namespace swift::misc::aviation; -using namespace BlackCore::Context; +using namespace swift::core::context; using namespace BlackGui::Components; namespace BlackGui::Views diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp index 4731bb2e8..39bc19cc9 100644 --- a/src/blackgui/views/simulatedaircraftview.cpp +++ b/src/blackgui/views/simulatedaircraftview.cpp @@ -6,8 +6,8 @@ #include "blackgui/models/simulatedaircraftlistmodel.h" #include "blackgui/menus/menuaction.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextnetwork.h" #include "misc/simulation/simulatedaircraftlist.h" #include "misc/aviation/callsign.h" #include "misc/icons.h" @@ -22,7 +22,7 @@ using namespace swift::misc; using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore::Context; +using namespace swift::core::context; using namespace BlackGui::Models; using namespace BlackGui::Menus; diff --git a/src/blackgui/views/simulatedaircraftview.h b/src/blackgui/views/simulatedaircraftview.h index 557db0530..a00525324 100644 --- a/src/blackgui/views/simulatedaircraftview.h +++ b/src/blackgui/views/simulatedaircraftview.h @@ -26,7 +26,7 @@ namespace swift::misc } } -namespace BlackCore::Context +namespace swift::core::context { class IContextSimulator; class IContextNetwork; @@ -151,10 +151,10 @@ namespace BlackGui void showFlightPlanDialog(); //! Simulator context - static BlackCore::Context::IContextSimulator *simulatorContext(); + static swift::core::context::IContextSimulator *simulatorContext(); //! Network context - static BlackCore::Context::IContextNetwork *networkContext(); + static swift::core::context::IContextNetwork *networkContext(); bool m_withRecalculate = true; bool m_withMenuHighlightAndFollow = true; diff --git a/src/config/buildconfig.h b/src/config/buildconfig.h index 2265178a4..52f2eb91f 100644 --- a/src/config/buildconfig.h +++ b/src/config/buildconfig.h @@ -96,10 +96,10 @@ namespace swift::config static bool isKnownExecutableName(const QString &executable); #ifdef SWIFT_VATSIM_SUPPORT - //! Vatsim client id + //! VATSIM client id static int vatsimClientId(); // defined in buildconfig_gen.cpp.in - //! Vatsim client key + //! VATSIM client key static const QString &vatsimPrivateKey(); // defined in buildconfig_gen.cpp.in #endif diff --git a/src/blackcore/CMakeLists.txt b/src/core/CMakeLists.txt similarity index 98% rename from src/blackcore/CMakeLists.txt rename to src/core/CMakeLists.txt index 0e27eb7fa..2e1a3a243 100644 --- a/src/blackcore/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -210,7 +210,7 @@ add_library(core SHARED airspacemonitor.h application.cpp application.h - blackcoreexport.h + swiftcoreexport.h cookiemanager.cpp cookiemanager.h corefacade.cpp @@ -267,7 +267,7 @@ if(SWIFT_VATSIM_SUPPORT) target_link_libraries(core PUBLIC externals_vatsim_auth) endif() -target_compile_definitions(core PRIVATE BUILD_BLACKCORE_LIB) +target_compile_definitions(core PRIVATE BUILD_SWIFT_CORE_LIB) target_precompile_headers(core PRIVATE diff --git a/src/blackcore/actionbind.cpp b/src/core/actionbind.cpp similarity index 96% rename from src/blackcore/actionbind.cpp rename to src/core/actionbind.cpp index 3d5332c92..24fe46433 100644 --- a/src/blackcore/actionbind.cpp +++ b/src/core/actionbind.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/actionbind.h" +#include "core/actionbind.h" -namespace BlackCore +namespace swift::core { CActionBind::CActionBind(const QString &action, swift::misc::CIcons::IconIndex icon, QObject *parent) : QObject(parent) diff --git a/src/blackcore/actionbind.h b/src/core/actionbind.h similarity index 88% rename from src/blackcore/actionbind.h rename to src/core/actionbind.h index 910d1d813..3754b9615 100644 --- a/src/blackcore/actionbind.h +++ b/src/core/actionbind.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_ACTIONBIND_H -#define BLACKCORE_ACTIONBIND_H +#ifndef SWIFT_CORE_ACTIONBIND_H +#define SWIFT_CORE_ACTIONBIND_H -#include "blackcore/application.h" -#include "blackcore/blackcoreexport.h" +#include "core/application.h" +#include "core/swiftcoreexport.h" #include -namespace BlackCore +namespace swift::core { /*! * CActionBind binds a member function to an action */ - class BLACKCORE_EXPORT CActionBind : public QObject + class SWIFT_CORE_EXPORT CActionBind : public QObject { Q_OBJECT @@ -53,10 +53,10 @@ namespace BlackCore //! Destructor virtual ~CActionBind(); - //! Unbind from BlackCore::CInputManager + //! Unbind from swift::core::CInputManager void unbind(); - //! Bound with BlackCore::CInputManager + //! Bound with swift::core::CInputManager bool isBound() const { return m_index >= 0; } //! Index diff --git a/src/blackcore/afv/audio/callsigndelaycache.cpp b/src/core/afv/audio/callsigndelaycache.cpp similarity index 95% rename from src/blackcore/afv/audio/callsigndelaycache.cpp rename to src/core/afv/audio/callsigndelaycache.cpp index ec9dd2457..4fb9e6ea0 100644 --- a/src/blackcore/afv/audio/callsigndelaycache.cpp +++ b/src/core/afv/audio/callsigndelaycache.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/audio/callsigndelaycache.h" +#include "core/afv/audio/callsigndelaycache.h" -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { void CallsignDelayCache::initialise(const QString &callsign) { diff --git a/src/blackcore/afv/audio/callsigndelaycache.h b/src/core/afv/audio/callsigndelaycache.h similarity index 90% rename from src/blackcore/afv/audio/callsigndelaycache.h rename to src/core/afv/audio/callsigndelaycache.h index e80cd265b..b0c998e79 100644 --- a/src/blackcore/afv/audio/callsigndelaycache.h +++ b/src/core/afv/audio/callsigndelaycache.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H -#define BLACKORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H +#ifndef SWIFT_ORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H +#define SWIFT_ORE_AFV_AUDIO_CALLSIGNDELAYCACHE_H #include #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { //! Callsign delay cache class CallsignDelayCache diff --git a/src/blackcore/afv/audio/callsignsampleprovider.cpp b/src/core/afv/audio/callsignsampleprovider.cpp similarity index 97% rename from src/blackcore/afv/audio/callsignsampleprovider.cpp rename to src/core/afv/audio/callsignsampleprovider.cpp index ba1106519..819f8a0ac 100644 --- a/src/blackcore/afv/audio/callsignsampleprovider.cpp +++ b/src/core/afv/audio/callsignsampleprovider.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/audio/callsignsampleprovider.h" -#include "blackcore/afv/audio/callsigndelaycache.h" +#include "core/afv/audio/callsignsampleprovider.h" +#include "core/afv/audio/callsigndelaycache.h" -#include "blackcore/afv/audio/receiversampleprovider.h" +#include "core/afv/audio/receiversampleprovider.h" #include "sound/sampleprovider/samples.h" #include "sound/audioutilities.h" #include "misc/logmessage.h" @@ -20,7 +20,7 @@ using namespace swift::misc; using namespace swift::sound::sample_provider; using namespace swift::config; -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { CCallsignSampleProvider::CCallsignSampleProvider(const QAudioFormat &audioFormat, const CReceiverSampleProvider *receiver, QObject *parent) : ISampleProvider(parent), m_audioFormat(audioFormat), diff --git a/src/blackcore/afv/audio/callsignsampleprovider.h b/src/core/afv/audio/callsignsampleprovider.h similarity index 93% rename from src/blackcore/afv/audio/callsignsampleprovider.h rename to src/core/afv/audio/callsignsampleprovider.h index 048bfdf6a..0665e26af 100644 --- a/src/blackcore/afv/audio/callsignsampleprovider.h +++ b/src/core/afv/audio/callsignsampleprovider.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H -#define BLACKCORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H +#ifndef SWIFT_CORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H +#define SWIFT_CORE_AFV_AUDIO_CALLSIGNSAMPLEPROVIDER_H -#include "blackcore/afv/dto.h" +#include "core/afv/dto.h" #include "sound/sampleprovider/pinknoisegenerator.h" #include "sound/sampleprovider/bufferedwaveprovider.h" #include "sound/sampleprovider/mixingsampleprovider.h" @@ -22,7 +22,7 @@ #include #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { class CReceiverSampleProvider; @@ -33,7 +33,7 @@ namespace BlackCore::Afv::Audio public: //! Ctor - CCallsignSampleProvider(const QAudioFormat &audioFormat, const BlackCore::Afv::Audio::CReceiverSampleProvider *receiver, QObject *parent = nullptr); + CCallsignSampleProvider(const QAudioFormat &audioFormat, const swift::core::afv::audio::CReceiverSampleProvider *receiver, QObject *parent = nullptr); //! Read samples int readSamples(QVector &samples, qint64 count) override; diff --git a/src/blackcore/afv/audio/input.cpp b/src/core/afv/audio/input.cpp similarity index 99% rename from src/blackcore/afv/audio/input.cpp rename to src/core/afv/audio/input.cpp index c81cedc49..d53c11f1f 100644 --- a/src/blackcore/afv/audio/input.cpp +++ b/src/core/afv/audio/input.cpp @@ -3,7 +3,7 @@ //! \file -#include "blackcore/afv/audio/input.h" +#include "core/afv/audio/input.h" #include "sound/audioutilities.h" #include "misc/logmessage.h" #include "misc/verify.h" @@ -18,7 +18,7 @@ using namespace swift::misc; using namespace swift::misc::audio; using namespace swift::sound; -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { CAudioInputBuffer::CAudioInputBuffer(QObject *parent) : QIODevice(parent) { diff --git a/src/blackcore/afv/audio/input.h b/src/core/afv/audio/input.h similarity index 97% rename from src/blackcore/afv/audio/input.h rename to src/core/afv/audio/input.h index 1aae1cefd..6495b91a3 100644 --- a/src/blackcore/afv/audio/input.h +++ b/src/core/afv/audio/input.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_AFV_AUDIO_AUDIO_INPUT_H -#define BLACKCORE_AFV_AUDIO_AUDIO_INPUT_H +#ifndef SWIFT_CORE_AFV_AUDIO_AUDIO_INPUT_H +#define SWIFT_CORE_AFV_AUDIO_AUDIO_INPUT_H #include "sound/sampleprovider/bufferedwaveprovider.h" #include "sound/codecs/opusencoder.h" @@ -19,7 +19,7 @@ #include #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { //! Input buffer class CAudioInputBuffer : public QIODevice diff --git a/src/blackcore/afv/audio/output.cpp b/src/core/afv/audio/output.cpp similarity index 98% rename from src/blackcore/afv/audio/output.cpp rename to src/core/afv/audio/output.cpp index 83145329b..0af5372d7 100644 --- a/src/blackcore/afv/audio/output.cpp +++ b/src/core/afv/audio/output.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/audio/output.h" +#include "core/afv/audio/output.h" #include "sound/audioutilities.h" #include "misc/metadatautils.h" #include "misc/logmessage.h" @@ -16,7 +16,7 @@ using namespace swift::misc::audio; using namespace swift::sound; using namespace swift::sound::sample_provider; -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { CAudioOutputBuffer::CAudioOutputBuffer(ISampleProvider *sampleProvider, QObject *parent) : QIODevice(parent), m_sampleProvider(sampleProvider) diff --git a/src/blackcore/afv/audio/output.h b/src/core/afv/audio/output.h similarity index 96% rename from src/blackcore/afv/audio/output.h rename to src/core/afv/audio/output.h index ec2216af6..aa39a62a6 100644 --- a/src/blackcore/afv/audio/output.h +++ b/src/core/afv/audio/output.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_AFV_AUDIO_OUTPUT_H -#define BLACKCORE_AFV_AUDIO_OUTPUT_H +#ifndef SWIFT_CORE_AFV_AUDIO_OUTPUT_H +#define SWIFT_CORE_AFV_AUDIO_OUTPUT_H #include "sound/sampleprovider/sampleprovider.h" #include "misc/audio/audiodeviceinfo.h" @@ -12,7 +12,7 @@ #include #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { //! Stream args struct OutputVolumeStreamArgs diff --git a/src/blackcore/afv/audio/receiversampleprovider.cpp b/src/core/afv/audio/receiversampleprovider.cpp similarity index 98% rename from src/blackcore/afv/audio/receiversampleprovider.cpp rename to src/core/afv/audio/receiversampleprovider.cpp index 2683c97d1..15f876a85 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.cpp +++ b/src/core/afv/audio/receiversampleprovider.cpp @@ -3,7 +3,7 @@ //! \file -#include "blackcore/afv/audio/receiversampleprovider.h" +#include "core/afv/audio/receiversampleprovider.h" #include "misc/logmessage.h" #include "misc/metadatautils.h" #include "sound/sampleprovider/resourcesoundsampleprovider.h" @@ -17,7 +17,7 @@ using namespace swift::misc::audio; using namespace swift::misc::aviation; using namespace swift::sound::sample_provider; -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { const QStringList &CReceiverSampleProvider::getLogCategories() { diff --git a/src/blackcore/afv/audio/receiversampleprovider.h b/src/core/afv/audio/receiversampleprovider.h similarity index 93% rename from src/blackcore/afv/audio/receiversampleprovider.h rename to src/core/afv/audio/receiversampleprovider.h index 82d92dd6e..da7261c21 100644 --- a/src/blackcore/afv/audio/receiversampleprovider.h +++ b/src/core/afv/audio/receiversampleprovider.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H -#define BLACKCORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H +#ifndef SWIFT_CORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H +#define SWIFT_CORE_AFV_AUDIO_RECEIVERSAMPLEPROVIDER_H -#include "blackcore/afv/audio/callsignsampleprovider.h" +#include "core/afv/audio/callsignsampleprovider.h" #include "sound/sampleprovider/sampleprovider.h" #include "sound/sampleprovider/mixingsampleprovider.h" #include "sound/sampleprovider/sinusgenerator.h" @@ -18,7 +18,7 @@ #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { //! Arguments struct TransceiverReceivingCallsignsChangedArgs @@ -115,6 +115,6 @@ namespace BlackCore::Afv::Audio }; } // ns -Q_DECLARE_METATYPE(BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs) +Q_DECLARE_METATYPE(swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs) #endif // guard diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.cpp b/src/core/afv/audio/soundcardsampleprovider.cpp similarity index 98% rename from src/blackcore/afv/audio/soundcardsampleprovider.cpp rename to src/core/afv/audio/soundcardsampleprovider.cpp index 9de0c4e51..544e69729 100644 --- a/src/blackcore/afv/audio/soundcardsampleprovider.cpp +++ b/src/core/afv/audio/soundcardsampleprovider.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/audio/soundcardsampleprovider.h" +#include "core/afv/audio/soundcardsampleprovider.h" #include "misc/metadatautils.h" #include "config/buildconfig.h" @@ -9,7 +9,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::sound::sample_provider; -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { CSoundcardSampleProvider::CSoundcardSampleProvider(int sampleRate, const QVector &transceiverIDs, QObject *parent) : ISampleProvider(parent), m_mixer(new CMixingSampleProvider()) diff --git a/src/blackcore/afv/audio/soundcardsampleprovider.h b/src/core/afv/audio/soundcardsampleprovider.h similarity index 91% rename from src/blackcore/afv/audio/soundcardsampleprovider.h rename to src/core/afv/audio/soundcardsampleprovider.h index 346fd097b..8b83f3f60 100644 --- a/src/blackcore/afv/audio/soundcardsampleprovider.h +++ b/src/core/afv/audio/soundcardsampleprovider.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKCORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H -#define BLACKCORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H +#ifndef SWIFT_CORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H +#define SWIFT_CORE_AFV_AUDIO_SOUNDCARDSAMPLEPROVIDER_H #include "sound/sampleprovider/sampleprovider.h" #include "sound/sampleprovider/mixingsampleprovider.h" -#include "blackcore/afv/audio/receiversampleprovider.h" +#include "core/afv/audio/receiversampleprovider.h" #include "misc/aviation/callsignset.h" #include #include -namespace BlackCore::Afv::Audio +namespace swift::core::afv::audio { //! Soundcard sample class CSoundcardSampleProvider : public swift::sound::sample_provider::ISampleProvider diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/core/afv/clients/afvclient.cpp similarity index 99% rename from src/blackcore/afv/clients/afvclient.cpp rename to src/core/afv/clients/afvclient.cpp index 3d5b16a73..bb05f883a 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/core/afv/clients/afvclient.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/clients/afvclient.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/application.h" +#include "core/afv/clients/afvclient.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/application.h" #include "sound/audioutilities.h" #include "misc/audio/audiodeviceinfolist.h" #include "misc/aviation/comsystem.h" @@ -19,9 +19,9 @@ #include -using namespace BlackCore::Context; -using namespace BlackCore::Afv::Audio; -using namespace BlackCore::Afv::Connection; +using namespace swift::core::context; +using namespace swift::core::afv::audio; +using namespace swift::core::afv::connection; using namespace swift::misc; using namespace swift::misc::audio; using namespace swift::misc::physical_quantities; @@ -30,7 +30,7 @@ using namespace swift::misc::aviation; using namespace swift::sound; using namespace swift::sound::sample_provider; -namespace BlackCore::Afv::Clients +namespace swift::core::afv::clients { constexpr int CAfvClient::PositionUpdatesMs; constexpr int CAfvClient::SampleRate; diff --git a/src/blackcore/afv/clients/afvclient.h b/src/core/afv/clients/afvclient.h similarity index 91% rename from src/blackcore/afv/clients/afvclient.h rename to src/core/afv/clients/afvclient.h index ec306c42a..fffc9dddd 100644 --- a/src/blackcore/afv/clients/afvclient.h +++ b/src/core/afv/clients/afvclient.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_AFV_CLIENTS_AFVCLIENT_H -#define BLACKCORE_AFV_CLIENTS_AFVCLIENT_H +#ifndef SWIFT_CORE_AFV_CLIENTS_AFVCLIENT_H +#define SWIFT_CORE_AFV_CLIENTS_AFVCLIENT_H -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/afv/connection/clientconnection.h" -#include "blackcore/afv/audio/input.h" -#include "blackcore/afv/audio/output.h" -#include "blackcore/afv/audio/soundcardsampleprovider.h" -#include "blackcore/afv/dto.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/contextownaircraft.h" +#include "core/afv/connection/clientconnection.h" +#include "core/afv/audio/input.h" +#include "core/afv/audio/output.h" +#include "core/afv/audio/soundcardsampleprovider.h" +#include "core/afv/dto.h" +#include "core/swiftcoreexport.h" #include "sound/sampleprovider/volumesampleprovider.h" #include "misc/aviation/comsystem.h" @@ -32,10 +32,10 @@ #include -namespace BlackCore::Afv::Clients +namespace swift::core::afv::clients { //! AFV client - class BLACKCORE_EXPORT CAfvClient final : public swift::misc::CContinuousWorker, public swift::misc::CIdentifiable + class SWIFT_CORE_EXPORT CAfvClient final : public swift::misc::CContinuousWorker, public swift::misc::CIdentifiable { Q_OBJECT @@ -43,7 +43,7 @@ namespace BlackCore::Afv::Clients //! AFV client properties Q_PROPERTY(double inputVolumePeakVU READ getInputVolumePeakVU NOTIFY inputVolumePeakVU) Q_PROPERTY(double outputVolumePeakVU READ getOutputVolumePeakVU NOTIFY outputVolumePeakVU) - Q_PROPERTY(BlackCore::Afv::Clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged) + Q_PROPERTY(swift::core::afv::clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged) Q_PROPERTY(QString receivingCallsignsCom1 READ getReceivingCallsignsStringCom1 NOTIFY receivingCallsignsChanged) Q_PROPERTY(QString receivingCallsignsCom2 READ getReceivingCallsignsStringCom2 NOTIFY receivingCallsignsChanged) //! @} @@ -278,7 +278,7 @@ namespace BlackCore::Afv::Clients signals: //! Receiving callsigns have been changed //! \remark callsigns I do receive - void receivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args); + void receivingCallsignsChanged(const swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs &args); //! Received callsigns have been changed //! \remark swift style per com units @@ -319,10 +319,10 @@ namespace BlackCore::Afv::Clients virtual void cleanup() override; private: - void opusDataAvailable(const Audio::OpusDataAvailableArgs &args); // threadsafe + void opusDataAvailable(const audio::OpusDataAvailableArgs &args); // threadsafe void audioOutDataAvailable(const AudioRxOnTransceiversDto &dto); // threadsafe - void inputVolumeStream(const Audio::InputVolumeStreamArgs &args); - void outputVolumeStream(const Audio::OutputVolumeStreamArgs &args); + void inputVolumeStream(const audio::InputVolumeStreamArgs &args); + void outputVolumeStream(const audio::OutputVolumeStreamArgs &args); void onTimerUpdate(); void onSettingsChanged(); @@ -330,7 +330,7 @@ namespace BlackCore::Afv::Clients void updateTransceivers(bool updateFrequencies = true); void onUpdateTransceiversFromContext(const swift::misc::simulation::CSimulatedAircraft &aircraft, const swift::misc::CIdentifier &originator); - void onReceivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args); + void onReceivingCallsignsChanged(const swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs &args); //! Re-try connection to server void retryConnectTo(const QString &cid, const QString &password, const QString &callsign, const QString &client, const QString &reason); @@ -376,14 +376,14 @@ namespace BlackCore::Afv::Clients static quint16 comUnitToTransceiverId(swift::misc::aviation::CComSystem::ComUnit comUnit); static swift::misc::aviation::CComSystem::ComUnit transceiverIdToComUnit(quint16 id); - Connection::CClientConnection *m_connection = nullptr; + connection::CClientConnection *m_connection = nullptr; swift::misc::CSetting m_audioSettings { this, &CAfvClient::onSettingsChanged }; QString m_callsign; - Audio::CInput *m_input = nullptr; - Audio::COutput *m_output = nullptr; + audio::CInput *m_input = nullptr; + audio::COutput *m_output = nullptr; - Audio::CSoundcardSampleProvider *m_soundcardSampleProvider = nullptr; + audio::CSoundcardSampleProvider *m_soundcardSampleProvider = nullptr; swift::sound::sample_provider::CVolumeSampleProvider *m_outputSampleProvider = nullptr; std::atomic_bool m_transmit { false }; @@ -420,8 +420,8 @@ namespace BlackCore::Afv::Clients QTimer *m_voiceServerTimer = nullptr; QVector m_aliasedStations; - Audio::InputVolumeStreamArgs m_inputVolumeStream; - Audio::OutputVolumeStreamArgs m_outputVolumeStream; + audio::InputVolumeStreamArgs m_inputVolumeStream; + audio::OutputVolumeStreamArgs m_outputVolumeStream; void checkServerHeartbeat(); void deferredInit(); diff --git a/src/blackcore/afv/connection/apiserverconnection.cpp b/src/core/afv/connection/apiserverconnection.cpp similarity index 99% rename from src/blackcore/afv/connection/apiserverconnection.cpp rename to src/core/afv/connection/apiserverconnection.cpp index cc95e8fba..b804d21a4 100644 --- a/src/blackcore/afv/connection/apiserverconnection.cpp +++ b/src/core/afv/connection/apiserverconnection.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/connection/apiserverconnection.h" +#include "core/afv/connection/apiserverconnection.h" #include "misc/network/networkutils.h" #include "qjsonwebtoken/qjsonwebtoken.h" @@ -21,7 +21,7 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::config; -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { const QStringList &CApiServerConnection::getLogCategories() { diff --git a/src/blackcore/afv/connection/apiserverconnection.h b/src/core/afv/connection/apiserverconnection.h similarity index 96% rename from src/blackcore/afv/connection/apiserverconnection.h rename to src/core/afv/connection/apiserverconnection.h index 889eaeaa4..8aef4e617 100644 --- a/src/blackcore/afv/connection/apiserverconnection.h +++ b/src/core/afv/connection/apiserverconnection.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_AFV_CONNECTION_APISERVERCONNECTION_H -#define BLACKCORE_AFV_CONNECTION_APISERVERCONNECTION_H +#ifndef SWIFT_CORE_AFV_CONNECTION_APISERVERCONNECTION_H +#define SWIFT_CORE_AFV_CONNECTION_APISERVERCONNECTION_H -#include "blackcore/afv/dto.h" -#include "blackcore/application.h" +#include "core/afv/dto.h" +#include "core/application.h" #include "misc/slot.h" #include "misc/logmessage.h" #include "misc/logcategories.h" @@ -23,7 +23,7 @@ #include #include -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { //! Callback for using ConnectionCallback = swift::misc::CSlot; diff --git a/src/blackcore/afv/connection/clientconnection.cpp b/src/core/afv/connection/clientconnection.cpp similarity index 98% rename from src/blackcore/afv/connection/clientconnection.cpp rename to src/core/afv/connection/clientconnection.cpp index d9ee5de02..3e20c3836 100644 --- a/src/blackcore/afv/connection/clientconnection.cpp +++ b/src/core/afv/connection/clientconnection.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/connection/clientconnection.h" +#include "core/afv/connection/clientconnection.h" #include "misc/logmessage.h" #include "config/buildconfig.h" @@ -9,9 +9,9 @@ using namespace swift::config; using namespace swift::misc; -using namespace BlackCore::Afv::Crypto; +using namespace swift::core::afv::crypto; -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { CClientConnection::CClientConnection(const QString &apiServer, QObject *parent) : QObject(parent), m_udpSocket(new QUdpSocket(this)), diff --git a/src/blackcore/afv/connection/clientconnection.h b/src/core/afv/connection/clientconnection.h similarity index 90% rename from src/blackcore/afv/connection/clientconnection.h rename to src/core/afv/connection/clientconnection.h index 4eaa3c8e5..6602a57d9 100644 --- a/src/blackcore/afv/connection/clientconnection.h +++ b/src/core/afv/connection/clientconnection.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_AFV_CONNECTION_CLIENTCONNECTION_H -#define BLACKCORE_AFV_CONNECTION_CLIENTCONNECTION_H +#ifndef SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTION_H +#define SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTION_H -#include "blackcore/afv/crypto/cryptodtoserializer.h" -#include "blackcore/afv/connection/clientconnectiondata.h" -#include "blackcore/afv/connection/apiserverconnection.h" -#include "blackcore/afv/dto.h" +#include "core/afv/crypto/cryptodtoserializer.h" +#include "core/afv/connection/clientconnectiondata.h" +#include "core/afv/connection/apiserverconnection.h" +#include "core/afv/dto.h" #include "misc/verify.h" #include @@ -17,7 +17,7 @@ #include #include -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { //! Client connection class CClientConnection : public QObject @@ -70,7 +70,7 @@ namespace BlackCore::Afv::Connection return; } const QUrl voiceServerUrl("udp://" + m_connection.getTokens().VoiceServer.addressIpV4); - const QByteArray dataBytes = Crypto::CryptoDtoSerializer::serialize(*m_connection.m_voiceCryptoChannel, Crypto::CryptoDtoMode::AEAD_ChaCha20Poly1305, dto); + const QByteArray dataBytes = crypto::CryptoDtoSerializer::serialize(*m_connection.m_voiceCryptoChannel, crypto::CryptoDtoMode::AEAD_ChaCha20Poly1305, dto); m_udpSocket->writeDatagram(dataBytes, QHostAddress(voiceServerUrl.host()), static_cast(voiceServerUrl.port())); } diff --git a/src/blackcore/afv/connection/clientconnectiondata.cpp b/src/core/afv/connection/clientconnectiondata.cpp similarity index 94% rename from src/blackcore/afv/connection/clientconnectiondata.cpp rename to src/core/afv/connection/clientconnectiondata.cpp index f2a5e179f..99119d1a3 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.cpp +++ b/src/core/afv/connection/clientconnectiondata.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/connection/clientconnectiondata.h" +#include "core/afv/connection/clientconnectiondata.h" #include "misc/logmessage.h" #include using namespace swift::misc; -using namespace BlackCore::Afv::Crypto; +using namespace swift::core::afv::crypto; -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { const QStringList &CClientConnectionData::getLogCategories() { diff --git a/src/blackcore/afv/connection/clientconnectiondata.h b/src/core/afv/connection/clientconnectiondata.h similarity index 89% rename from src/blackcore/afv/connection/clientconnectiondata.h rename to src/core/afv/connection/clientconnectiondata.h index 197e9136d..af7d7f57f 100644 --- a/src/blackcore/afv/connection/clientconnectiondata.h +++ b/src/core/afv/connection/clientconnectiondata.h @@ -3,20 +3,20 @@ //! \file -#ifndef BLACKCORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H -#define BLACKCORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H +#ifndef SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H +#define SWIFT_CORE_AFV_CONNECTION_CLIENTCONNECTIONDATA_H -#include "blackcore/afv/dto.h" -#include "blackcore/afv/connection/apiserverconnection.h" +#include "core/afv/dto.h" +#include "core/afv/connection/apiserverconnection.h" #include "misc/logcategories.h" -#include "blackcore/afv/crypto/cryptodtochannel.h" +#include "core/afv/crypto/cryptodtochannel.h" #include #include #include #include -namespace BlackCore::Afv::Connection +namespace swift::core::afv::connection { //! Client connection data class CClientConnectionData @@ -86,7 +86,7 @@ namespace BlackCore::Afv::Connection public long DataServerBytesReceived { get; set; } */ - QScopedPointer m_voiceCryptoChannel; //!< used crypto channel + QScopedPointer m_voiceCryptoChannel; //!< used crypto channel private: //! Time since authentication diff --git a/src/blackcore/afv/constants.h b/src/core/afv/constants.h similarity index 78% rename from src/blackcore/afv/constants.h rename to src/core/afv/constants.h index 4a8b18dfd..a47e3c6dd 100644 --- a/src/blackcore/afv/constants.h +++ b/src/core/afv/constants.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_AFV_CONSTANTS_H -#define BLACKCORE_AFV_CONSTANTS_H +#ifndef SWIFT_CORE_AFV_CONSTANTS_H +#define SWIFT_CORE_AFV_CONSTANTS_H -namespace BlackCore::Afv +namespace swift::core::afv { //! Audio channel count (mono) constexpr int c_channelCount = 1; diff --git a/src/blackcore/afv/crypto/cryptodtochannel.cpp b/src/core/afv/crypto/cryptodtochannel.cpp similarity index 98% rename from src/blackcore/afv/crypto/cryptodtochannel.cpp rename to src/core/afv/crypto/cryptodtochannel.cpp index 6c3de177c..7af75483e 100644 --- a/src/blackcore/afv/crypto/cryptodtochannel.cpp +++ b/src/core/afv/crypto/cryptodtochannel.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/crypto/cryptodtochannel.h" +#include "core/afv/crypto/cryptodtochannel.h" #include "misc/verify.h" #include "sodium/crypto_aead_chacha20poly1305.h" using namespace swift::misc; -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { CCryptoDtoChannel::CCryptoDtoChannel(const CryptoDtoChannelConfigDto &channelConfig, int receiveSequenceHistorySize) : m_aeadTransmitKey(channelConfig.aeadTransmitKey), m_aeadReceiveKey(channelConfig.aeadReceiveKey), m_receiveSequenceSizeMaxSize(receiveSequenceHistorySize), m_hmacKey(channelConfig.hmacKey), m_channelTag(channelConfig.channelTag) { diff --git a/src/blackcore/afv/crypto/cryptodtochannel.h b/src/core/afv/crypto/cryptodtochannel.h similarity index 87% rename from src/blackcore/afv/crypto/cryptodtochannel.h rename to src/core/afv/crypto/cryptodtochannel.h index 4d4052d70..983b51d0c 100644 --- a/src/blackcore/afv/crypto/cryptodtochannel.h +++ b/src/core/afv/crypto/cryptodtochannel.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTOCHANNEL_H -#define BLACKCORE_AFV_CRYPTO_CRYPTODTOCHANNEL_H +#ifndef SWIFT_CORE_AFV_CRYPTO_CRYPTODTOCHANNEL_H +#define SWIFT_CORE_AFV_CRYPTO_CRYPTODTOCHANNEL_H -#include "blackcore/afv/dto.h" -#include "blackcore/afv/crypto/cryptodtomode.h" +#include "core/afv/dto.h" +#include "core/afv/crypto/cryptodtomode.h" #include #include @@ -15,7 +15,7 @@ #include -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { //! Crypto channel class CCryptoDtoChannel diff --git a/src/blackcore/afv/crypto/cryptodtoheaderdto.h b/src/core/afv/crypto/cryptodtoheaderdto.h similarity index 73% rename from src/blackcore/afv/crypto/cryptodtoheaderdto.h rename to src/core/afv/crypto/cryptodtoheaderdto.h index 26a5d03e4..93a49cbf1 100644 --- a/src/blackcore/afv/crypto/cryptodtoheaderdto.h +++ b/src/core/afv/crypto/cryptodtoheaderdto.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H -#define BLACKCORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H +#ifndef SWIFT_CORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H +#define SWIFT_CORE_AFV_CRYPTO_CRYPTODTOHEADERDTO_H -#include "blackcore/afv/crypto/cryptodtomode.h" +#include "core/afv/crypto/cryptodtomode.h" #include "msgpack.hpp" #include #include -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { //! DTO header struct CryptoDtoHeaderDto diff --git a/src/blackcore/afv/crypto/cryptodtomode.h b/src/core/afv/crypto/cryptodtomode.h similarity index 68% rename from src/blackcore/afv/crypto/cryptodtomode.h rename to src/core/afv/crypto/cryptodtomode.h index de4f082a2..e380e5150 100644 --- a/src/blackcore/afv/crypto/cryptodtomode.h +++ b/src/core/afv/crypto/cryptodtomode.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTOMODE_H -#define BLACKCORE_AFV_CRYPTO_CRYPTODTOMODE_H +#ifndef SWIFT_CORE_AFV_CRYPTO_CRYPTODTOMODE_H +#define SWIFT_CORE_AFV_CRYPTO_CRYPTODTOMODE_H #include "msgpack.hpp" -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { //! DTO mode enum class CryptoDtoMode @@ -21,6 +21,6 @@ namespace BlackCore::Afv::Crypto } // ns //! \private -MSGPACK_ADD_ENUM(BlackCore::Afv::Crypto::CryptoDtoMode); +MSGPACK_ADD_ENUM(swift::core::afv::crypto::CryptoDtoMode); #endif // guard diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.cpp b/src/core/afv/crypto/cryptodtoserializer.cpp similarity index 97% rename from src/blackcore/afv/crypto/cryptodtoserializer.cpp rename to src/core/afv/crypto/cryptodtoserializer.cpp index 8f273045f..bd3261858 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.cpp +++ b/src/core/afv/crypto/cryptodtoserializer.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/crypto/cryptodtoserializer.h" +#include "core/afv/crypto/cryptodtoserializer.h" -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { CryptoDtoSerializer::CryptoDtoSerializer() {} diff --git a/src/blackcore/afv/crypto/cryptodtoserializer.h b/src/core/afv/crypto/cryptodtoserializer.h similarity index 95% rename from src/blackcore/afv/crypto/cryptodtoserializer.h rename to src/core/afv/crypto/cryptodtoserializer.h index 611f475aa..d8b4a7912 100644 --- a/src/blackcore/afv/crypto/cryptodtoserializer.h +++ b/src/core/afv/crypto/cryptodtoserializer.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H -#define BLACKCORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H +#ifndef SWIFT_CORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H +#define SWIFT_CORE_AFV_CRYPTO_CRYPTODTO_SERIALIZER_H -#include "blackcore/afv/crypto/cryptodtochannel.h" -#include "blackcore/afv/crypto/cryptodtomode.h" -#include "blackcore/afv/crypto/cryptodtoheaderdto.h" +#include "core/afv/crypto/cryptodtochannel.h" +#include "core/afv/crypto/cryptodtomode.h" +#include "core/afv/crypto/cryptodtoheaderdto.h" #include "sodium.h" #include @@ -20,7 +20,7 @@ # define crypto_aead_chacha20poly1305_IETF_ABYTES 16U #endif -namespace BlackCore::Afv::Crypto +namespace swift::core::afv::crypto { //! Hash of AFV short dto names extern QHash gShortDtoNames; diff --git a/src/blackcore/afv/dto.h b/src/core/afv/dto.h similarity index 98% rename from src/blackcore/afv/dto.h rename to src/core/afv/dto.h index ac8353b6b..e36c66274 100644 --- a/src/blackcore/afv/dto.h +++ b/src/core/afv/dto.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_AFV_DTO_H -#define BLACKCORE_AFV_DTO_H +#ifndef SWIFT_CORE_AFV_DTO_H +#define SWIFT_CORE_AFV_DTO_H #include "msgpack.hpp" @@ -13,7 +13,7 @@ #include #include -namespace BlackCore::Afv +namespace swift::core::afv { //! Channel config DTO //! \warning Data inside the DTO is taken from the network AS IS. No content verification is performed. diff --git a/src/blackcore/afv/model/afvmapreader.cpp b/src/core/afv/model/afvmapreader.cpp similarity index 95% rename from src/blackcore/afv/model/afvmapreader.cpp rename to src/core/afv/model/afvmapreader.cpp index f211c3c6d..df25b84c8 100644 --- a/src/blackcore/afv/model/afvmapreader.cpp +++ b/src/core/afv/model/afvmapreader.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/model/afvmapreader.h" -#include "blackcore/application.h" -#include "blackcore/afv/dto.h" +#include "core/afv/model/afvmapreader.h" +#include "core/application.h" +#include "core/afv/dto.h" #include "misc/aviation/callsign.h" #include #include @@ -13,7 +13,7 @@ using namespace swift::misc::aviation; -namespace BlackCore::Afv::Model +namespace swift::core::afv::model { CAfvMapReader::CAfvMapReader(QObject *parent) : QObject(parent) { diff --git a/src/blackcore/afv/model/afvmapreader.h b/src/core/afv/model/afvmapreader.h similarity index 78% rename from src/blackcore/afv/model/afvmapreader.h rename to src/core/afv/model/afvmapreader.h index b7e88701c..49df8b342 100644 --- a/src/blackcore/afv/model/afvmapreader.h +++ b/src/core/afv/model/afvmapreader.h @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#ifndef BLACKCORE_AFV_AFVMAPREADER_H -#define BLACKCORE_AFV_AFVMAPREADER_H +#ifndef SWIFT_CORE_AFV_AFVMAPREADER_H +#define SWIFT_CORE_AFV_AFVMAPREADER_H -#include "blackcore/afv/model/atcstationmodel.h" -#include "blackcore/blackcoreexport.h" +#include "core/afv/model/atcstationmodel.h" +#include "core/swiftcoreexport.h" #include #include -namespace BlackCore::Afv::Model +namespace swift::core::afv::model { //! Map reader - class BLACKCORE_EXPORT CAfvMapReader : public QObject + class SWIFT_CORE_EXPORT CAfvMapReader : public QObject { Q_OBJECT diff --git a/src/blackcore/afv/model/atcstationmodel.cpp b/src/core/afv/model/atcstationmodel.cpp similarity index 96% rename from src/blackcore/afv/model/atcstationmodel.cpp rename to src/core/afv/model/atcstationmodel.cpp index b9f15abb1..e5eca1a1d 100644 --- a/src/blackcore/afv/model/atcstationmodel.cpp +++ b/src/core/afv/model/atcstationmodel.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/afv/model/atcstationmodel.h" +#include "core/afv/model/atcstationmodel.h" #include -using namespace BlackCore::Afv; +using namespace swift::core::afv; -namespace BlackCore::Afv::Model +namespace swift::core::afv::model { CSampleAtcStation::CSampleAtcStation(const QString &callsign, const TransceiverDto &transceiver) : m_callsign(callsign), m_transceiver(transceiver) diff --git a/src/blackcore/afv/model/atcstationmodel.h b/src/core/afv/model/atcstationmodel.h similarity index 87% rename from src/blackcore/afv/model/atcstationmodel.h rename to src/core/afv/model/atcstationmodel.h index 3494c6a17..c2a34436b 100644 --- a/src/blackcore/afv/model/atcstationmodel.h +++ b/src/core/afv/model/atcstationmodel.h @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#ifndef BLACKCORE_AFV_MODEL_ATCSTATIONMODEL_H -#define BLACKCORE_AFV_MODEL_ATCSTATIONMODEL_H +#ifndef SWIFT_CORE_AFV_MODEL_ATCSTATIONMODEL_H +#define SWIFT_CORE_AFV_MODEL_ATCSTATIONMODEL_H -#include "blackcore/afv/dto.h" -#include "blackcore/blackcoreexport.h" +#include "core/afv/dto.h" +#include "core/swiftcoreexport.h" #include #include @@ -14,17 +14,17 @@ #include #include -namespace BlackCore::Afv::Model +namespace swift::core::afv::model { //! Sample ATC station - class BLACKCORE_EXPORT CSampleAtcStation + class SWIFT_CORE_EXPORT CSampleAtcStation { public: //! Ctor CSampleAtcStation() {} //! Ctor - CSampleAtcStation(const QString &callsign, const BlackCore::Afv::TransceiverDto &transceiver); + CSampleAtcStation(const QString &callsign, const swift::core::afv::TransceiverDto &transceiver); //! @{ //! Getter diff --git a/src/blackcore/aircraftmatcher.cpp b/src/core/aircraftmatcher.cpp similarity index 99% rename from src/blackcore/aircraftmatcher.cpp rename to src/core/aircraftmatcher.cpp index d7a8b6f29..10eaf323b 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/core/aircraftmatcher.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/aircraftmatcher.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/aircraftmatcher.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/matchingscript.h" #include "misc/simulation/matchingutils.h" @@ -30,7 +30,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::simulation; -namespace BlackCore +namespace swift::core { const QStringList &CAircraftMatcher::getLogCategories() { diff --git a/src/blackcore/aircraftmatcher.h b/src/core/aircraftmatcher.h similarity index 99% rename from src/blackcore/aircraftmatcher.h rename to src/core/aircraftmatcher.h index 63fb44e20..ee8e724a8 100644 --- a/src/blackcore/aircraftmatcher.h +++ b/src/core/aircraftmatcher.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_AIRCRAFTMATCHER_H -#define BLACKCORE_AIRCRAFTMATCHER_H +#ifndef SWIFT_CORE_AIRCRAFTMATCHER_H +#define SWIFT_CORE_AIRCRAFTMATCHER_H -#include "blackcore/webdataservicesms.h" -#include "blackcore/blackcoreexport.h" +#include "core/webdataservicesms.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodelsetprovider.h" #include "misc/simulation/aircraftmatchersetup.h" #include "misc/simulation/aircraftmodellist.h" @@ -39,12 +39,12 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { //! Matcher for all models. //! \details Reads the model set (ie the models the user wants to use). //! Also Allows to reverse lookup a model (from network to DB data). - class BLACKCORE_EXPORT CAircraftMatcher : + class SWIFT_CORE_EXPORT CAircraftMatcher : public QObject, public swift::misc::simulation::IAircraftModelSetProvider { diff --git a/src/blackcore/airspaceanalyzer.cpp b/src/core/airspaceanalyzer.cpp similarity index 98% rename from src/blackcore/airspaceanalyzer.cpp rename to src/core/airspaceanalyzer.cpp index 85605c4c1..8c1f68b60 100644 --- a/src/blackcore/airspaceanalyzer.cpp +++ b/src/core/airspaceanalyzer.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/airspaceanalyzer.h" -#include "blackcore/airspacemonitor.h" +#include "core/airspaceanalyzer.h" +#include "core/airspacemonitor.h" #include "misc/aviation/aircraftsituation.h" #include "misc/aviation/callsign.h" #include "misc/aviation/transponder.h" @@ -24,9 +24,9 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; -using namespace BlackCore::Fsd; +using namespace swift::core::fsd; -namespace BlackCore +namespace swift::core { CAirspaceAnalyzer::CAirspaceAnalyzer(IOwnAircraftProvider *ownAircraftProvider, CFSDClient *fsdClient, CAirspaceMonitor *airspaceMonitorParent) : CContinuousWorker(airspaceMonitorParent, "CAirspaceAnalyzer"), COwnAircraftAware(ownAircraftProvider), diff --git a/src/blackcore/airspaceanalyzer.h b/src/core/airspaceanalyzer.h similarity index 95% rename from src/blackcore/airspaceanalyzer.h rename to src/core/airspaceanalyzer.h index 66e612991..cf4fb87c3 100644 --- a/src/blackcore/airspaceanalyzer.h +++ b/src/core/airspaceanalyzer.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_AIRSPACE_ANALYZER_H -#define BLACKCORE_AIRSPACE_ANALYZER_H +#ifndef SWIFT_CORE_AIRSPACE_ANALYZER_H +#define SWIFT_CORE_AIRSPACE_ANALYZER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/fsd/fsdclient.h" +#include "core/swiftcoreexport.h" +#include "core/fsd/fsdclient.h" #include "misc/network/connectionstatus.h" #include "misc/simulation/airspaceaircraftsnapshot.h" #include "misc/simulation/ownaircraftprovider.h" @@ -34,7 +34,7 @@ namespace swift::misc::aviation class CTransponder; } -namespace BlackCore +namespace swift::core { class CAirspaceMonitor; @@ -45,7 +45,7 @@ namespace BlackCore //! clients nearby. The server does not take care of that. When a client crashes, no delete packet is ever sent. This class therefore monitors callsigns and emits a timeout signal if it //! wasn't resetted during the specified timeout value. //! - class BLACKCORE_EXPORT CAirspaceAnalyzer : + class SWIFT_CORE_EXPORT CAirspaceAnalyzer : public swift::misc::CContinuousWorker, public swift::misc::simulation::COwnAircraftAware, public swift::misc::simulation::CRemoteAircraftAware @@ -58,7 +58,7 @@ namespace BlackCore //! Constructor CAirspaceAnalyzer(swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, - Fsd::CFSDClient *fsdClient, + fsd::CFSDClient *fsdClient, CAirspaceMonitor *airspaceMonitorParent); //! Destructor diff --git a/src/blackcore/airspacemonitor.cpp b/src/core/airspacemonitor.cpp similarity index 99% rename from src/blackcore/airspacemonitor.cpp rename to src/core/airspacemonitor.cpp index 6d1521304..70af56b83 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/core/airspacemonitor.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/airspacemonitor.h" -#include "blackcore/vatsim/vatsimdatafilereader.h" -#include "blackcore/airspaceanalyzer.h" -#include "blackcore/aircraftmatcher.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/fsd/fsdclient.h" +#include "core/airspacemonitor.h" +#include "core/vatsim/vatsimdatafilereader.h" +#include "core/airspaceanalyzer.h" +#include "core/aircraftmatcher.h" +#include "core/application.h" +#include "core/webdataservices.h" +#include "core/context/contextnetwork.h" +#include "core/fsd/fsdclient.h" #include "misc/aviation/aircraftparts.h" #include "misc/aviation/aircraftsituation.h" #include "misc/aviation/comsystem.h" @@ -53,10 +53,10 @@ using namespace swift::misc::json; using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::weather; -using namespace BlackCore::Fsd; -using namespace BlackCore::Vatsim; +using namespace swift::core::fsd; +using namespace swift::core::vatsim; -namespace BlackCore +namespace swift::core { CAirspaceMonitor::CAirspaceMonitor(IOwnAircraftProvider *ownAircraftProvider, IAircraftModelSetProvider *modelSetProvider, CFSDClient *fsdClient, QObject *parent) : CRemoteAircraftProvider(parent), diff --git a/src/blackcore/airspacemonitor.h b/src/core/airspacemonitor.h similarity index 97% rename from src/blackcore/airspacemonitor.h rename to src/core/airspacemonitor.h index 41be5ac73..15dfc53ca 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/core/airspacemonitor.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_AIRSPACE_MONITOR_H -#define BLACKCORE_AIRSPACE_MONITOR_H +#ifndef SWIFT_CORE_AIRSPACE_MONITOR_H +#define SWIFT_CORE_AIRSPACE_MONITOR_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/settings/modelmatchersettings.h" #include "misc/simulation/aircraftmodelsetprovider.h" #include "misc/simulation/aircraftmodel.h" @@ -46,9 +46,9 @@ #include #include -namespace BlackCore +namespace swift::core { - namespace Fsd + namespace fsd { class CFSDClient; } @@ -56,7 +56,7 @@ namespace BlackCore //! Keeps track of other entities in the airspace: aircraft, ATC stations, etc. //! Central instance of data for \sa IRemoteAircraftProvider. - class BLACKCORE_EXPORT CAirspaceMonitor : + class SWIFT_CORE_EXPORT CAirspaceMonitor : public swift::misc::simulation::CRemoteAircraftProvider, // those data will be provided from the class CAirspaceMonitor public swift::misc::network::CClientProvider, // those data will be provided from the class CAirspaceMonitor public swift::misc::simulation::COwnAircraftAware, // used to obtain in memory information about own aircraft @@ -75,7 +75,7 @@ namespace BlackCore //! Constructor CAirspaceMonitor(swift::misc::simulation::IOwnAircraftProvider *ownAircraft, swift::misc::simulation::IAircraftModelSetProvider *modelSetProvider, - Fsd::CFSDClient *fsdClient, + fsd::CFSDClient *fsdClient, QObject *parent); //! @{ @@ -166,13 +166,13 @@ namespace BlackCore //! 
         //! .fsd range distance        max.range e.g. ".fsd range 100NM"
         //!
- //! \copydoc BlackCore::Context::IContextNetwork::parseCommandLine + //! \copydoc swift::core::context::IContextNetwork::parseCommandLine bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator); //! Register help static void registerHelp() { - if (swift::misc::CSimpleCommandParser::registered("BlackCore::Fsd::CFSDClient")) { return; } + if (swift::misc::CSimpleCommandParser::registered("swift::core::fsd::CFSDClient")) { return; } swift::misc::CSimpleCommandParser::registerCommand({ ".fsd range distance", "FSD max. range" }); } @@ -272,7 +272,7 @@ namespace BlackCore swift::misc::CSettingReadOnly m_matchingSettings { this }; //!< settings QQueue m_queryAtis; //!< query the ATIS QQueue m_queryPilot; //!< query the pilot data - Fsd::CFSDClient *m_fsdClient = nullptr; //!< corresponding network interface + fsd::CFSDClient *m_fsdClient = nullptr; //!< corresponding network interface CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer int m_maxDistanceNM = 125; //!< position range / FSD range int m_maxDistanceNMHysteresis = qRound(1.1 * m_maxDistanceNM); @@ -438,7 +438,7 @@ namespace BlackCore }; } // namespace -Q_DECLARE_METATYPE(BlackCore::CAirspaceMonitor::MatchingReadinessFlag) -Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::CAirspaceMonitor::MatchingReadiness) +Q_DECLARE_METATYPE(swift::core::CAirspaceMonitor::MatchingReadinessFlag) +Q_DECLARE_OPERATORS_FOR_FLAGS(swift::core::CAirspaceMonitor::MatchingReadiness) #endif // guard diff --git a/src/blackcore/application.cpp b/src/core/application.cpp similarity index 98% rename from src/blackcore/application.cpp rename to src/core/application.cpp index eee2a0339..2e131768b 100644 --- a/src/blackcore/application.cpp +++ b/src/core/application.cpp @@ -1,18 +1,18 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" +#include "core/application.h" #include "config/buildconfig.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulatorimpl.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/cookiemanager.h" -#include "blackcore/corefacade.h" -#include "blackcore/registermetadata.h" -#include "blackcore/setupreader.h" -#include "blackcore/webdataservices.h" -#include "blackcore/inputmanager.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulatorimpl.h" +#include "core/context/contextaudio.h" +#include "core/context/contextapplication.h" +#include "core/cookiemanager.h" +#include "core/corefacade.h" +#include "core/registermetadata.h" +#include "core/setupreader.h" +#include "core/webdataservices.h" +#include "core/inputmanager.h" #include "misc/applicationinfo.h" #include "misc/crashhandler.h" #include "misc/datacache.h" @@ -60,13 +60,13 @@ using namespace swift::misc::network; using namespace swift::misc::aviation; using namespace swift::misc::simulation; using namespace swift::misc::weather; -using namespace BlackCore; -using namespace BlackCore::Context; -using namespace BlackCore::Vatsim; -using namespace BlackCore::Data; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::context; +using namespace swift::core::vatsim; +using namespace swift::core::data; +using namespace swift::core::db; -BlackCore::CApplication *sApp = nullptr; // set by constructor +swift::core::CApplication *sApp = nullptr; // set by constructor //! \private static const QString &swiftDataRoot() @@ -75,7 +75,7 @@ static const QString &swiftDataRoot() return path; } -namespace BlackCore +namespace swift::core { CApplication::CApplication(CApplicationInfo::Application application, bool init) : CApplication(executable(), application, init) {} @@ -755,7 +755,7 @@ namespace BlackCore return this->startCoreFacade(); // will do nothing if setup is not yet loaded } - CStatusMessageList CApplication::initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig) + CStatusMessageList CApplication::initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const db::CDatabaseReaderConfigList &dbReaderConfig) { Q_ASSERT_X(m_webDataServices.isNull(), Q_FUNC_INFO, "Services already started"); SWIFT_VERIFY_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "No SSL"); @@ -794,7 +794,7 @@ namespace BlackCore return msgs; } - CStatusMessageList CApplication::startWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig) + CStatusMessageList CApplication::startWebDataServices(CWebReaderFlags::WebReader webReader, const db::CDatabaseReaderConfigList &dbReaderConfig) { Q_ASSERT_X(m_parsed, Q_FUNC_INFO, "Call this function after parsing"); @@ -867,7 +867,7 @@ namespace BlackCore void CApplication::registerMetadata() { swift::misc::registerMetadata(); - BlackCore::registerMetadata(); + swift::core::registerMetadata(); } QStringList CApplication::clearCaches() @@ -966,7 +966,7 @@ namespace BlackCore Q_ASSERT_X(m_accessManager, Q_FUNC_INFO, "Need QAM"); } - CApplication *BlackCore::CApplication::instance() + CApplication *swift::core::CApplication::instance() { return sApp; } diff --git a/src/blackcore/application.h b/src/core/application.h similarity index 94% rename from src/blackcore/application.h rename to src/core/application.h index 738ce264a..6b89b7228 100644 --- a/src/blackcore/application.h +++ b/src/core/application.h @@ -3,17 +3,17 @@ //! \file -#ifndef BLACKCORE_APPLICATION_H -#define BLACKCORE_APPLICATION_H +#ifndef SWIFT_CORE_APPLICATION_H +#define SWIFT_CORE_APPLICATION_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/db/databasereaderconfig.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/githubpackagesreader.h" -#include "blackcore/application/applicationsettings.h" -#include "blackcore/inputmanager.h" -#include "blackcore/webreaderflags.h" +#include "core/swiftcoreexport.h" +#include "core/corefacadeconfig.h" +#include "core/db/databasereaderconfig.h" +#include "core/data/globalsetup.h" +#include "core/githubpackagesreader.h" +#include "core/application/applicationsettings.h" +#include "core/inputmanager.h" +#include "core/webreaderflags.h" #include "misc/db/updateinfo.h" #include "misc/network/url.h" #include "misc/network/networkutils.h" @@ -52,14 +52,14 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CCoreFacade; class CCookieManager; class CSetupReader; class CWebDataServices; class ISimulator; - namespace Context + namespace context { class IContextApplication; class IContextAudio; @@ -85,7 +85,7 @@ namespace BlackCore * * \sa BlackGui::CGuiApplication for the GUI version of application */ - class BLACKCORE_EXPORT CApplication : + class SWIFT_CORE_EXPORT CApplication : public QObject, public swift::misc::CIdentifiable { @@ -158,7 +158,7 @@ namespace BlackCore //! Global setup //! \threadsafe - Data::CGlobalSetup getGlobalSetup() const; + data::CGlobalSetup getGlobalSetup() const; //! Update info swift::misc::db::CUpdateInfo getUpdateInfo() const; @@ -346,7 +346,7 @@ namespace BlackCore //! Init web data services and start them //! \sa webDataServicesStarted //! \remark requires setup loaded - swift::misc::CStatusMessageList initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig); + swift::misc::CStatusMessageList initAndStartWebDataServices(CWebReaderFlags::WebReader webReader, const db::CDatabaseReaderConfigList &dbReaderConfig); //! Get the facade CCoreFacade *getCoreFacade() { return m_coreFacade.data(); } @@ -364,18 +364,18 @@ namespace BlackCore //! Direct access to contexts if a CCoreFacade has been initialized //! @{ - const Context::IContextNetwork *getIContextNetwork() const; - const Context::IContextAudio *getIContextAudio() const; - const Context::CContextAudioBase *getCContextAudioBase() const; - const Context::IContextApplication *getIContextApplication() const; - const Context::IContextOwnAircraft *getIContextOwnAircraft() const; - const Context::IContextSimulator *getIContextSimulator() const; - Context::IContextNetwork *getIContextNetwork(); - Context::IContextAudio *getIContextAudio(); - Context::CContextAudioBase *getCContextAudioBase(); - Context::IContextApplication *getIContextApplication(); - Context::IContextOwnAircraft *getIContextOwnAircraft(); - Context::IContextSimulator *getIContextSimulator(); + const context::IContextNetwork *getIContextNetwork() const; + const context::IContextAudio *getIContextAudio() const; + const context::CContextAudioBase *getCContextAudioBase() const; + const context::IContextApplication *getIContextApplication() const; + const context::IContextOwnAircraft *getIContextOwnAircraft() const; + const context::IContextSimulator *getIContextSimulator() const; + context::IContextNetwork *getIContextNetwork(); + context::IContextAudio *getIContextAudio(); + context::CContextAudioBase *getCContextAudioBase(); + context::IContextApplication *getIContextApplication(); + context::IContextOwnAircraft *getIContextOwnAircraft(); + context::IContextSimulator *getIContextSimulator(); //! @} // ----------------------- setup data --------------------------------- @@ -553,7 +553,7 @@ namespace BlackCore //! Start the web data services //! \note does nothing when setup is not yet loaded - swift::misc::CStatusMessageList startWebDataServices(CWebReaderFlags::WebReader webReader, const Db::CDatabaseReaderConfigList &dbReaderConfig); + swift::misc::CStatusMessageList startWebDataServices(CWebReaderFlags::WebReader webReader, const db::CDatabaseReaderConfigList &dbReaderConfig); //! executable name static const QString &executable(); @@ -657,7 +657,7 @@ namespace BlackCore bool m_localSettingsLoaded = false; //!< local settings loaded? // -------------- crashpad ----------------- - swift::misc::CSettingReadOnly m_crashDumpUploadEnabled { this, &CApplication::onCrashDumpUploadEnabledChanged }; + swift::misc::CSettingReadOnly m_crashDumpUploadEnabled { this, &CApplication::onCrashDumpUploadEnabledChanged }; //! Upload settings changed void onCrashDumpUploadEnabledChanged(); @@ -665,6 +665,6 @@ namespace BlackCore } // namespace //! Single instance of application object -extern BLACKCORE_EXPORT BlackCore::CApplication *sApp; +extern SWIFT_CORE_EXPORT swift::core::CApplication *sApp; #endif // guard diff --git a/src/blackcore/application/applicationsettings.h b/src/core/application/applicationsettings.h similarity index 95% rename from src/blackcore/application/applicationsettings.h rename to src/core/application/applicationsettings.h index e789d514d..167350944 100644 --- a/src/blackcore/application/applicationsettings.h +++ b/src/core/application/applicationsettings.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_APPLICATION_APPLICATIONSETTINGS_H -#define BLACKCORE_APPLICATION_APPLICATIONSETTINGS_H +#ifndef SWIFT_CORE_APPLICATION_APPLICATIONSETTINGS_H +#define SWIFT_CORE_APPLICATION_APPLICATIONSETTINGS_H #include "misc/simulation/simulatorplugininfo.h" #include "misc/input/actionhotkeylist.h" @@ -13,7 +13,7 @@ #include -namespace BlackCore::Application +namespace swift::core::application { //! User configured hotkeys struct TActionHotkeys : public swift::misc::TSettingTrait diff --git a/src/blackcore/application/updatesettings.h b/src/core/application/updatesettings.h similarity index 89% rename from src/blackcore/application/updatesettings.h rename to src/core/application/updatesettings.h index d00e0e3e3..0f349390a 100644 --- a/src/blackcore/application/updatesettings.h +++ b/src/core/application/updatesettings.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_APPLICATION_UPDATESETTINGS_H -#define BLACKCORE_APPLICATION_UPDATESETTINGS_H +#ifndef SWIFT_CORE_APPLICATION_UPDATESETTINGS_H +#define SWIFT_CORE_APPLICATION_UPDATESETTINGS_H -#include "blackcore/application.h" +#include "core/application.h" #include "config/buildconfig.h" #include "misc/platform.h" #include "misc/settingscache.h" #include -namespace BlackCore::Application +namespace swift::core::application { //! Update info settings, QStringList with 2 values: channel/platform struct TUpdatePreferences : public swift::misc::TSettingTrait diff --git a/src/blackcore/audio/audiosettings.h b/src/core/audio/audiosettings.h similarity index 94% rename from src/blackcore/audio/audiosettings.h rename to src/core/audio/audiosettings.h index 445294602..444c007a2 100644 --- a/src/blackcore/audio/audiosettings.h +++ b/src/core/audio/audiosettings.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_AUDIO_SETTINGS_H -#define BLACKCORE_AUDIO_SETTINGS_H +#ifndef SWIFT_CORE_AUDIO_SETTINGS_H +#define SWIFT_CORE_AUDIO_SETTINGS_H #include "misc/settingscache.h" #include -namespace BlackCore::Audio +namespace swift::core::audio { //! Audio input device settings struct TInputDevice : public swift::misc::TSettingTrait diff --git a/src/blackcore/context/context.cpp b/src/core/context/context.cpp similarity index 96% rename from src/blackcore/context/context.cpp rename to src/core/context/context.cpp index 164102bad..b7d0373c8 100644 --- a/src/blackcore/context/context.cpp +++ b/src/core/context/context.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/context.h" -#include "blackcore/application.h" +#include "core/context/context.h" +#include "core/application.h" #include "misc/logcategories.h" using namespace swift::misc; -namespace BlackCore::Context +namespace swift::core::context { const QStringList &IContext::getLogCategories() { diff --git a/src/blackcore/context/context.h b/src/core/context/context.h similarity index 94% rename from src/blackcore/context/context.h rename to src/core/context/context.h index 0c71654cd..41a28f4a5 100644 --- a/src/blackcore/context/context.h +++ b/src/core/context/context.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXT_H -#define BLACKCORE_CONTEXT_CONTEXT_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXT_H +#define SWIFT_CORE_CONTEXT_CONTEXT_H -#include "blackcore/corefacade.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/blackcoreexport.h" +#include "core/corefacade.h" +#include "core/corefacadeconfig.h" +#include "core/swiftcoreexport.h" #include "misc/logcategories.h" #include "misc/logmessage.h" #include "misc/statusmessage.h" @@ -23,7 +23,7 @@ namespace swift::misc { class CLogCategoryList; } -namespace BlackCore::Context +namespace swift::core::context { class IContextApplication; class IContextAudio; @@ -32,7 +32,7 @@ namespace BlackCore::Context class IContextSimulator; //! Base for all context classes - class BLACKCORE_EXPORT IContext : public QObject + class SWIFT_CORE_EXPORT IContext : public QObject { Q_OBJECT diff --git a/src/blackcore/context/contextapplication.cpp b/src/core/context/contextapplication.cpp similarity index 91% rename from src/blackcore/context/contextapplication.cpp rename to src/core/context/contextapplication.cpp index b266dbacf..8caef5da0 100644 --- a/src/blackcore/context/contextapplication.cpp +++ b/src/core/context/contextapplication.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextapplicationempty.h" -#include "blackcore/context/contextapplicationimpl.h" -#include "blackcore/context/contextapplicationproxy.h" -#include "blackcore/corefacade.h" -#include "blackcore/inputmanager.h" +#include "core/application.h" +#include "core/context/contextapplication.h" +#include "core/context/contextapplicationempty.h" +#include "core/context/contextapplicationimpl.h" +#include "core/context/contextapplicationproxy.h" +#include "core/corefacade.h" +#include "core/inputmanager.h" #include "misc/dbus.h" #include "misc/dbusserver.h" #include "misc/logcategories.h" @@ -18,11 +18,11 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc; -namespace BlackCore::Context +namespace swift::core::context { IContextApplication *IContextApplication::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { diff --git a/src/blackcore/context/contextapplication.h b/src/core/context/contextapplication.h similarity index 86% rename from src/blackcore/context/contextapplication.h rename to src/core/context/contextapplication.h index 0237c421b..80519b2cb 100644 --- a/src/blackcore/context/contextapplication.h +++ b/src/core/context/contextapplication.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTAPPLICATION_H -#define BLACKCORE_CONTEXT_CONTEXTAPPLICATION_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_H +#define SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/context.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/context.h" +#include "core/corefacadeconfig.h" #include "misc/mixin/mixincompare.h" #include "misc/dictionary.h" #include "misc/identifier.h" @@ -30,45 +30,45 @@ //! \ingroup dbus //! DBus interface for context -#define BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift_project.blackcore.contextapplication" +#define SWIFT_CORE_CONTEXTAPPLICATION_INTERFACENAME "org.swift_project.swift_core.contextapplication" //! \ingroup dbus //! DBus object path for context -#define BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH "/application" +#define SWIFT_CORE_CONTEXTAPPLICATION_OBJECTPATH "/application" class QDBusConnection; namespace swift::misc { class CDBusServer; } -namespace BlackCore +namespace swift::core { class CCoreFacade; class CInputManager; - namespace Context + namespace context { //! Value type for settings keys with descriptions using CSettingsDictionary = swift::misc::CDictionary; //! Application context interface - class BLACKCORE_EXPORT IContextApplication : public IContext + class SWIFT_CORE_EXPORT IContextApplication : public IContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTAPPLICATION_INTERFACENAME) public: //! Service name static const QString &InterfaceName() { - static QString s(BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME); + static QString s(SWIFT_CORE_CONTEXTAPPLICATION_INTERFACENAME); return s; } //! Service path static const QString &ObjectPath() { - static QString s(BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH); + static QString s(SWIFT_CORE_CONTEXTAPPLICATION_OBJECTPATH); return s; } @@ -110,7 +110,7 @@ namespace BlackCore virtual QStringList getUnsavedSettingsKeys() const = 0; //! Get keys and descriptions of all unsaved settings currently in core settings cache - virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const = 0; + virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const = 0; //! Update local settings with settings from core virtual void synchronizeLocalSettings() = 0; @@ -158,6 +158,6 @@ namespace BlackCore } // ns } // ns -Q_DECLARE_METATYPE(BlackCore::Context::CSettingsDictionary) +Q_DECLARE_METATYPE(swift::core::context::CSettingsDictionary) #endif // guard diff --git a/src/blackcore/context/contextapplicationempty.h b/src/core/context/contextapplicationempty.h similarity index 91% rename from src/blackcore/context/contextapplicationempty.h rename to src/core/context/contextapplicationempty.h index 3733b4631..c8fd3f203 100644 --- a/src/blackcore/context/contextapplicationempty.h +++ b/src/core/context/contextapplicationempty.h @@ -3,23 +3,23 @@ //! \file -#ifndef BLACKCORE_CONTEXTAPPLICATION_EMPTY_H -#define BLACKCORE_CONTEXTAPPLICATION_EMPTY_H +#ifndef SWIFT_CORE_CONTEXTAPPLICATION_EMPTY_H +#define SWIFT_CORE_CONTEXTAPPLICATION_EMPTY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/corefacade.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextapplication.h" +#include "core/corefacade.h" #include "misc/identifierlist.h" // clazy:excludeall=const-signal-or-slot -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Application context - class BLACKCORE_EXPORT CContextApplicationEmpty : public IContextApplication + class SWIFT_CORE_EXPORT CContextApplicationEmpty : public IContextApplication { Q_OBJECT @@ -51,7 +51,7 @@ namespace BlackCore } //! \copydoc IContextApplication::getUnsavedSettingsKeys - virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override + virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override { logEmptyContextWarning(Q_FUNC_INFO); return CSettingsDictionary(); diff --git a/src/blackcore/context/contextapplicationimpl.cpp b/src/core/context/contextapplicationimpl.cpp similarity index 97% rename from src/blackcore/context/contextapplicationimpl.cpp rename to src/core/context/contextapplicationimpl.cpp index 0c7106182..b328416c6 100644 --- a/src/blackcore/context/contextapplicationimpl.cpp +++ b/src/core/context/contextapplicationimpl.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/context/contextapplicationimpl.h" -#include "blackcore/inputmanager.h" +#include "core/application.h" +#include "core/context/contextapplicationimpl.h" +#include "core/inputmanager.h" #include "misc/dbusserver.h" #include "misc/logcategories.h" #include "misc/logmessage.h" @@ -18,7 +18,7 @@ using namespace swift::misc; -namespace BlackCore::Context +namespace swift::core::context { CContextApplication::CContextApplication(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextApplication(mode, runtime), CIdentifiable(this) {} diff --git a/src/blackcore/context/contextapplicationimpl.h b/src/core/context/contextapplicationimpl.h similarity index 58% rename from src/blackcore/context/contextapplicationimpl.h rename to src/core/context/contextapplicationimpl.h index f4aaf83d9..8849cc10a 100644 --- a/src/blackcore/context/contextapplicationimpl.h +++ b/src/core/context/contextapplicationimpl.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTAPPLICATION_IMPL_H -#define BLACKCORE_CONTEXT_CONTEXTAPPLICATION_IMPL_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_IMPL_H +#define SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_IMPL_H #include #include #include -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextapplication.h" +#include "core/corefacadeconfig.h" #include "misc/identifiable.h" #include "misc/identifierlist.h" #include "misc/statusmessage.h" @@ -25,62 +25,62 @@ namespace swift::misc class CDBusServer; } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Application context - class BLACKCORE_EXPORT CContextApplication : + class SWIFT_CORE_EXPORT CContextApplication : public IContextApplication, public swift::misc::CIdentifiable { - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTAPPLICATION_INTERFACENAME) Q_OBJECT - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; friend class IContextApplication; public slots: - //! \copydoc BlackCore::Context::IContextApplication::changeSettings + //! \copydoc swift::core::context::IContextApplication::changeSettings virtual void changeSettings(const swift::misc::CValueCachePacket &settings, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::getAllSettings + //! \copydoc swift::core::context::IContextApplication::getAllSettings virtual swift::misc::CValueCachePacket getAllSettings() const override; - //! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeys + //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeys virtual QStringList getUnsavedSettingsKeys() const override; - //! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeysDescribed - virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; + //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeysDescribed + virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; - //! \copydoc BlackCore::Context::IContextApplication::synchronizeLocalSettings + //! \copydoc swift::core::context::IContextApplication::synchronizeLocalSettings virtual void synchronizeLocalSettings() override; - //! \copydoc BlackCore::Context::IContextApplication::saveSettings + //! \copydoc swift::core::context::IContextApplication::saveSettings virtual swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; - //! \copydoc BlackCore::Context::IContextApplication::saveSettingsByKey + //! \copydoc swift::core::context::IContextApplication::saveSettingsByKey virtual swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; - //! \copydoc BlackCore::Context::IContextApplication::loadSettings + //! \copydoc swift::core::context::IContextApplication::loadSettings virtual swift::misc::CStatusMessage loadSettings() override; - //! \copydoc BlackCore::Context::IContextApplication::registerHotkeyActions + //! \copydoc swift::core::context::IContextApplication::registerHotkeyActions virtual void registerHotkeyActions(const QStringList &actions, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::callHotkeyActionRemotely + //! \copydoc swift::core::context::IContextApplication::callHotkeyActionRemotely virtual void callHotkeyActionRemotely(const QString &action, bool argument, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::registerApplication + //! \copydoc swift::core::context::IContextApplication::registerApplication virtual swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; - //! \copydoc BlackCore::Context::IContextApplication::unregisterApplication + //! \copydoc swift::core::context::IContextApplication::unregisterApplication virtual void unregisterApplication(const swift::misc::CIdentifier &application) override; - //! \copydoc BlackCore::Context::IContextApplication::getRegisteredApplications + //! \copydoc swift::core::context::IContextApplication::getRegisteredApplications virtual swift::misc::CIdentifierList getRegisteredApplications() const override; - //! \copydoc BlackCore::Context::IContextApplication::getApplicationIdentifier + //! \copydoc swift::core::context::IContextApplication::getApplicationIdentifier virtual swift::misc::CIdentifier getApplicationIdentifier() const override; protected: diff --git a/src/blackcore/context/contextapplicationproxy.cpp b/src/core/context/contextapplicationproxy.cpp similarity index 98% rename from src/blackcore/context/contextapplicationproxy.cpp rename to src/core/context/contextapplicationproxy.cpp index f4259bd8d..347e9da32 100644 --- a/src/blackcore/context/contextapplicationproxy.cpp +++ b/src/core/context/contextapplicationproxy.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/context/contextapplicationproxy.h" +#include "core/application.h" +#include "core/context/contextapplicationproxy.h" #include "misc/dbus.h" #include "misc/dbusserver.h" #include "misc/genericdbusinterface.h" @@ -16,7 +16,7 @@ using namespace swift::misc; -namespace BlackCore::Context +namespace swift::core::context { CContextApplicationProxy::CContextApplicationProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextApplication(mode, runtime) { diff --git a/src/blackcore/context/contextapplicationproxy.h b/src/core/context/contextapplicationproxy.h similarity index 67% rename from src/blackcore/context/contextapplicationproxy.h rename to src/core/context/contextapplicationproxy.h index 1d3f222c1..3322a919f 100644 --- a/src/blackcore/context/contextapplicationproxy.h +++ b/src/core/context/contextapplicationproxy.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTAPPLICATION_PROXY_H -#define BLACKCORE_CONTEXT_CONTEXTAPPLICATION_PROXY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_PROXY_H +#define SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_PROXY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextapplication.h" +#include "core/corefacadeconfig.h" #include "misc/statusmessage.h" #include "misc/valuecache.h" @@ -27,14 +27,14 @@ namespace swift::misc class CGenericDBusInterface; } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Application context proxy //! \ingroup dbus - class BLACKCORE_EXPORT CContextApplicationProxy : public IContextApplication + class SWIFT_CORE_EXPORT CContextApplicationProxy : public IContextApplication { Q_OBJECT friend class IContextApplication; @@ -44,46 +44,46 @@ namespace BlackCore virtual ~CContextApplicationProxy() override {} public slots: - //! \copydoc BlackCore::Context::IContextApplication::changeSettings + //! \copydoc swift::core::context::IContextApplication::changeSettings virtual void changeSettings(const swift::misc::CValueCachePacket &settings, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::getAllSettings + //! \copydoc swift::core::context::IContextApplication::getAllSettings virtual swift::misc::CValueCachePacket getAllSettings() const override; - //! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeys + //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeys virtual QStringList getUnsavedSettingsKeys() const override; - //! \copydoc BlackCore::Context::IContextApplication::getUnsavedSettingsKeysDescribed - virtual BlackCore::Context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; + //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeysDescribed + virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; - //! \copydoc BlackCore::Context::IContextApplication::synchronizeLocalSettings + //! \copydoc swift::core::context::IContextApplication::synchronizeLocalSettings virtual void synchronizeLocalSettings() override; - //! \copydoc BlackCore::Context::IContextApplication::saveSettings + //! \copydoc swift::core::context::IContextApplication::saveSettings virtual swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; - //! \copydoc BlackCore::Context::IContextApplication::saveSettingsByKey + //! \copydoc swift::core::context::IContextApplication::saveSettingsByKey virtual swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; - //! \copydoc BlackCore::Context::IContextApplication::loadSettings + //! \copydoc swift::core::context::IContextApplication::loadSettings virtual swift::misc::CStatusMessage loadSettings() override; - //! \copydoc BlackCore::Context::IContextApplication::registerHotkeyActions + //! \copydoc swift::core::context::IContextApplication::registerHotkeyActions virtual void registerHotkeyActions(const QStringList &actions, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::callHotkeyActionRemotely + //! \copydoc swift::core::context::IContextApplication::callHotkeyActionRemotely virtual void callHotkeyActionRemotely(const QString &action, bool argument, const swift::misc::CIdentifier &origin) override; - //! \copydoc BlackCore::Context::IContextApplication::registerApplication + //! \copydoc swift::core::context::IContextApplication::registerApplication virtual swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; - //! \copydoc BlackCore::Context::IContextApplication::unregisterApplication + //! \copydoc swift::core::context::IContextApplication::unregisterApplication virtual void unregisterApplication(const swift::misc::CIdentifier &application) override; - //! \copydoc BlackCore::Context::IContextApplication::getRegisteredApplications + //! \copydoc swift::core::context::IContextApplication::getRegisteredApplications virtual swift::misc::CIdentifierList getRegisteredApplications() const override; - //! \copydoc BlackCore::Context::IContextApplication::getApplicationIdentifier + //! \copydoc swift::core::context::IContextApplication::getApplicationIdentifier virtual swift::misc::CIdentifier getApplicationIdentifier() const override; //! Used to test if there is a core running? diff --git a/src/blackcore/context/contextaudio.cpp b/src/core/context/contextaudio.cpp similarity index 97% rename from src/blackcore/context/contextaudio.cpp rename to src/core/context/contextaudio.cpp index bdf3a9dbc..56178351d 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/core/context/contextaudio.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" // for user login -#include "blackcore/context/contextownaircraft.h" // for COM integration -#include "blackcore/context/contextsimulator.h" // for COM intergration -#include "blackcore/context/contextaudioimpl.h" -#include "blackcore/context/contextaudioproxy.h" -#include "blackcore/afv/clients/afvclient.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" // for user login +#include "core/context/contextownaircraft.h" // for COM integration +#include "core/context/contextsimulator.h" // for COM intergration +#include "core/context/contextaudioimpl.h" +#include "core/context/contextaudioproxy.h" +#include "core/afv/clients/afvclient.h" #include "misc/simplecommandparser.h" #include "misc/dbusserver.h" #include "misc/stringutils.h" @@ -26,11 +26,11 @@ using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; using namespace swift::sound; -using namespace BlackCore::Afv::Clients; +using namespace swift::core::afv::clients; //! \cond -namespace BlackCore::Context +namespace swift::core::context { IContextAudio::IContextAudio(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContext(mode, runtime) { @@ -44,13 +44,13 @@ namespace BlackCore::Context const QString &IContextAudio::InterfaceName() { - static const QString s(BLACKCORE_CONTEXTAUDIO_INTERFACENAME); + static const QString s(SWIFT_CORE_CONTEXTAUDIO_INTERFACENAME); return s; } const QString &IContextAudio::ObjectPath() { - static const QString s(BLACKCORE_CONTEXTAUDIO_OBJECTPATH); + static const QString s(SWIFT_CORE_CONTEXTAUDIO_OBJECTPATH); return s; } diff --git a/src/blackcore/context/contextaudio.h b/src/core/context/contextaudio.h similarity index 90% rename from src/blackcore/context/contextaudio.h rename to src/core/context/contextaudio.h index 09054e8f7..79f684bd3 100644 --- a/src/blackcore/context/contextaudio.h +++ b/src/core/context/contextaudio.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTAUDIO_H -#define BLACKCORE_CONTEXT_CONTEXTAUDIO_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTAUDIO_H +#define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_H -#include "blackcore/audio/audiosettings.h" -#include "blackcore/context/context.h" -#include "blackcore/actionbind.h" -#include "blackcore/corefacade.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/blackcoreexport.h" -#include "blackcore/afv/audio/receiversampleprovider.h" +#include "core/audio/audiosettings.h" +#include "core/context/context.h" +#include "core/actionbind.h" +#include "core/corefacade.h" +#include "core/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/afv/audio/receiversampleprovider.h" #include "sound/selcalplayer.h" #include "sound/notificationplayer.h" #include "misc/macos/microphoneaccess.h" @@ -38,11 +38,11 @@ //! \ingroup dbus //! DBus interface for context -#define BLACKCORE_CONTEXTAUDIO_INTERFACENAME "org.swift_project.blackcore.contextaudio" +#define SWIFT_CORE_CONTEXTAUDIO_INTERFACENAME "org.swift_project.swift_core.contextaudio" //! \ingroup dbus //! DBus object path for context -#define BLACKCORE_CONTEXTAUDIO_OBJECTPATH "/audio" +#define SWIFT_CORE_CONTEXTAUDIO_OBJECTPATH "/audio" class QDBusConnection; @@ -50,21 +50,21 @@ namespace swift::misc { class CDBusServer; } -namespace BlackCore +namespace swift::core { - namespace Afv::Clients + namespace afv::clients { class CAfvClient; } - namespace Context + namespace context { //! Audio context interface - class BLACKCORE_EXPORT IContextAudio : public IContext + class SWIFT_CORE_EXPORT IContextAudio : public IContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTAUDIO_INTERFACENAME) - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; public: //! Interface name @@ -122,12 +122,12 @@ namespace BlackCore }; //! Audio context interface - class BLACKCORE_EXPORT CContextAudioBase : + class SWIFT_CORE_EXPORT CContextAudioBase : public IContextAudio, public swift::misc::CIdentifiable { Q_OBJECT - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; protected: //! Constructor @@ -216,7 +216,7 @@ namespace BlackCore bool isComUnitIntegrated() const; //! \todo WORKAROUND to hide the "local signals" - Afv::Clients::CAfvClient *afvClient() const { return m_voiceClient; } + afv::clients::CAfvClient *afvClient() const { return m_voiceClient; } //! Cmd.line arguments static const QList &getCmdLineOptions(); @@ -227,7 +227,7 @@ namespace BlackCore //! Register the commands static void registerHelp() { - if (swift::misc::CSimpleCommandParser::registered("BlackCore::Context::CContextAudioBase")) { return; } + if (swift::misc::CSimpleCommandParser::registered("swift::core::context::CContextAudioBase")) { return; } swift::misc::CSimpleCommandParser::registerCommand({ ".mute", "mute audio" }); swift::misc::CSimpleCommandParser::registerCommand({ ".unmute", "unmute audio" }); swift::misc::CSimpleCommandParser::registerCommand({ ".vol volume", "volume 0..100" }); @@ -243,10 +243,10 @@ namespace BlackCore //! Parse command line //! \ingroup swiftdotcommands //! 
-            //! .mute                          mute             BlackCore::Context::CContextAudioBase
-            //! .unmute                        unmute           BlackCore::Context::CContextAudioBase
-            //! .vol .volume   volume 0..100   set volume       BlackCore::Context::CContextAudioBase
-            //! .aliased on|off                aliased stations BlackCore::Context::CContextAudioBase
+            //! .mute                          mute             swift::core::context::CContextAudioBase
+            //! .unmute                        unmute           swift::core::context::CContextAudioBase
+            //! .vol .volume   volume 0..100   set volume       swift::core::context::CContextAudioBase
+            //! .aliased on|off                aliased stations swift::core::context::CContextAudioBase
             //!
virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! \endcond @@ -285,7 +285,7 @@ namespace BlackCore //! @} //! Callsigns I receive have changed - void receivingCallsignsChanged(const BlackCore::Afv::Audio::TransceiverReceivingCallsignsChangedArgs &args); + void receivingCallsignsChanged(const swift::core::afv::audio::TransceiverReceivingCallsignsChangedArgs &args); //! Client updated from own aicraft data void updatedFromOwnAircraftCockpit(); @@ -346,11 +346,11 @@ namespace BlackCore // settings swift::misc::CSetting m_audioSettings { this, &CContextAudioBase::onChangedAudioSettings }; - swift::misc::CSetting m_inputDeviceSetting { this, &CContextAudioBase::changeDeviceSettings }; - swift::misc::CSetting m_outputDeviceSetting { this, &CContextAudioBase::changeDeviceSettings }; + swift::misc::CSetting m_inputDeviceSetting { this, &CContextAudioBase::changeDeviceSettings }; + swift::misc::CSetting m_outputDeviceSetting { this, &CContextAudioBase::changeDeviceSettings }; // AFV - Afv::Clients::CAfvClient *m_voiceClient = nullptr; + afv::clients::CAfvClient *m_voiceClient = nullptr; bool m_winCoInitialized = false; swift::misc::audio::CAudioDeviceInfoList m_activeLocalDevices; diff --git a/src/blackcore/context/contextaudioimpl.cpp b/src/core/context/contextaudioimpl.cpp similarity index 93% rename from src/blackcore/context/contextaudioimpl.cpp rename to src/core/context/contextaudioimpl.cpp index 58dbbad77..57502fec0 100644 --- a/src/blackcore/context/contextaudioimpl.cpp +++ b/src/core/context/contextaudioimpl.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextaudioimpl.h" -#include "blackcore/afv/clients/afvclient.h" +#include "core/context/contextaudioimpl.h" +#include "core/afv/clients/afvclient.h" #include "misc/dbusserver.h" #include @@ -12,9 +12,9 @@ using namespace swift::misc; using namespace swift::misc::audio; using namespace swift::misc::aviation; -using namespace BlackCore::Afv::Clients; +using namespace swift::core::afv::clients; -namespace BlackCore::Context +namespace swift::core::context { CContextAudio::CContextAudio(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : CContextAudioBase(mode, runtime) { diff --git a/src/blackcore/context/contextaudioimpl.h b/src/core/context/contextaudioimpl.h similarity index 64% rename from src/blackcore/context/contextaudioimpl.h rename to src/core/context/contextaudioimpl.h index 68e6d07f2..7e315887f 100644 --- a/src/blackcore/context/contextaudioimpl.h +++ b/src/core/context/contextaudioimpl.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTAUDIO_IMPL_H -#define BLACKCORE_CONTEXT_CONTEXTAUDIO_IMPL_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H +#define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H -#include "blackcore/context/contextaudio.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/contextaudio.h" +#include "core/corefacadeconfig.h" +#include "core/swiftcoreexport.h" #include "misc/network/userlist.h" #include @@ -21,41 +21,41 @@ // clazy:excludeall=const-signal-or-slot -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Audio context implementation - class BLACKCORE_EXPORT CContextAudio : public CContextAudioBase + class SWIFT_CORE_EXPORT CContextAudio : public CContextAudioBase { - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTAUDIO_INTERFACENAME) Q_OBJECT - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; friend class IContextAudio; public slots: - //! \copydoc BlackCore::Context::CContextAudioBase::getRegisteredDevices + //! \copydoc swift::core::context::CContextAudioBase::getRegisteredDevices virtual swift::misc::audio::CAudioDeviceInfoList getRegisteredDevices() const override; - //! \copydoc BlackCore::Context::CContextAudioBase::registerDevices + //! \copydoc swift::core::context::CContextAudioBase::registerDevices virtual void registerDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevices + //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevices virtual void unRegisterDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevicesFor + //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevicesFor virtual void unRegisterDevicesFor(const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::registerAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::registerAudioCallsign virtual void registerAudioCallsign(const swift::misc::aviation::CCallsign &callsign, const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::unRegisterAudioCallsign virtual void unRegisterAudioCallsign(const swift::misc::aviation::CCallsign &callsign, const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::hasRegisteredAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::hasRegisteredAudioCallsign virtual bool hasRegisteredAudioCallsign(const swift::misc::aviation::CCallsign &callsign) const override; protected: diff --git a/src/blackcore/context/contextaudioproxy.cpp b/src/core/context/contextaudioproxy.cpp similarity index 96% rename from src/blackcore/context/contextaudioproxy.cpp rename to src/core/context/contextaudioproxy.cpp index 9cc495243..17759edef 100644 --- a/src/blackcore/context/contextaudioproxy.cpp +++ b/src/core/context/contextaudioproxy.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextaudioproxy.h" -#include "blackcore/afv/clients/afvclient.h" +#include "core/context/contextaudioproxy.h" +#include "core/afv/clients/afvclient.h" #include "misc/dbus.h" #include "misc/dbusserver.h" #include "misc/genericdbusinterface.h" @@ -15,9 +15,9 @@ using namespace swift::misc; using namespace swift::misc::audio; using namespace swift::misc::network; using namespace swift::misc::aviation; -using namespace BlackCore::Afv::Clients; +using namespace swift::core::afv::clients; -namespace BlackCore::Context +namespace swift::core::context { CContextAudioProxy::CContextAudioProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : CContextAudioBase(mode, runtime), m_dBusInterface(nullptr) { diff --git a/src/blackcore/context/contextaudioproxy.h b/src/core/context/contextaudioproxy.h similarity index 72% rename from src/blackcore/context/contextaudioproxy.h rename to src/core/context/contextaudioproxy.h index 85b79ec6b..708c4cb6d 100644 --- a/src/blackcore/context/contextaudioproxy.h +++ b/src/core/context/contextaudioproxy.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTVOICE_PROXY_H -#define BLACKCORE_CONTEXT_CONTEXTVOICE_PROXY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H +#define SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H #include #include -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextaudio.h" +#include "core/corefacadeconfig.h" #include "misc/audio/audiodeviceinfolist.h" #include "misc/audio/notificationsounds.h" #include "misc/aviation/callsignset.h" @@ -37,17 +37,17 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Audio context proxy //! \ingroup dbus - class BLACKCORE_EXPORT CContextAudioProxy : public CContextAudioBase + class SWIFT_CORE_EXPORT CContextAudioProxy : public CContextAudioBase { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTAUDIO_INTERFACENAME) friend class IContextAudio; public: @@ -59,25 +59,25 @@ namespace BlackCore static void unitTestRelaySignals(); public slots: - //! \copydoc BlackCore::Context::CContextAudioBase::getRegisteredDevices + //! \copydoc swift::core::context::CContextAudioBase::getRegisteredDevices virtual swift::misc::audio::CAudioDeviceInfoList getRegisteredDevices() const override; - //! \copydoc BlackCore::Context::CContextAudioBase::registerDevices + //! \copydoc swift::core::context::CContextAudioBase::registerDevices virtual void registerDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevices + //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevices virtual void unRegisterDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterDevicesFor + //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevicesFor virtual void unRegisterDevicesFor(const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::registerAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::registerAudioCallsign virtual void registerAudioCallsign(const swift::misc::aviation::CCallsign &callsign, const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::unRegisterAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::unRegisterAudioCallsign virtual void unRegisterAudioCallsign(const swift::misc::aviation::CCallsign &callsign, const swift::misc::CIdentifier &identifier) override; - //! \copydoc BlackCore::Context::CContextAudioBase::hasRegisteredAudioCallsign + //! \copydoc swift::core::context::CContextAudioBase::hasRegisteredAudioCallsign virtual bool hasRegisteredAudioCallsign(const swift::misc::aviation::CCallsign &callsign) const override; private: diff --git a/src/blackcore/context/contextnetwork.cpp b/src/core/context/contextnetwork.cpp similarity index 89% rename from src/blackcore/context/contextnetwork.cpp rename to src/core/context/contextnetwork.cpp index ea243bc30..a34d4ad00 100644 --- a/src/blackcore/context/contextnetwork.cpp +++ b/src/core/context/contextnetwork.cpp @@ -1,19 +1,19 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextnetworkempty.h" -#include "blackcore/context/contextnetworkimpl.h" -#include "blackcore/context/contextnetworkproxy.h" -#include "blackcore/application.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextnetworkempty.h" +#include "core/context/contextnetworkimpl.h" +#include "core/context/contextnetworkproxy.h" +#include "core/application.h" #include "misc/dbusserver.h" #include "config/buildconfig.h" using namespace swift::config; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; -namespace BlackCore::Context +namespace swift::core::context { IContextNetwork *IContextNetwork::create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { diff --git a/src/blackcore/context/contextnetwork.h b/src/core/context/contextnetwork.h similarity index 95% rename from src/blackcore/context/contextnetwork.h rename to src/core/context/contextnetwork.h index 7069859ad..1836ad70f 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/core/context/contextnetwork.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_H -#define BLACKCORE_CONTEXT_CONTEXTNETWORK_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_H +#define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_H -#include "blackcore/context/context.h" -#include "blackcore/corefacade.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/context.h" +#include "core/corefacade.h" +#include "core/corefacadeconfig.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/remoteaircraftprovider.h" #include "misc/simulation/simulatedaircraftlist.h" #include "misc/aviation/aircraftpartslist.h" @@ -41,11 +41,11 @@ //! \ingroup dbus //! DBus interface for context -#define BLACKCORE_CONTEXTNETWORK_INTERFACENAME "org.swift_project.blackcore.contextnetwork" +#define SWIFT_CORE_CONTEXTNETWORK_INTERFACENAME "org.swift_project.swift_core.contextnetwork" //! \ingroup dbus //! DBus object path for context -#define BLACKCORE_CONTEXTNETWORK_OBJECTPATH "/network" +#define SWIFT_CORE_CONTEXTNETWORK_OBJECTPATH "/network" class QDBusConnection; namespace swift::misc @@ -66,26 +66,26 @@ namespace swift::misc class CAircraftModel; } } -namespace BlackCore::Context +namespace swift::core::context { //! Network context proxy - class BLACKCORE_EXPORT IContextNetwork : public IContext + class SWIFT_CORE_EXPORT IContextNetwork : public IContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTNETWORK_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTNETWORK_INTERFACENAME) public: //! DBus interface name static const QString &InterfaceName() { - static QString s(BLACKCORE_CONTEXTNETWORK_INTERFACENAME); + static QString s(SWIFT_CORE_CONTEXTNETWORK_INTERFACENAME); return s; } //! DBus object path static const QString &ObjectPath() { - static QString s(BLACKCORE_CONTEXTNETWORK_OBJECTPATH); + static QString s(SWIFT_CORE_CONTEXTNETWORK_OBJECTPATH); return s; } diff --git a/src/blackcore/context/contextnetworkempty.h b/src/core/context/contextnetworkempty.h similarity index 98% rename from src/blackcore/context/contextnetworkempty.h rename to src/core/context/contextnetworkempty.h index adf3f0b49..460a01f1b 100644 --- a/src/blackcore/context/contextnetworkempty.h +++ b/src/core/context/contextnetworkempty.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_EMPTY_H -#define BLACKCORE_CONTEXT_CONTEXTNETWORK_EMPTY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_EMPTY_H +#define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_EMPTY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextnetwork.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextnetwork.h" #include "misc/logmessage.h" // clazy:excludeall=const-signal-or-slot -namespace BlackCore::Context +namespace swift::core::context { //! Empty context, used during shutdown/initialization - class BLACKCORE_EXPORT CContextNetworkEmpty : public IContextNetwork + class SWIFT_CORE_EXPORT CContextNetworkEmpty : public IContextNetwork { Q_OBJECT diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/core/context/contextnetworkimpl.cpp similarity index 99% rename from src/blackcore/context/contextnetworkimpl.cpp rename to src/core/context/contextnetworkimpl.cpp index ce5d2a322..0d993be3a 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/core/context/contextnetworkimpl.cpp @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetworkimpl.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextownaircraftimpl.h" -#include "blackcore/context/contextsimulatorimpl.h" -#include "blackcore/airspaceanalyzer.h" -#include "blackcore/airspacemonitor.h" -#include "blackcore/application.h" -#include "blackcore/corefacade.h" -#include "blackcore/fsd/fsdclient.h" -#include "blackcore/webdataservices.h" +#include "core/context/contextnetworkimpl.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextownaircraftimpl.h" +#include "core/context/contextsimulatorimpl.h" +#include "core/airspaceanalyzer.h" +#include "core/airspacemonitor.h" +#include "core/application.h" +#include "core/corefacade.h" +#include "core/fsd/fsdclient.h" +#include "core/webdataservices.h" #include "misc/simulation/simulatorplugininfo.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/aircraftparts.h" @@ -44,10 +44,10 @@ using namespace swift::misc::network; using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::weather; -using namespace BlackCore::Fsd; -using namespace BlackCore::Vatsim; +using namespace swift::core::fsd; +using namespace swift::core::vatsim; -namespace BlackCore::Context +namespace swift::core::context { CContextNetwork::CContextNetwork(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextNetwork(mode, runtime) { diff --git a/src/blackcore/context/contextnetworkimpl.h b/src/core/context/contextnetworkimpl.h similarity index 83% rename from src/blackcore/context/contextnetworkimpl.h rename to src/core/context/contextnetworkimpl.h index a66d0a825..d7251ab5f 100644 --- a/src/blackcore/context/contextnetworkimpl.h +++ b/src/core/context/contextnetworkimpl.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_IMPL_H -#define BLACKCORE_CONTEXT_CONTEXTNETWORK_IMPL_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_IMPL_H +#define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_IMPL_H #include #include @@ -14,9 +14,9 @@ #include #include -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextnetwork.h" +#include "core/corefacadeconfig.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/airspaceaircraftsnapshot.h" #include "misc/simulation/remoteaircraftprovider.h" @@ -60,20 +60,20 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CAirspaceMonitor; class CCoreFacade; - namespace Fsd + namespace fsd { class CFSDClient; } - namespace Context + namespace context { //! Network context implementation - class BLACKCORE_EXPORT CContextNetwork : + class SWIFT_CORE_EXPORT CContextNetwork : public IContextNetwork, public swift::misc::simulation::IRemoteAircraftProvider, public swift::misc::network::IClientProvider @@ -81,10 +81,10 @@ namespace BlackCore Q_OBJECT Q_INTERFACES(swift::misc::simulation::IRemoteAircraftProvider) Q_INTERFACES(swift::misc::network::IClientProvider) - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTNETWORK_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTNETWORK_INTERFACENAME) friend class IContextNetwork; - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; public: //! Destructor @@ -145,7 +145,7 @@ namespace BlackCore //! \protected //! \remarks normally only for core facade internal usage //! \remarks public so values can be logged/monitored - Fsd::CFSDClient *fsdClient() const { return m_fsdClient; } + fsd::CFSDClient *fsdClient() const { return m_fsdClient; } //! Airspace //! \protected @@ -169,17 +169,17 @@ namespace BlackCore //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::updateFastPositionEnabled virtual bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, bool enableFastPositonUpdates) override; - //! \copydoc BlackCore::Context::IContextNetwork::updateAircraftSupportingGndFLag + //! \copydoc swift::core::context::IContextNetwork::updateAircraftSupportingGndFLag virtual bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, bool supportGndFlag) override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::enableReverseLookupMessages virtual void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override; // plain vanilla passing to airspace monitor - //! \copydoc BlackCore::Context::IContextNetwork::setAircraftEnabledFlag + //! \copydoc swift::core::context::IContextNetwork::setAircraftEnabledFlag virtual bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, bool enabledForRendering) override; - //! \copydoc BlackCore::Context::IContextNetwork::reInitializeAllAircraft + //! \copydoc swift::core::context::IContextNetwork::reInitializeAllAircraft virtual int reInitializeAllAircraft() override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::updateCG @@ -191,49 +191,49 @@ namespace BlackCore //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::updateCGAndModelString virtual bool updateCGAndModelString(const swift::misc::aviation::CCallsign &callsign, const swift::misc::physical_quantities::CLength &cg, const QString &modelString) override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRange + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRange virtual swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCallsigns + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCallsigns virtual swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCount + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCount virtual int getAircraftInRangeCount() const override; - //! \copydoc BlackCore::Context::IContextNetwork::isAircraftInRange + //! \copydoc swift::core::context::IContextNetwork::isAircraftInRange virtual bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::isVtolAircraft virtual bool isVtolAircraft(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeForCallsign + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeForCallsign virtual swift::misc::simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::getAircraftInRangeModelForCallsign virtual swift::misc::simulation::CAircraftModel getAircraftInRangeModelForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getReverseLookupMessages + //! \copydoc swift::core::context::IContextNetwork::getReverseLookupMessages virtual swift::misc::CStatusMessageList getReverseLookupMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::isReverseLookupMessagesEnabled + //! \copydoc swift::core::context::IContextNetwork::isReverseLookupMessagesEnabled virtual swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftPartsHistory + //! \copydoc swift::core::context::IContextNetwork::getAircraftPartsHistory virtual swift::misc::CStatusMessageList getAircraftPartsHistory(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getRemoteAircraftParts + //! \copydoc swift::core::context::IContextNetwork::getRemoteAircraftParts virtual swift::misc::aviation::CAircraftPartsList getRemoteAircraftParts(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::getRemoteAircraftSupportingPartsCount virtual int getRemoteAircraftSupportingPartsCount() const override; - //! \copydoc BlackCore::Context::IContextNetwork::isAircraftPartsHistoryEnabled + //! \copydoc swift::core::context::IContextNetwork::isAircraftPartsHistoryEnabled virtual bool isAircraftPartsHistoryEnabled() const override; - //! \copydoc BlackCore::Context::IContextNetwork::isRemoteAircraftSupportingParts + //! \copydoc swift::core::context::IContextNetwork::isRemoteAircraftSupportingParts virtual bool isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::enableAircraftPartsHistory + //! \copydoc swift::core::context::IContextNetwork::enableAircraftPartsHistory virtual void enableAircraftPartsHistory(bool enabled) override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::aircraftSituationsAdded @@ -248,19 +248,19 @@ namespace BlackCore //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::partsLastModified virtual qint64 partsLastModified(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getNetworkStatistics + //! \copydoc swift::core::context::IContextNetwork::getNetworkStatistics virtual QString getNetworkStatistics(bool reset, const QString &separator) override; - //! \copydoc BlackCore::Context::IContextNetwork::setNetworkStatisticsEnable + //! \copydoc swift::core::context::IContextNetwork::setNetworkStatisticsEnable virtual bool setNetworkStatisticsEnable(bool enabled) override; - //! \copydoc BlackCore::Context::IContextNetwork::testAddAltitudeOffset + //! \copydoc swift::core::context::IContextNetwork::testAddAltitudeOffset virtual bool testAddAltitudeOffset(const swift::misc::aviation::CCallsign &callsign, const swift::misc::physical_quantities::CLength &offset = swift::misc::physical_quantities::CLength::null()) override; - //! \copydoc BlackCore::Context::IContextNetwork::getNetworkPresetValues + //! \copydoc swift::core::context::IContextNetwork::getNetworkPresetValues virtual QStringList getNetworkPresetValues() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getPartnerCallsign + //! \copydoc swift::core::context::IContextNetwork::getPartnerCallsign virtual swift::misc::aviation::CCallsign getPartnerCallsign() const override; //! \copydoc swift::misc::network::IClientProvider::getClients @@ -293,7 +293,7 @@ namespace BlackCore //! Register help static void registerHelp() { - if (swift::misc::CSimpleCommandParser::registered("BlackCore::CContextNetwork")) { return; } + if (swift::misc::CSimpleCommandParser::registered("swift::core::CContextNetwork")) { return; } swift::misc::CSimpleCommandParser::registerCommand({ ".m", "alias: .msg, .chat" }); swift::misc::CSimpleCommandParser::registerCommand({ ".m message text", "send text message" }); swift::misc::CSimpleCommandParser::registerCommand({ ".m callsign message text", "send text message" }); @@ -308,88 +308,88 @@ namespace BlackCore swift::misc::CSimpleCommandParser::registerCommand({ ".disable callsign", "disable/ignore callsign" }); } - //! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsOnline + //! \copydoc swift::core::context::IContextNetwork::getAtcStationsOnline virtual swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getClosestAtcStationsOnline + //! \copydoc swift::core::context::IContextNetwork::getClosestAtcStationsOnline virtual swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationForCallsign + //! \copydoc swift::core::context::IContextNetwork::getOnlineStationForCallsign virtual swift::misc::aviation::CAtcStation getOnlineStationForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationsForFrequency + //! \copydoc swift::core::context::IContextNetwork::getOnlineStationsForFrequency virtual swift::misc::aviation::CAtcStationList getOnlineStationsForFrequency(const swift::misc::physical_quantities::CFrequency &frequency) const override; - //! \copydoc BlackCore::Context::IContextNetwork::isOnlineStation + //! \copydoc swift::core::context::IContextNetwork::isOnlineStation virtual bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::connectToNetwork + //! \copydoc swift::core::context::IContextNetwork::connectToNetwork virtual swift::misc::CStatusMessage connectToNetwork(const swift::misc::network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const swift::misc::aviation::CCallsign &partnerCallsign, swift::misc::network::CLoginMode mode) override; - //! \copydoc BlackCore::Context::IContextNetwork::getConnectedServer + //! \copydoc swift::core::context::IContextNetwork::getConnectedServer virtual swift::misc::network::CServer getConnectedServer() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getLoginMode + //! \copydoc swift::core::context::IContextNetwork::getLoginMode virtual swift::misc::network::CLoginMode getLoginMode() const override; - //! \copydoc BlackCore::Context::IContextNetwork::disconnectFromNetwork + //! \copydoc swift::core::context::IContextNetwork::disconnectFromNetwork virtual swift::misc::CStatusMessage disconnectFromNetwork() override; - //! \copydoc BlackCore::Context::IContextNetwork::isConnected + //! \copydoc swift::core::context::IContextNetwork::isConnected virtual bool isConnected() const override; - //! \copydoc BlackCore::Context::IContextNetwork::sendTextMessages + //! \copydoc swift::core::context::IContextNetwork::sendTextMessages virtual void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; - //! \copydoc BlackCore::Context::IContextNetwork::sendFlightPlan + //! \copydoc swift::core::context::IContextNetwork::sendFlightPlan virtual void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; - //! \copydoc BlackCore::Context::IContextNetwork::loadFlightPlanFromNetwork + //! \copydoc swift::core::context::IContextNetwork::loadFlightPlanFromNetwork virtual swift::misc::aviation::CFlightPlan loadFlightPlanFromNetwork(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport + //! \copydoc swift::core::context::IContextNetwork::getMetarForAirport swift::misc::weather::CMetar getMetarForAirport(const swift::misc::aviation::CAirportIcaoCode &airportIcaoCode) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsers + //! \copydoc swift::core::context::IContextNetwork::getUsers virtual swift::misc::network::CUserList getUsers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsersForCallsigns + //! \copydoc swift::core::context::IContextNetwork::getUsersForCallsigns virtual swift::misc::network::CUserList getUsersForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUserForCallsign + //! \copydoc swift::core::context::IContextNetwork::getUserForCallsign virtual swift::misc::network::CUser getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers + //! \copydoc swift::core::context::IContextNetwork::getVatsimFsdServers virtual swift::misc::network::CServerList getVatsimFsdServers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates + //! \copydoc swift::core::context::IContextNetwork::requestAircraftDataUpdates virtual void requestAircraftDataUpdates() override; - //! \copydoc BlackCore::Context::IContextNetwork::requestAtisUpdates + //! \copydoc swift::core::context::IContextNetwork::requestAtisUpdates virtual void requestAtisUpdates() override; - //! \copydoc BlackCore::Context::IContextNetwork::setFastPositionEnabledCallsigns + //! \copydoc swift::core::context::IContextNetwork::setFastPositionEnabledCallsigns virtual void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; - //! \copydoc BlackCore::Context::IContextNetwork::getFastPositionEnabledCallsigns + //! \copydoc swift::core::context::IContextNetwork::getFastPositionEnabledCallsigns virtual swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getLibraryInfo + //! \copydoc swift::core::context::IContextNetwork::getLibraryInfo virtual QString getLibraryInfo(bool detailed) const override; - //! \copydoc BlackCore::Context::IContextNetwork::testCreateDummyOnlineAtcStations + //! \copydoc swift::core::context::IContextNetwork::testCreateDummyOnlineAtcStations virtual void testCreateDummyOnlineAtcStations(int number) override; - //! \copydoc BlackCore::Context::IContextNetwork::testAddAircraftParts + //! \copydoc swift::core::context::IContextNetwork::testAddAircraftParts virtual void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, const swift::misc::aviation::CAircraftParts &parts, bool incremental) override; - //! \copydoc BlackCore::Context::IContextNetwork::testReceivedAtisMessage + //! \copydoc swift::core::context::IContextNetwork::testReceivedAtisMessage virtual void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, const swift::misc::aviation::CInformationMessage &msg) override; - //! \copydoc BlackCore::Context::IContextNetwork::testReceivedTextMessages + //! \copydoc swift::core::context::IContextNetwork::testReceivedTextMessages virtual void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; - //! \copydoc BlackCore::Context::IContextNetwork::testRequestAircraftConfig + //! \copydoc swift::core::context::IContextNetwork::testRequestAircraftConfig virtual void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; protected: @@ -405,7 +405,7 @@ namespace BlackCore private: swift::misc::network::CLoginMode m_currentMode = swift::misc::network::CLoginMode::Pilot; //!< current modeM CAirspaceMonitor *m_airspace = nullptr; - Fsd::CFSDClient *m_fsdClient = nullptr; + fsd::CFSDClient *m_fsdClient = nullptr; QTimer *m_requestAircraftDataTimer = nullptr; //!< general updates such as frequencies, see requestAircraftDataUpdates() QTimer *m_requestAtisTimer = nullptr; //!< general updates such as ATIS QTimer *m_staggeredMatchingTimer = nullptr; //!< staggered update diff --git a/src/blackcore/context/contextnetworkproxy.cpp b/src/core/context/contextnetworkproxy.cpp similarity index 99% rename from src/blackcore/context/contextnetworkproxy.cpp rename to src/core/context/contextnetworkproxy.cpp index 0a9b5d2b7..4e5b37ba0 100644 --- a/src/blackcore/context/contextnetworkproxy.cpp +++ b/src/core/context/contextnetworkproxy.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetworkproxy.h" +#include "core/context/contextnetworkproxy.h" #include "misc/dbus.h" #include "misc/dbusserver.h" #include "misc/genericdbusinterface.h" @@ -19,7 +19,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::weather; using namespace swift::misc::simulation; -namespace BlackCore::Context +namespace swift::core::context { CContextNetworkProxy::CContextNetworkProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextNetwork(mode, runtime), m_dBusInterface(nullptr) { diff --git a/src/blackcore/context/contextnetworkproxy.h b/src/core/context/contextnetworkproxy.h similarity index 64% rename from src/blackcore/context/contextnetworkproxy.h rename to src/core/context/contextnetworkproxy.h index bdcf0c979..aea3a8a62 100644 --- a/src/blackcore/context/contextnetworkproxy.h +++ b/src/core/context/contextnetworkproxy.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTNETWORK_PROXY_H -#define BLACKCORE_CONTEXT_CONTEXTNETWORK_PROXY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H +#define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextnetwork.h" +#include "core/corefacadeconfig.h" #include "misc/aviation/airporticaocode.h" #include "misc/aviation/atcstation.h" #include "misc/aviation/atcstationlist.h" @@ -49,14 +49,14 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Network context proxy //! \ingroup dbus - class BLACKCORE_EXPORT CContextNetworkProxy : public IContextNetwork + class SWIFT_CORE_EXPORT CContextNetworkProxy : public IContextNetwork { Q_OBJECT friend class IContextNetwork; @@ -73,175 +73,175 @@ namespace BlackCore //! \name Interface overrides //! @{ - //! \copydoc BlackCore::Context::IContextNetwork::getAtcStationsOnline + //! \copydoc swift::core::context::IContextNetwork::getAtcStationsOnline virtual swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getClosestAtcStationsOnline + //! \copydoc swift::core::context::IContextNetwork::getClosestAtcStationsOnline virtual swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRange + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRange virtual swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCallsigns + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCallsigns virtual swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeCount + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCount virtual int getAircraftInRangeCount() const override; - //! \copydoc BlackCore::Context::IContextNetwork::isAircraftInRange + //! \copydoc swift::core::context::IContextNetwork::isAircraftInRange virtual bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftInRangeForCallsign + //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeForCallsign virtual swift::misc::simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationsForFrequency + //! \copydoc swift::core::context::IContextNetwork::getOnlineStationsForFrequency virtual swift::misc::aviation::CAtcStationList getOnlineStationsForFrequency(const swift::misc::physical_quantities::CFrequency &frequency) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getOnlineStationForCallsign + //! \copydoc swift::core::context::IContextNetwork::getOnlineStationForCallsign virtual swift::misc::aviation::CAtcStation getOnlineStationForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::isOnlineStation + //! \copydoc swift::core::context::IContextNetwork::isOnlineStation virtual bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::connectToNetwork + //! \copydoc swift::core::context::IContextNetwork::connectToNetwork virtual swift::misc::CStatusMessage connectToNetwork(const swift::misc::network::CServer &server, const QString &extraLiveryString, bool sendLivery, const QString &extraModelString, bool sendModelString, const swift::misc::aviation::CCallsign &partnerCallsign, swift::misc::network::CLoginMode mode) override; - //! \copydoc BlackCore::Context::IContextNetwork::disconnectFromNetwork + //! \copydoc swift::core::context::IContextNetwork::disconnectFromNetwork virtual swift::misc::CStatusMessage disconnectFromNetwork() override; - //! \copydoc BlackCore::Context::IContextNetwork::isConnected + //! \copydoc swift::core::context::IContextNetwork::isConnected virtual bool isConnected() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getConnectedServer + //! \copydoc swift::core::context::IContextNetwork::getConnectedServer virtual swift::misc::network::CServer getConnectedServer() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getLoginMode + //! \copydoc swift::core::context::IContextNetwork::getLoginMode virtual swift::misc::network::CLoginMode getLoginMode() const override; - //! \copydoc BlackCore::Context::IContextNetwork::parseCommandLine + //! \copydoc swift::core::context::IContextNetwork::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextNetwork::sendTextMessages + //! \copydoc swift::core::context::IContextNetwork::sendTextMessages virtual void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; - //! \copydoc BlackCore::Context::IContextNetwork::sendFlightPlan + //! \copydoc swift::core::context::IContextNetwork::sendFlightPlan virtual void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; - //! \copydoc BlackCore::Context::IContextNetwork::loadFlightPlanFromNetwork + //! \copydoc swift::core::context::IContextNetwork::loadFlightPlanFromNetwork virtual swift::misc::aviation::CFlightPlan loadFlightPlanFromNetwork(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getMetarForAirport + //! \copydoc swift::core::context::IContextNetwork::getMetarForAirport swift::misc::weather::CMetar getMetarForAirport(const swift::misc::aviation::CAirportIcaoCode &airportIcaoCode) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsers + //! \copydoc swift::core::context::IContextNetwork::getUsers virtual swift::misc::network::CUserList getUsers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUsersForCallsigns + //! \copydoc swift::core::context::IContextNetwork::getUsersForCallsigns virtual swift::misc::network::CUserList getUsersForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getUserForCallsign + //! \copydoc swift::core::context::IContextNetwork::getUserForCallsign virtual swift::misc::network::CUser getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getClients + //! \copydoc swift::core::context::IContextNetwork::getClients virtual swift::misc::network::CClientList getClients() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getVatsimFsdServers + //! \copydoc swift::core::context::IContextNetwork::getVatsimFsdServers virtual swift::misc::network::CServerList getVatsimFsdServers() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getClientsForCallsigns + //! \copydoc swift::core::context::IContextNetwork::getClientsForCallsigns virtual swift::misc::network::CClientList getClientsForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; - //! \copydoc BlackCore::Context::IContextNetwork::setOtherClient + //! \copydoc swift::core::context::IContextNetwork::setOtherClient virtual bool setOtherClient(const swift::misc::network::CClient &client) override; - //! \copydoc BlackCore::Context::IContextNetwork::requestAircraftDataUpdates + //! \copydoc swift::core::context::IContextNetwork::requestAircraftDataUpdates virtual void requestAircraftDataUpdates() override; - //! \copydoc BlackCore::Context::IContextNetwork::requestAtisUpdates + //! \copydoc swift::core::context::IContextNetwork::requestAtisUpdates virtual void requestAtisUpdates() override; - //! \copydoc BlackCore::Context::IContextNetwork::updateAircraftEnabled + //! \copydoc swift::core::context::IContextNetwork::updateAircraftEnabled virtual bool updateAircraftEnabled(const swift::misc::aviation::CCallsign &callsign, bool enabledForRendering) override; - //! \copydoc BlackCore::Context::IContextNetwork::setAircraftEnabledFlag + //! \copydoc swift::core::context::IContextNetwork::setAircraftEnabledFlag virtual bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, bool enabledForRendering) override; - //! \copydoc BlackCore::Context::IContextNetwork::updateAircraftModel + //! \copydoc swift::core::context::IContextNetwork::updateAircraftModel virtual bool updateAircraftModel(const swift::misc::aviation::CCallsign &callsign, const swift::misc::simulation::CAircraftModel &model, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextNetwork::updateAircraftNetworkModel + //! \copydoc swift::core::context::IContextNetwork::updateAircraftNetworkModel virtual bool updateAircraftNetworkModel(const swift::misc::aviation::CCallsign &callsign, const swift::misc::simulation::CAircraftModel &model, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextNetwork::updateFastPositionEnabled + //! \copydoc swift::core::context::IContextNetwork::updateFastPositionEnabled virtual bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, bool enableFastPositionSending) override; - //! \copydoc BlackCore::Context::IContextNetwork::updateAircraftSupportingGndFLag + //! \copydoc swift::core::context::IContextNetwork::updateAircraftSupportingGndFLag virtual bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, bool supportGndFlag) override; - //! \copydoc BlackCore::Context::IContextNetwork::reInitializeAllAircraft + //! \copydoc swift::core::context::IContextNetwork::reInitializeAllAircraft virtual int reInitializeAllAircraft() override; - //! \copydoc BlackCore::Context::IContextNetwork::setFastPositionEnabledCallsigns + //! \copydoc swift::core::context::IContextNetwork::setFastPositionEnabledCallsigns virtual void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; - //! \copydoc BlackCore::Context::IContextNetwork::getFastPositionEnabledCallsigns + //! \copydoc swift::core::context::IContextNetwork::getFastPositionEnabledCallsigns virtual swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getReverseLookupMessages + //! \copydoc swift::core::context::IContextNetwork::getReverseLookupMessages virtual swift::misc::CStatusMessageList getReverseLookupMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::isReverseLookupMessagesEnabled + //! \copydoc swift::core::context::IContextNetwork::isReverseLookupMessagesEnabled virtual swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override; - //! \copydoc BlackCore::Context::IContextNetwork::enableReverseLookupMessages + //! \copydoc swift::core::context::IContextNetwork::enableReverseLookupMessages virtual void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override; - //! \copydoc BlackCore::Context::IContextNetwork::getAircraftPartsHistory + //! \copydoc swift::core::context::IContextNetwork::getAircraftPartsHistory virtual swift::misc::CStatusMessageList getAircraftPartsHistory(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getRemoteAircraftParts + //! \copydoc swift::core::context::IContextNetwork::getRemoteAircraftParts virtual swift::misc::aviation::CAircraftPartsList getRemoteAircraftParts(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::getLibraryInfo + //! \copydoc swift::core::context::IContextNetwork::getLibraryInfo virtual QString getLibraryInfo(bool detailed) const override; - //! \copydoc BlackCore::Context::IContextNetwork::isAircraftPartsHistoryEnabled + //! \copydoc swift::core::context::IContextNetwork::isAircraftPartsHistoryEnabled virtual bool isAircraftPartsHistoryEnabled() const override; - //! \copydoc BlackCore::Context::IContextNetwork::isRemoteAircraftSupportingParts + //! \copydoc swift::core::context::IContextNetwork::isRemoteAircraftSupportingParts virtual bool isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextNetwork::enableAircraftPartsHistory + //! \copydoc swift::core::context::IContextNetwork::enableAircraftPartsHistory virtual void enableAircraftPartsHistory(bool enabled) override; - //! \copydoc BlackCore::Context::IContextNetwork::getNetworkStatistics + //! \copydoc swift::core::context::IContextNetwork::getNetworkStatistics virtual QString getNetworkStatistics(bool reset, const QString &separator) override; - //! \copydoc BlackCore::Context::IContextNetwork::setNetworkStatisticsEnable + //! \copydoc swift::core::context::IContextNetwork::setNetworkStatisticsEnable virtual bool setNetworkStatisticsEnable(bool enabled) override; - //! \copydoc BlackCore::Context::IContextNetwork::getNetworkPresetValues + //! \copydoc swift::core::context::IContextNetwork::getNetworkPresetValues virtual QStringList getNetworkPresetValues() const override; - //! \copydoc BlackCore::Context::IContextNetwork::getPartnerCallsign + //! \copydoc swift::core::context::IContextNetwork::getPartnerCallsign virtual swift::misc::aviation::CCallsign getPartnerCallsign() const override; - //! \copydoc BlackCore::Context::IContextNetwork::testCreateDummyOnlineAtcStations + //! \copydoc swift::core::context::IContextNetwork::testCreateDummyOnlineAtcStations virtual void testCreateDummyOnlineAtcStations(int number) override; - //! \copydoc BlackCore::Context::IContextNetwork::testAddAircraftParts + //! \copydoc swift::core::context::IContextNetwork::testAddAircraftParts virtual void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, const swift::misc::aviation::CAircraftParts &parts, bool incremental) override; - //! \copydoc BlackCore::Context::IContextNetwork::testReceivedTextMessages + //! \copydoc swift::core::context::IContextNetwork::testReceivedTextMessages virtual void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; - //! \copydoc BlackCore::Context::IContextNetwork::testReceivedAtisMessage + //! \copydoc swift::core::context::IContextNetwork::testReceivedAtisMessage virtual void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, const swift::misc::aviation::CInformationMessage &msg) override; - //! \copydoc BlackCore::Context::IContextNetwork::testRequestAircraftConfig + //! \copydoc swift::core::context::IContextNetwork::testRequestAircraftConfig virtual void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextNetwork::testAddAltitudeOffset + //! \copydoc swift::core::context::IContextNetwork::testAddAltitudeOffset virtual bool testAddAltitudeOffset(const swift::misc::aviation::CCallsign &callsign, const swift::misc::physical_quantities::CLength &offset = swift::misc::physical_quantities::CLength::null()) override; //! @} diff --git a/src/blackcore/context/contextownaircraft.cpp b/src/core/context/contextownaircraft.cpp similarity index 88% rename from src/blackcore/context/contextownaircraft.cpp rename to src/core/context/contextownaircraft.cpp index 4d475a293..4f9d93868 100644 --- a/src/blackcore/context/contextownaircraft.cpp +++ b/src/core/context/contextownaircraft.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextownaircraftempty.h" -#include "blackcore/context/contextownaircraftimpl.h" -#include "blackcore/context/contextownaircraftproxy.h" +#include "core/application.h" +#include "core/webdataservices.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextownaircraftempty.h" +#include "core/context/contextownaircraftimpl.h" +#include "core/context/contextownaircraftproxy.h" #include "misc/aviation/aircraftsituation.h" #include "misc/dbusserver.h" @@ -16,7 +16,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::geo; using namespace swift::misc::simulation; -namespace BlackCore::Context +namespace swift::core::context { IContextOwnAircraft *IContextOwnAircraft::create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection) { diff --git a/src/blackcore/context/contextownaircraft.h b/src/core/context/contextownaircraft.h similarity index 88% rename from src/blackcore/context/contextownaircraft.h rename to src/core/context/contextownaircraft.h index 6271df24f..a87331cd6 100644 --- a/src/blackcore/context/contextownaircraft.h +++ b/src/core/context/contextownaircraft.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_H -#define BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_H +#define SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/context.h" -#include "blackcore/corefacade.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/context.h" +#include "core/corefacade.h" +#include "core/corefacadeconfig.h" #include "misc/aviation/airlineicaocode.h" #include "misc/aviation/comsystem.h" #include "misc/aviation/selcal.h" @@ -26,11 +26,11 @@ //! \ingroup dbus //! DBus interface for context -#define BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift_project.blackcore.contextownaircraft" +#define SWIFT_CORE_CONTEXTOWNAIRCRAFT_INTERFACENAME "org.swift_project.swift_core.contextownaircraft" //! \ingroup dbus //! DBus object path for context -#define BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft" +#define SWIFT_CORE_CONTEXTOWNAIRCRAFT_OBJECTPATH "/ownaircraft" class QDBusConnection; namespace swift::misc @@ -44,27 +44,27 @@ namespace swift::misc class CTransponder; } } -namespace BlackCore::Context +namespace swift::core::context { //! Own context proxy //! \ingroup dbus - class BLACKCORE_EXPORT IContextOwnAircraft : public IContext + class SWIFT_CORE_EXPORT IContextOwnAircraft : public IContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) public: //! DBus interface name static const QString &InterfaceName() { - static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME); + static QString s(SWIFT_CORE_CONTEXTOWNAIRCRAFT_INTERFACENAME); return s; } //! DBus object path static const QString &ObjectPath() { - static QString s(BLACKCORE_CONTEXTOWNAIRCRAFT_OBJECTPATH); + static QString s(SWIFT_CORE_CONTEXTOWNAIRCRAFT_OBJECTPATH); return s; } diff --git a/src/blackcore/context/contextownaircraftempty.h b/src/core/context/contextownaircraftempty.h similarity index 94% rename from src/blackcore/context/contextownaircraftempty.h rename to src/core/context/contextownaircraftempty.h index e05bac2d3..596632357 100644 --- a/src/blackcore/context/contextownaircraftempty.h +++ b/src/core/context/contextownaircraftempty.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H -#define BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H +#define SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_EMPTY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextownaircraft.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextownaircraft.h" #include "misc/logmessage.h" // clazy:excludeall=const-signal-or-slot -namespace BlackCore::Context +namespace swift::core::context { //! Empty context, used during shutdown/initialization - class BLACKCORE_EXPORT CContextOwnAircraftEmpty : public IContextOwnAircraft + class SWIFT_CORE_EXPORT CContextOwnAircraftEmpty : public IContextOwnAircraft { Q_OBJECT diff --git a/src/blackcore/context/contextownaircraftimpl.cpp b/src/core/context/contextownaircraftimpl.cpp similarity index 97% rename from src/blackcore/context/contextownaircraftimpl.cpp rename to src/core/context/contextownaircraftimpl.cpp index 95d0595c1..f426d4141 100644 --- a/src/blackcore/context/contextownaircraftimpl.cpp +++ b/src/core/context/contextownaircraftimpl.cpp @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextownaircraftimpl.h" +#include "core/context/contextownaircraftimpl.h" // ----- cross context ----- -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/context/contextsimulator.h" // ----- cross context ----- -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/network/server.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/aircraftsituation.h" @@ -18,7 +18,7 @@ #include "misc/aviation/callsign.h" #include "misc/aviation/transponder.h" #include "misc/audio/notificationsounds.h" -#include "blackcore/db/databaseutils.h" +#include "core/db/databaseutils.h" #include "misc/geo/latitude.h" #include "misc/geo/longitude.h" #include "misc/pq/physicalquantity.h" @@ -42,10 +42,10 @@ using namespace swift::misc::network; using namespace swift::misc::geo; using namespace swift::misc::audio; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; -namespace BlackCore::Context +namespace swift::core::context { CContextOwnAircraft::CContextOwnAircraft(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextOwnAircraft(mode, runtime), CIdentifiable(this) diff --git a/src/blackcore/context/contextownaircraftimpl.h b/src/core/context/contextownaircraftimpl.h similarity index 93% rename from src/blackcore/context/contextownaircraftimpl.h rename to src/core/context/contextownaircraftimpl.h index 29588aa47..a85f21696 100644 --- a/src/blackcore/context/contextownaircraftimpl.h +++ b/src/core/context/contextownaircraftimpl.h @@ -3,14 +3,14 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_IMPL_H -#define BLACKCORE_CONTEXT_CONTEXTOWNAIRCRAFT_IMPL_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_IMPL_H +#define SWIFT_CORE_CONTEXT_CONTEXTOWNAIRCRAFT_IMPL_H -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/actionbind.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/contextownaircraft.h" +#include "core/corefacadeconfig.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/actionbind.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/ownaircraftprovider.h" #include "misc/simulation/simulatedaircraft.h" @@ -52,23 +52,23 @@ namespace swift::misc class CTransponder; } } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Own aircraft context implementation. //! Central instance of data for \sa IOwnAircraftProvider . - class BLACKCORE_EXPORT CContextOwnAircraft : + class SWIFT_CORE_EXPORT CContextOwnAircraft : public IContextOwnAircraft, public swift::misc::simulation::IOwnAircraftProvider, public swift::misc::CIdentifiable { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTOWNAIRCRAFT_INTERFACENAME) Q_INTERFACES(swift::misc::simulation::IOwnAircraftProvider) Q_INTERFACES(swift::misc::IProvider) - friend class BlackCore::CCoreFacade; + friend class swift::core::CCoreFacade; friend class IContextOwnAircraft; public: @@ -173,10 +173,10 @@ namespace BlackCore //! \ingroup swiftdotcommands //! 
-            //! .x    .xpdr  code       set transponder code    BlackCore::Context::CContextOwnAircraft
-            //! .x    .xpdr  mode       set transponder mode    BlackCore::Context::CContextOwnAircraft
-            //! .com1 .com2  frequency  set COM1/2 frequency    BlackCore::Context::CContextOwnAircraft
-            //! .selcal      code       set SELCAL code         BlackCore::Context::CContextOwnAircraft
+            //! .x    .xpdr  code       set transponder code    swift::core::context::CContextOwnAircraft
+            //! .x    .xpdr  mode       set transponder mode    swift::core::context::CContextOwnAircraft
+            //! .com1 .com2  frequency  set COM1/2 frequency    swift::core::context::CContextOwnAircraft
+            //! .selcal      code       set SELCAL code         swift::core::context::CContextOwnAircraft
             //!
//! \copydoc IContextOwnAircraft::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; @@ -184,7 +184,7 @@ namespace BlackCore //! Register help static void registerHelp() { - if (swift::misc::CSimpleCommandParser::registered("BlackCore::Context::CContextOwnAircraft")) { return; } + if (swift::misc::CSimpleCommandParser::registered("swift::core::context::CContextOwnAircraft")) { return; } swift::misc::CSimpleCommandParser::registerCommand({ ".x", "alias: .xpdr" }); swift::misc::CSimpleCommandParser::registerCommand({ ".x code|mode", "set XPDR code or mode" }); swift::misc::CSimpleCommandParser::registerCommand({ ".selcal code", "set SELCAL code" }); diff --git a/src/blackcore/context/contextownaircraftproxy.cpp b/src/core/context/contextownaircraftproxy.cpp similarity index 98% rename from src/blackcore/context/contextownaircraftproxy.cpp rename to src/core/context/contextownaircraftproxy.cpp index 5547d804f..a8e143d9c 100644 --- a/src/blackcore/context/contextownaircraftproxy.cpp +++ b/src/core/context/contextownaircraftproxy.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextownaircraftproxy.h" +#include "core/context/contextownaircraftproxy.h" #include "misc/simulation/aircraftmodel.h" #include "misc/dbus.h" #include "misc/dbusserver.h" @@ -16,7 +16,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -namespace BlackCore::Context +namespace swift::core::context { CContextOwnAircraftProxy::CContextOwnAircraftProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextOwnAircraft(mode, runtime), m_dBusInterface(nullptr) { diff --git a/src/blackcore/context/contextownaircraftproxy.h b/src/core/context/contextownaircraftproxy.h similarity index 71% rename from src/blackcore/context/contextownaircraftproxy.h rename to src/core/context/contextownaircraftproxy.h index 694885f6c..9fd175c43 100644 --- a/src/blackcore/context/contextownaircraftproxy.h +++ b/src/core/context/contextownaircraftproxy.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_CONTEXT_OWNAIRCRAFT_PROXY_H -#define BLACKCORE_CONTEXT_OWNAIRCRAFT_PROXY_H +#ifndef SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H +#define SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H #include #include -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/contextownaircraft.h" +#include "core/corefacadeconfig.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/aviation/airlineicaocode.h" #include "misc/aviation/comsystem.h" @@ -36,14 +36,14 @@ namespace swift::misc class CTransponder; } } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! Own aircraft context proxy //! \ingroup dbus - class BLACKCORE_EXPORT CContextOwnAircraftProxy : public IContextOwnAircraft + class SWIFT_CORE_EXPORT CContextOwnAircraftProxy : public IContextOwnAircraft { Q_OBJECT friend class IContextOwnAircraft; @@ -57,49 +57,49 @@ namespace BlackCore static void unitTestRelaySignals(); public slots: - //! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnAircraft + //! \copydoc swift::core::context::IContextOwnAircraft::getOwnAircraft virtual swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnComSystem + //! \copydoc swift::core::context::IContextOwnAircraft::getOwnComSystem virtual swift::misc::aviation::CComSystem getOwnComSystem(swift::misc::aviation::CComSystem::ComUnit unit) const override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnTransponder + //! \copydoc swift::core::context::IContextOwnAircraft::getOwnTransponder virtual swift::misc::aviation::CTransponder getOwnTransponder() const override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::getOwnAircraftSituation + //! \copydoc swift::core::context::IContextOwnAircraft::getOwnAircraftSituation virtual swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnPosition + //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnPosition virtual bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, const swift::misc::aviation::CAltitude &altitude, const swift::misc::aviation::CAltitude &pressureAltitude) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateCockpit + //! \copydoc swift::core::context::IContextOwnAircraft::updateCockpit virtual bool updateCockpit(const swift::misc::aviation::CComSystem &com1, const swift::misc::aviation::CComSystem &com2, const swift::misc::aviation::CTransponder &transponder, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateTransponderMode + //! \copydoc swift::core::context::IContextOwnAircraft::updateTransponderMode virtual bool updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateActiveComFrequency + //! \copydoc swift::core::context::IContextOwnAircraft::updateActiveComFrequency virtual bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, swift::misc::aviation::CComSystem::ComUnit comUnit, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnAircraftPilot + //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnAircraftPilot virtual bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateSelcal + //! \copydoc swift::core::context::IContextOwnAircraft::updateSelcal virtual bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnCallsign + //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnCallsign virtual bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::updateOwnIcaoCodes + //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnIcaoCodes virtual bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::toggleTransponderMode + //! \copydoc swift::core::context::IContextOwnAircraft::toggleTransponderMode virtual void toggleTransponderMode() override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::setTransponderMode + //! \copydoc swift::core::context::IContextOwnAircraft::setTransponderMode virtual bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override; - //! \copydoc BlackCore::Context::IContextOwnAircraft::parseCommandLine + //! \copydoc swift::core::context::IContextOwnAircraft::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; protected: diff --git a/src/blackcore/context/contextsimulator.cpp b/src/core/context/contextsimulator.cpp similarity index 83% rename from src/blackcore/context/contextsimulator.cpp rename to src/core/context/contextsimulator.cpp index c4f736c37..b8c7660bf 100644 --- a/src/blackcore/context/contextsimulator.cpp +++ b/src/core/context/contextsimulator.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextsimulatorempty.h" -#include "blackcore/context/contextsimulatorimpl.h" -#include "blackcore/context/contextsimulatorproxy.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextsimulatorempty.h" +#include "core/context/contextsimulatorimpl.h" +#include "core/context/contextsimulatorproxy.h" #include "misc/dbusserver.h" #include "misc/pq/units.h" @@ -15,17 +15,17 @@ using namespace swift::misc; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; -namespace BlackCore::Context +namespace swift::core::context { const QString &IContextSimulator::InterfaceName() { - static const QString s(BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME); + static const QString s(SWIFT_CORE_CONTEXTSIMULATOR_INTERFACENAME); return s; } const QString &IContextSimulator::ObjectPath() { - static const QString s(BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH); + static const QString s(SWIFT_CORE_CONTEXTSIMULATOR_OBJECTPATH); return s; } diff --git a/src/blackcore/context/contextsimulator.h b/src/core/context/contextsimulator.h similarity index 95% rename from src/blackcore/context/contextsimulator.h rename to src/core/context/contextsimulator.h index a6d2e8306..4d908f2ee 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/core/context/contextsimulator.h @@ -3,14 +3,14 @@ //! \file -#ifndef BLACKCORE_CONTEXTSIMULATOR_H -#define BLACKCORE_CONTEXTSIMULATOR_H +#ifndef SWIFT_CORE_CONTEXTSIMULATOR_H +#define SWIFT_CORE_CONTEXTSIMULATOR_H -#include "blackcore/context/context.h" -#include "blackcore/corefacade.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/simulator.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/context.h" +#include "core/corefacade.h" +#include "core/corefacadeconfig.h" +#include "core/simulator.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/aircraftmatchersetup.h" @@ -36,11 +36,11 @@ //! \ingroup dbus //! DBus interface for context -#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift_project.blackcore.contextsimulator" +#define SWIFT_CORE_CONTEXTSIMULATOR_INTERFACENAME "org.swift_project.swift_core.contextsimulator" //! \ingroup dbus //! DBus object path for context -#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator" +#define SWIFT_CORE_CONTEXTSIMULATOR_OBJECTPATH "/simulator" class QDBusConnection; @@ -52,13 +52,13 @@ namespace swift::misc class CSimulatedAircraft; } } -namespace BlackCore::Context +namespace swift::core::context { //! Network context - class BLACKCORE_EXPORT IContextSimulator : public IContext + class SWIFT_CORE_EXPORT IContextSimulator : public IContext { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME) + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTSIMULATOR_INTERFACENAME) public: //! Service name @@ -78,7 +78,7 @@ namespace BlackCore::Context //! Get simulator status as enum //! \fixme To be removed with Qt 5.5 when getSimualtorStatus directly provides the enum - BlackCore::ISimulator::SimulatorStatus getSimulatorStatusEnum() const; + swift::core::ISimulator::SimulatorStatus getSimulatorStatusEnum() const; // ---- some convenienc functions implemented on interface level diff --git a/src/blackcore/context/contextsimulatorempty.h b/src/core/context/contextsimulatorempty.h similarity index 98% rename from src/blackcore/context/contextsimulatorempty.h rename to src/core/context/contextsimulatorempty.h index abb69dc8a..412ca3c68 100644 --- a/src/blackcore/context/contextsimulatorempty.h +++ b/src/core/context/contextsimulatorempty.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H -#define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H +#define SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_EMPTY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextsimulator.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextsimulator.h" #include "misc/logmessage.h" // clazy:excludeall=const-signal-or-slot -namespace BlackCore::Context +namespace swift::core::context { //! Empty context, used during shutdown/initialization - class BLACKCORE_EXPORT CContextSimulatorEmpty : public IContextSimulator + class SWIFT_CORE_EXPORT CContextSimulatorEmpty : public IContextSimulator { Q_OBJECT diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/core/context/contextsimulatorimpl.cpp similarity index 99% rename from src/blackcore/context/contextsimulatorimpl.cpp rename to src/core/context/contextsimulatorimpl.cpp index 5791f0cc2..9d3f5fc89 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/core/context/contextsimulatorimpl.cpp @@ -1,17 +1,17 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextsimulatorimpl.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextnetworkimpl.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextownaircraftimpl.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/corefacade.h" -#include "blackcore/application.h" -#include "blackcore/pluginmanagersimulator.h" -#include "blackcore/simulator.h" +#include "core/context/contextsimulatorimpl.h" +#include "core/context/contextapplication.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextnetworkimpl.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextownaircraftimpl.h" +#include "core/db/databaseutils.h" +#include "core/corefacade.h" +#include "core/application.h" +#include "core/pluginmanagersimulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/xplane/xplaneutil.h" #include "misc/simulation/matchingutils.h" @@ -37,7 +37,7 @@ #include using namespace swift::config; -using namespace BlackCore::Db; +using namespace swift::core::db; using namespace swift::misc; using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; @@ -50,7 +50,7 @@ using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; using namespace swift::misc::simulation::data; -namespace BlackCore::Context +namespace swift::core::context { CContextSimulator::CContextSimulator(CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextSimulator(mode, runtime), CIdentifiable(this), diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/core/context/contextsimulatorimpl.h similarity index 76% rename from src/blackcore/context/contextsimulatorimpl.h rename to src/core/context/contextsimulatorimpl.h index df66e2a8a..73cb41442 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/core/context/contextsimulatorimpl.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H -#define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H +#ifndef SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H +#define SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H -#include "blackcore/context/contextsimulator.h" -#include "blackcore/application/applicationsettings.h" -#include "blackcore/simulator.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/aircraftmatcher.h" -#include "blackcore/blackcoreexport.h" +#include "core/context/contextsimulator.h" +#include "core/application/applicationsettings.h" +#include "core/simulator.h" +#include "core/corefacadeconfig.h" +#include "core/aircraftmatcher.h" +#include "core/swiftcoreexport.h" #include "misc/network/connectionstatus.h" #include "misc/simulation/data/modelcaches.h" #include "misc/simulation/settings/modelmatchersettings.h" @@ -53,15 +53,15 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CCoreFacade; class CPluginManagerSimulator; - namespace Context + namespace context { //! Network simulator concrete implementation - class BLACKCORE_EXPORT CContextSimulator : + class SWIFT_CORE_EXPORT CContextSimulator : public IContextSimulator, public swift::misc::simulation::IAircraftModelSetProvider, public swift::misc::simulation::CRemoteAircraftAware, // gain access to in memory remote aircraft data @@ -69,162 +69,162 @@ namespace BlackCore { Q_OBJECT Q_INTERFACES(swift::misc::simulation::IAircraftModelSetProvider) - Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME) - friend class BlackCore::CCoreFacade; + Q_CLASSINFO("D-Bus Interface", SWIFT_CORE_CONTEXTSIMULATOR_INTERFACENAME) + friend class swift::core::CCoreFacade; friend class IContextSimulator; public slots: - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorPluginInfo + //! \copydoc swift::core::context::IContextSimulator::getSimulatorPluginInfo virtual swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getAvailableSimulatorPlugins + //! \copydoc swift::core::context::IContextSimulator::getAvailableSimulatorPlugins virtual swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorSettings + //! \copydoc swift::core::context::IContextSimulator::getSimulatorSettings virtual swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setSimulatorSettings + //! \copydoc swift::core::context::IContextSimulator::setSimulatorSettings virtual bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, const swift::misc::simulation::CSimulatorInfo &simulator) override; - //! \copydoc BlackCore::Context::IContextSimulator::startSimulatorPlugin + //! \copydoc swift::core::context::IContextSimulator::startSimulatorPlugin virtual bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; - //! \copydoc BlackCore::Context::IContextSimulator::stopSimulatorPlugin + //! \copydoc swift::core::context::IContextSimulator::stopSimulatorPlugin virtual void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; - //! \copydoc BlackCore::Context::IContextSimulator::checkListeners + //! \copydoc swift::core::context::IContextSimulator::checkListeners virtual int checkListeners() override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorStatus + //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus virtual int getSimulatorStatus() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorInternals + //! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getAirportsInRange + //! \copydoc swift::core::context::IContextSimulator::getAirportsInRange virtual swift::misc::aviation::CAirportList getAirportsInRange(bool recalculateDistance) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetLoaderSimulator + //! \copydoc swift::core::context::IContextSimulator::getModelSetLoaderSimulator virtual swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setModelSetLoaderSimulator + //! \copydoc swift::core::context::IContextSimulator::setModelSetLoaderSimulator virtual void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; - //! \copydoc BlackCore::Context::IContextSimulator::simulatorsWithInitializedModelSet + //! \copydoc swift::core::context::IContextSimulator::simulatorsWithInitializedModelSet virtual swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; - //! \copydoc BlackCore::Context::IContextSimulator::verifyPrerequisites + //! \copydoc swift::core::context::IContextSimulator::verifyPrerequisites virtual swift::misc::CStatusMessageList verifyPrerequisites() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetStrings + //! \copydoc swift::core::context::IContextSimulator::getModelSetStrings virtual QStringList getModelSetStrings() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetCompleterStrings + //! \copydoc swift::core::context::IContextSimulator::getModelSetCompleterStrings virtual QStringList getModelSetCompleterStrings(bool sorted) const override; - //! \copydoc BlackCore::Context::IContextSimulator::isKnownModelInSet + //! \copydoc swift::core::context::IContextSimulator::isKnownModelInSet virtual bool isKnownModelInSet(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::removeModelsFromSet + //! \copydoc swift::core::context::IContextSimulator::removeModelsFromSet virtual int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; - //! \copydoc BlackCore::Context::IContextSimulator::disableModelsForMatching + //! \copydoc swift::core::context::IContextSimulator::disableModelsForMatching virtual void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, bool incremental) override; - //! \copydoc BlackCore::Context::IContextSimulator::getDisabledModelsForMatching + //! \copydoc swift::core::context::IContextSimulator::getDisabledModelsForMatching virtual swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; - //! \copydoc BlackCore::Context::IContextSimulator::restoreDisabledModels + //! \copydoc swift::core::context::IContextSimulator::restoreDisabledModels virtual void restoreDisabledModels() override; - //! \copydoc BlackCore::Context::IContextSimulator::isValidationInProgress + //! \copydoc swift::core::context::IContextSimulator::isValidationInProgress virtual bool isValidationInProgress() const override; - //! \copydoc BlackCore::Context::IContextSimulator::triggerModelSetValidation + //! \copydoc swift::core::context::IContextSimulator::triggerModelSetValidation virtual bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetModelsStartingWith + //! \copydoc swift::core::context::IContextSimulator::getModelSetModelsStartingWith virtual swift::misc::simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getTimeSynchronizationOffset + //! \copydoc swift::core::context::IContextSimulator::getTimeSynchronizationOffset virtual swift::misc::physical_quantities::CTime getTimeSynchronizationOffset() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setTimeSynchronization + //! \copydoc swift::core::context::IContextSimulator::setTimeSynchronization virtual bool setTimeSynchronization(bool enable, const swift::misc::physical_quantities::CTime &offset) override; - //! \copydoc BlackCore::Context::IContextSimulator::isTimeSynchronized + //! \copydoc swift::core::context::IContextSimulator::isTimeSynchronized virtual bool isTimeSynchronized() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupGlobal + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupGlobal virtual swift::misc::simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign virtual swift::misc::simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault virtual swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign + //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign virtual bool setInterpolationAndRenderingSetupsPerCallsign(const swift::misc::simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override; - //! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupGlobal + //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupGlobal virtual void setInterpolationAndRenderingSetupGlobal(const swift::misc::simulation::CInterpolationAndRenderingSetupGlobal &setup) override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationMessages + //! \copydoc swift::core::context::IContextSimulator::getInterpolationMessages virtual swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::iconForModel + //! \copydoc swift::core::context::IContextSimulator::iconForModel virtual swift::misc::CPixmap iconForModel(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::followAircraft + //! \copydoc swift::core::context::IContextSimulator::followAircraft virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::recalculateAllAircraft + //! \copydoc swift::core::context::IContextSimulator::recalculateAllAircraft virtual void recalculateAllAircraft() override; - //! \copydoc BlackCore::Context::IContextSimulator::resetToModelMatchingAircraft + //! \copydoc swift::core::context::IContextSimulator::resetToModelMatchingAircraft virtual bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::requestElevationBySituation + //! \copydoc swift::core::context::IContextSimulator::requestElevationBySituation virtual bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; - //! \copydoc BlackCore::Context::IContextSimulator::findClosestElevationWithinRange + //! \copydoc swift::core::context::IContextSimulator::findClosestElevationWithinRange virtual swift::misc::geo::CElevationPlane findClosestElevationWithinRange(const swift::misc::geo::CCoordinateGeodetic &reference, const swift::misc::physical_quantities::CLength &range) const override; - //! \copydoc BlackCore::Context::IContextSimulator::doMatchingsAgain + //! \copydoc swift::core::context::IContextSimulator::doMatchingsAgain virtual int doMatchingsAgain() override; - //! \copydoc BlackCore::Context::IContextSimulator::doMatchingAgain + //! \copydoc swift::core::context::IContextSimulator::doMatchingAgain virtual bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::getMatchingMessages + //! \copydoc swift::core::context::IContextSimulator::getMatchingMessages virtual swift::misc::CStatusMessageList getMatchingMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::isMatchingMessagesEnabled + //! \copydoc swift::core::context::IContextSimulator::isMatchingMessagesEnabled virtual swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; - //! \copydoc BlackCore::Context::IContextSimulator::enableMatchingMessages + //! \copydoc swift::core::context::IContextSimulator::enableMatchingMessages virtual void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; - //! \copydoc BlackCore::Context::IContextSimulator::getCurrentMatchingStatistics + //! \copydoc swift::core::context::IContextSimulator::getCurrentMatchingStatistics virtual swift::misc::simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override; - //! \copydoc BlackCore::Context::IContextSimulator::setMatchingSetup + //! \copydoc swift::core::context::IContextSimulator::setMatchingSetup virtual void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; - //! \copydoc BlackCore::Context::IContextSimulator::getMatchingSetup + //! \copydoc swift::core::context::IContextSimulator::getMatchingSetup virtual swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; - //! \copydoc BlackCore::Context::IContextSimulator::testRemoteAircraft + //! \copydoc swift::core::context::IContextSimulator::testRemoteAircraft virtual bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override; - //! \copydoc BlackCore::Context::IContextSimulator::testUpdateRemoteAircraft + //! \copydoc swift::core::context::IContextSimulator::testUpdateRemoteAircraft virtual bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, const swift::misc::aviation::CAircraftSituation &situation, const swift::misc::aviation::CAircraftParts &parts) override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSet + //! \copydoc swift::core::context::IContextSimulator::getModelSet virtual swift::misc::simulation::CAircraftModelList getModelSet() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetCount + //! \copydoc swift::core::context::IContextSimulator::getModelSetCount virtual int getModelSetCount() const override; //! \ingroup swiftdotcommands @@ -255,7 +255,7 @@ namespace BlackCore //! Register dot commands static void registerHelp() { - if (swift::misc::CSimpleCommandParser::registered("BlackCore::CContextSimulator")) { return; } + if (swift::misc::CSimpleCommandParser::registered("swift::core::CContextSimulator")) { return; } swift::misc::CSimpleCommandParser::registerCommand({ ".ris", "rendering/interpolation setup (global setup)" }); swift::misc::CSimpleCommandParser::registerCommand({ ".ris debug on|off", "rendering/interpolation debug messages (global setup)" }); swift::misc::CSimpleCommandParser::registerCommand({ ".ris parts on|off", "aircraft parts (global setup)" }); @@ -384,7 +384,7 @@ namespace BlackCore swift::misc::simulation::CBackgroundValidation *m_validator = nullptr; // settings - swift::misc::CSettingReadOnly m_enabledSimulators { this, &CContextSimulator::changeEnabledSimulators }; + swift::misc::CSettingReadOnly m_enabledSimulators { this, &CContextSimulator::changeEnabledSimulators }; swift::misc::CSetting m_matchingSettings { this }; //!< matching settings (all simulators) swift::misc::CData m_modelSetSimulator { this }; //!< current simulator used for model set swift::misc::simulation::settings::CMultiSimulatorSettings m_multiSimulatorSettings { this }; //!< individual for simulator, for validation of models diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/core/context/contextsimulatorproxy.cpp similarity index 99% rename from src/blackcore/context/contextsimulatorproxy.cpp rename to src/core/context/contextsimulatorproxy.cpp index 7309c7aec..578cbf689 100644 --- a/src/blackcore/context/contextsimulatorproxy.cpp +++ b/src/core/context/contextsimulatorproxy.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextsimulatorproxy.h" +#include "core/context/contextsimulatorproxy.h" #include "misc/dbus.h" #include "misc/dbusserver.h" #include "misc/genericdbusinterface.h" @@ -20,7 +20,7 @@ using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; -namespace BlackCore::Context +namespace swift::core::context { CContextSimulatorProxy::CContextSimulatorProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextSimulator(mode, runtime), m_dBusInterface(nullptr) { diff --git a/src/blackcore/context/contextsimulatorproxy.h b/src/core/context/contextsimulatorproxy.h similarity index 61% rename from src/blackcore/context/contextsimulatorproxy.h rename to src/core/context/contextsimulatorproxy.h index b283d4621..c04bddee6 100644 --- a/src/blackcore/context/contextsimulatorproxy.h +++ b/src/core/context/contextsimulatorproxy.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_CONTEXTSIMULATOR_PROXY_H -#define BLACKCORE_CONTEXTSIMULATOR_PROXY_H +#ifndef SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H +#define SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/corefacadeconfig.h" +#include "core/swiftcoreexport.h" +#include "core/context/contextsimulator.h" +#include "core/corefacadeconfig.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/simulatorplugininfolist.h" #include "misc/simulation/simulatorinternals.h" @@ -33,14 +33,14 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { class CCoreFacade; - namespace Context + namespace context { //! DBus proxy for Simulator Context //! \ingroup dbus - class BLACKCORE_EXPORT CContextSimulatorProxy : public IContextSimulator + class SWIFT_CORE_EXPORT CContextSimulatorProxy : public IContextSimulator { Q_OBJECT friend class IContextSimulator; @@ -57,160 +57,160 @@ namespace BlackCore //! \name Interface overrides //! @{ - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorPluginInfo + //! \copydoc swift::core::context::IContextSimulator::getSimulatorPluginInfo virtual swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getAvailableSimulatorPlugins + //! \copydoc swift::core::context::IContextSimulator::getAvailableSimulatorPlugins virtual swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorSettings + //! \copydoc swift::core::context::IContextSimulator::getSimulatorSettings virtual swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setSimulatorSettings + //! \copydoc swift::core::context::IContextSimulator::setSimulatorSettings virtual bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, const swift::misc::simulation::CSimulatorInfo &simulatorInfo) override; - //! \copydoc BlackCore::Context::IContextSimulator::startSimulatorPlugin + //! \copydoc swift::core::context::IContextSimulator::startSimulatorPlugin virtual bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; - //! \copydoc BlackCore::Context::IContextSimulator::stopSimulatorPlugin + //! \copydoc swift::core::context::IContextSimulator::stopSimulatorPlugin virtual void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; - //! \copydoc BlackCore::Context::IContextSimulator::checkListeners + //! \copydoc swift::core::context::IContextSimulator::checkListeners virtual int checkListeners() override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorStatus + //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus virtual int getSimulatorStatus() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getAirportsInRange + //! \copydoc swift::core::context::IContextSimulator::getAirportsInRange virtual swift::misc::aviation::CAirportList getAirportsInRange(bool recalculatePosition) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSet + //! \copydoc swift::core::context::IContextSimulator::getModelSet virtual swift::misc::simulation::CAircraftModelList getModelSet() const override; - //! \copydoc BlackCore::Context::IContextSimulator::simulatorsWithInitializedModelSet + //! \copydoc swift::core::context::IContextSimulator::simulatorsWithInitializedModelSet virtual swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; - //! \copydoc BlackCore::Context::IContextSimulator::verifyPrerequisites + //! \copydoc swift::core::context::IContextSimulator::verifyPrerequisites virtual swift::misc::CStatusMessageList verifyPrerequisites() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetLoaderSimulator + //! \copydoc swift::core::context::IContextSimulator::getModelSetLoaderSimulator virtual swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setModelSetLoaderSimulator + //! \copydoc swift::core::context::IContextSimulator::setModelSetLoaderSimulator virtual void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetStrings + //! \copydoc swift::core::context::IContextSimulator::getModelSetStrings virtual QStringList getModelSetStrings() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetCompleterStrings + //! \copydoc swift::core::context::IContextSimulator::getModelSetCompleterStrings virtual QStringList getModelSetCompleterStrings(bool sorted) const override; - //! \copydoc BlackCore::Context::IContextSimulator::removeModelsFromSet + //! \copydoc swift::core::context::IContextSimulator::removeModelsFromSet virtual int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; - //! \copydoc BlackCore::Context::IContextSimulator::isKnownModelInSet + //! \copydoc swift::core::context::IContextSimulator::isKnownModelInSet virtual bool isKnownModelInSet(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetModelsStartingWith + //! \copydoc swift::core::context::IContextSimulator::getModelSetModelsStartingWith virtual swift::misc::simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getModelSetCount + //! \copydoc swift::core::context::IContextSimulator::getModelSetCount virtual int getModelSetCount() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getSimulatorInternals + //! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; - //! \copydoc BlackCore::Context::IContextSimulator::disableModelsForMatching + //! \copydoc swift::core::context::IContextSimulator::disableModelsForMatching virtual void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, bool incremental) override; - //! \copydoc BlackCore::Context::IContextSimulator::getDisabledModelsForMatching + //! \copydoc swift::core::context::IContextSimulator::getDisabledModelsForMatching virtual swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; - //! \copydoc BlackCore::Context::IContextSimulator::triggerModelSetValidation + //! \copydoc swift::core::context::IContextSimulator::triggerModelSetValidation virtual bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; - //! \copydoc BlackCore::Context::IContextSimulator::isValidationInProgress + //! \copydoc swift::core::context::IContextSimulator::isValidationInProgress virtual bool isValidationInProgress() const override; - //! \copydoc BlackCore::Context::IContextSimulator::restoreDisabledModels + //! \copydoc swift::core::context::IContextSimulator::restoreDisabledModels virtual void restoreDisabledModels() override; - //! \copydoc BlackCore::Context::IContextSimulator::setTimeSynchronization + //! \copydoc swift::core::context::IContextSimulator::setTimeSynchronization virtual bool setTimeSynchronization(bool enable, const swift::misc::physical_quantities::CTime &offset) override; - //! \copydoc BlackCore::Context::IContextSimulator::isTimeSynchronized + //! \copydoc swift::core::context::IContextSimulator::isTimeSynchronized virtual bool isTimeSynchronized() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupGlobal + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupGlobal virtual swift::misc::simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override; - //! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupGlobal + //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupGlobal virtual void setInterpolationAndRenderingSetupGlobal(const swift::misc::simulation::CInterpolationAndRenderingSetupGlobal &setup) override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign virtual swift::misc::simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault + //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault virtual swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign + //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign virtual bool setInterpolationAndRenderingSetupsPerCallsign(const swift::misc::simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override; - //! \copydoc BlackCore::Context::IContextSimulator::getInterpolationMessages + //! \copydoc swift::core::context::IContextSimulator::getInterpolationMessages virtual swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getTimeSynchronizationOffset + //! \copydoc swift::core::context::IContextSimulator::getTimeSynchronizationOffset virtual swift::misc::physical_quantities::CTime getTimeSynchronizationOffset() const override; - //! \copydoc BlackCore::Context::IContextSimulator::iconForModel + //! \copydoc swift::core::context::IContextSimulator::iconForModel virtual swift::misc::CPixmap iconForModel(const QString &modelString) const override; - //! \copydoc BlackCore::Context::IContextSimulator::followAircraft + //! \copydoc swift::core::context::IContextSimulator::followAircraft virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::recalculateAllAircraft + //! \copydoc swift::core::context::IContextSimulator::recalculateAllAircraft virtual void recalculateAllAircraft() override; - //! \copydoc BlackCore::Context::IContextSimulator::resetToModelMatchingAircraft + //! \copydoc swift::core::context::IContextSimulator::resetToModelMatchingAircraft virtual bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::requestElevationBySituation + //! \copydoc swift::core::context::IContextSimulator::requestElevationBySituation virtual bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; - //! \copydoc BlackCore::Context::IContextSimulator::findClosestElevationWithinRange + //! \copydoc swift::core::context::IContextSimulator::findClosestElevationWithinRange virtual swift::misc::geo::CElevationPlane findClosestElevationWithinRange(const swift::misc::geo::CCoordinateGeodetic &reference, const swift::misc::physical_quantities::CLength &range) const override; - //! \copydoc BlackCore::Context::IContextSimulator::getMatchingMessages + //! \copydoc swift::core::context::IContextSimulator::getMatchingMessages virtual swift::misc::CStatusMessageList getMatchingMessages(const swift::misc::aviation::CCallsign &callsign) const override; - //! \copydoc BlackCore::Context::IContextSimulator::isMatchingMessagesEnabled + //! \copydoc swift::core::context::IContextSimulator::isMatchingMessagesEnabled virtual swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; - //! \copydoc BlackCore::Context::IContextSimulator::enableMatchingMessages + //! \copydoc swift::core::context::IContextSimulator::enableMatchingMessages virtual void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; - //! \copydoc BlackCore::Context::IContextSimulator::parseCommandLine + //! \copydoc swift::core::context::IContextSimulator::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; - //! \copydoc BlackCore::Context::IContextSimulator::doMatchingsAgain + //! \copydoc swift::core::context::IContextSimulator::doMatchingsAgain virtual int doMatchingsAgain() override; - //! \copydoc BlackCore::Context::IContextSimulator::doMatchingAgain + //! \copydoc swift::core::context::IContextSimulator::doMatchingAgain virtual bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::Context::IContextSimulator::getCurrentMatchingStatistics + //! \copydoc swift::core::context::IContextSimulator::getCurrentMatchingStatistics virtual swift::misc::simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override; - //! \copydoc BlackCore::Context::IContextSimulator::setMatchingSetup + //! \copydoc swift::core::context::IContextSimulator::setMatchingSetup virtual void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; - //! \copydoc BlackCore::Context::IContextSimulator::getMatchingSetup + //! \copydoc swift::core::context::IContextSimulator::getMatchingSetup virtual swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; - //! \copydoc BlackCore::Context::IContextSimulator::testRemoteAircraft + //! \copydoc swift::core::context::IContextSimulator::testRemoteAircraft virtual bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override; - //! \copydoc BlackCore::Context::IContextSimulator::testUpdateRemoteAircraft + //! \copydoc swift::core::context::IContextSimulator::testUpdateRemoteAircraft virtual bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, const swift::misc::aviation::CAircraftSituation &situation, const swift::misc::aviation::CAircraftParts &parts) override; //! @} diff --git a/src/blackcore/cookiemanager.cpp b/src/core/cookiemanager.cpp similarity index 96% rename from src/blackcore/cookiemanager.cpp rename to src/core/cookiemanager.cpp index 910e06a3d..0dc08fb84 100644 --- a/src/blackcore/cookiemanager.cpp +++ b/src/core/cookiemanager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/cookiemanager.h" +#include "core/cookiemanager.h" #include #include @@ -9,7 +9,7 @@ #include #include -namespace BlackCore +namespace swift::core { CCookieManager::CCookieManager(QObject *parent) : QNetworkCookieJar(parent) {} diff --git a/src/blackcore/cookiemanager.h b/src/core/cookiemanager.h similarity index 88% rename from src/blackcore/cookiemanager.h rename to src/core/cookiemanager.h index 262696bee..b22e6f6c3 100644 --- a/src/blackcore/cookiemanager.h +++ b/src/core/cookiemanager.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_COOKIEMANAGER_H -#define BLACKCORE_COOKIEMANAGER_H +#ifndef SWIFT_CORE_COOKIEMANAGER_H +#define SWIFT_CORE_COOKIEMANAGER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include #include @@ -16,12 +16,12 @@ class QNetworkCookie; class QUrl; -namespace BlackCore +namespace swift::core { /*! * Threadsafe version of QNetworkCookieJar */ - class BLACKCORE_EXPORT CCookieManager : public QNetworkCookieJar + class SWIFT_CORE_EXPORT CCookieManager : public QNetworkCookieJar { Q_OBJECT diff --git a/src/blackcore/corefacade.cpp b/src/core/corefacade.cpp similarity index 96% rename from src/blackcore/corefacade.cpp rename to src/core/corefacade.cpp index 0d703ee5c..7e00bd4f4 100644 --- a/src/blackcore/corefacade.cpp +++ b/src/core/corefacade.cpp @@ -1,24 +1,24 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/corefacade.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextapplicationproxy.h" -#include "blackcore/context/contextapplicationimpl.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextaudioimpl.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextnetworkimpl.h" -#include "blackcore/context/contextownaircraft.h" -#include "blackcore/context/contextownaircraftimpl.h" -#include "blackcore/context/contextsimulator.h" +#include "core/corefacade.h" +#include "core/context/contextapplication.h" +#include "core/context/contextapplicationproxy.h" +#include "core/context/contextapplicationimpl.h" +#include "core/context/contextaudio.h" +#include "core/context/contextaudioimpl.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextnetworkimpl.h" +#include "core/context/contextownaircraft.h" +#include "core/context/contextownaircraftimpl.h" +#include "core/context/contextsimulator.h" #include "misc/sharedstate/datalinkdbus.h" #include "misc/loghistory.h" -#include "blackcore/context/contextsimulatorimpl.h" -#include "blackcore/data/launchersetup.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/registermetadata.h" -#include "blackcore/airspacemonitor.h" +#include "core/context/contextsimulatorimpl.h" +#include "core/data/launchersetup.h" +#include "core/corefacadeconfig.h" +#include "core/registermetadata.h" +#include "core/airspacemonitor.h" #include "misc/dbusserver.h" #include "misc/identifier.h" #include "misc/logmessage.h" @@ -38,10 +38,10 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore::Data; -using namespace BlackCore::Context; +using namespace swift::core::data; +using namespace swift::core::context; -namespace BlackCore +namespace swift::core { CCoreFacade::CCoreFacade(const CCoreFacadeConfig &config, QObject *parent) : QObject(parent), m_config(config) { @@ -172,7 +172,7 @@ namespace BlackCore void CCoreFacade::registerMetadata() { swift::misc::registerMetadata(); - BlackCore::registerMetadata(); + swift::core::registerMetadata(); } bool CCoreFacade::parseCommandLine(const QString &commandLine, const CIdentifier &originator) diff --git a/src/blackcore/corefacade.h b/src/core/corefacade.h similarity index 71% rename from src/blackcore/corefacade.h rename to src/core/corefacade.h index 388ba8f74..ed9df2f4a 100644 --- a/src/blackcore/corefacade.h +++ b/src/core/corefacade.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_COREFACADE_H -#define BLACKCORE_COREFACADE_H +#ifndef SWIFT_CORE_COREFACADE_H +#define SWIFT_CORE_COREFACADE_H -#include "blackcore/corefacadeconfig.h" -#include "blackcore/data/launchersetup.h" -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/blackcoreexport.h" +#include "core/corefacadeconfig.h" +#include "core/data/launchersetup.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/swiftcoreexport.h" #include "misc/identifier.h" #include "misc/settingscache.h" @@ -29,9 +29,9 @@ namespace swift::misc class CDataLinkDBus; } } -namespace BlackCore +namespace swift::core { - namespace Context + namespace context { class CContextApplication; class CContextAudio; @@ -54,7 +54,7 @@ namespace BlackCore * (such cross context dependencies are not desired but sometimes required) * - Loads the application settings */ - class BLACKCORE_EXPORT CCoreFacade : public QObject + class SWIFT_CORE_EXPORT CCoreFacade : public QObject { Q_OBJECT @@ -83,82 +83,82 @@ namespace BlackCore // ------- Context as interface, normal way to access a context //! Context for network - Context::IContextNetwork *getIContextNetwork(); + context::IContextNetwork *getIContextNetwork(); //! Context for network - const Context::IContextNetwork *getIContextNetwork() const; + const context::IContextNetwork *getIContextNetwork() const; //! Context for audio - Context::IContextAudio *getIContextAudio(); + context::IContextAudio *getIContextAudio(); //! Context for audio - const Context::IContextAudio *getIContextAudio() const; + const context::IContextAudio *getIContextAudio() const; //! Context for audio - Context::CContextAudioBase *getCContextAudioBase(); + context::CContextAudioBase *getCContextAudioBase(); //! Context for audio - const Context::CContextAudioBase *getCContextAudioBase() const; + const context::CContextAudioBase *getCContextAudioBase() const; //! Context for application - Context::IContextApplication *getIContextApplication(); + context::IContextApplication *getIContextApplication(); //! Context for application - const Context::IContextApplication *getIContextApplication() const; + const context::IContextApplication *getIContextApplication() const; //! Context for own aircraft - Context::IContextOwnAircraft *getIContextOwnAircraft(); + context::IContextOwnAircraft *getIContextOwnAircraft(); //! Context for own aircraft - const Context::IContextOwnAircraft *getIContextOwnAircraft() const; + const context::IContextOwnAircraft *getIContextOwnAircraft() const; //! Context for simulator - Context::IContextSimulator *getIContextSimulator(); + context::IContextSimulator *getIContextSimulator(); //! Context for simulator - const Context::IContextSimulator *getIContextSimulator() const; + const context::IContextSimulator *getIContextSimulator() const; // ------- Context as implementing (local) class //! Context for application //! \remarks only applicable for local object - Context::CContextApplication *getCContextApplication(); + context::CContextApplication *getCContextApplication(); //! Context for application //! \remarks only applicable for local object - const Context::CContextApplication *getCContextApplication() const; + const context::CContextApplication *getCContextApplication() const; //! Context for audio //! \remarks only applicable for local object - Context::CContextAudio *getCContextAudio(); + context::CContextAudio *getCContextAudio(); //! Context for audio //! \remarks only applicable for local object - const Context::CContextAudio *getCContextAudio() const; + const context::CContextAudio *getCContextAudio() const; //! Context for own aircraft //! \remarks only applicable for local object - Context::CContextOwnAircraft *getCContextOwnAircraft(); + context::CContextOwnAircraft *getCContextOwnAircraft(); //! Context for own aircraft //! \remarks only applicable for local object - const Context::CContextOwnAircraft *getCContextOwnAircraft() const; + const context::CContextOwnAircraft *getCContextOwnAircraft() const; //! Context for network //! \remarks only applicable for local object - Context::CContextNetwork *getCContextNetwork(); + context::CContextNetwork *getCContextNetwork(); //! Context for network //! \remarks only applicable for local object - const Context::CContextNetwork *getCContextNetwork() const; + const context::CContextNetwork *getCContextNetwork() const; //! Context for simulator //! \remarks only applicable for local object - Context::CContextSimulator *getCContextSimulator(); + context::CContextSimulator *getCContextSimulator(); //! Context for simulator //! \remarks only applicable for local object - const Context::CContextSimulator *getCContextSimulator() const; + const context::CContextSimulator *getCContextSimulator() const; //! DBus address if any QString getDBusAddress() const; @@ -170,7 +170,7 @@ namespace BlackCore bool m_initalized = false; //!< flag if already initialized bool m_shuttingDown = false; //!< flag if shutting down const CCoreFacadeConfig m_config; //!< used config - swift::misc::CData m_launcherSetup { this }; //!< updating DBus + swift::misc::CData m_launcherSetup { this }; //!< updating DBus // DBus swift::misc::CDBusServer *m_dbusServer = nullptr; @@ -185,11 +185,11 @@ namespace BlackCore // contexts: // There is a reason why we do not use smart pointers here. When the context is deleted // we need to use deleteLater to gracefully shut the context - Context::IContextApplication *m_contextApplication = nullptr; - Context::CContextAudioBase *m_contextAudio = nullptr; - Context::IContextNetwork *m_contextNetwork = nullptr; - Context::IContextOwnAircraft *m_contextOwnAircraft = nullptr; - Context::IContextSimulator *m_contextSimulator = nullptr; + context::IContextApplication *m_contextApplication = nullptr; + context::CContextAudioBase *m_contextAudio = nullptr; + context::IContextNetwork *m_contextNetwork = nullptr; + context::IContextOwnAircraft *m_contextOwnAircraft = nullptr; + context::IContextSimulator *m_contextSimulator = nullptr; //! Init void init(); diff --git a/src/blackcore/corefacadeconfig.cpp b/src/core/corefacadeconfig.cpp similarity index 97% rename from src/blackcore/corefacadeconfig.cpp rename to src/core/corefacadeconfig.cpp index ae8d31acb..8c8b07ab3 100644 --- a/src/blackcore/corefacadeconfig.cpp +++ b/src/core/corefacadeconfig.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/corefacadeconfig.h" +#include "core/corefacadeconfig.h" -namespace BlackCore +namespace swift::core { bool CCoreFacadeConfig::requiresDBusSever() const { diff --git a/src/blackcore/corefacadeconfig.h b/src/core/corefacadeconfig.h similarity index 95% rename from src/blackcore/corefacadeconfig.h rename to src/core/corefacadeconfig.h index a274885b8..5ee676b97 100644 --- a/src/blackcore/corefacadeconfig.h +++ b/src/core/corefacadeconfig.h @@ -3,17 +3,17 @@ //! \file -#ifndef BLACKCORE_COREFACADECONFIG_H -#define BLACKCORE_COREFACADECONFIG_H +#ifndef SWIFT_CORE_COREFACADECONFIG_H +#define SWIFT_CORE_COREFACADECONFIG_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include -namespace BlackCore +namespace swift::core { //! Helper to correctly run a context - class BLACKCORE_EXPORT CCoreFacadeConfig + class SWIFT_CORE_EXPORT CCoreFacadeConfig { public: //! How to handle a given context diff --git a/src/blackcore/coremodeenums.h b/src/core/coremodeenums.h similarity index 94% rename from src/blackcore/coremodeenums.h rename to src/core/coremodeenums.h index 786ea719f..69b859c22 100644 --- a/src/blackcore/coremodeenums.h +++ b/src/core/coremodeenums.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKGUI_GUIMODEENUMS_H -#define BLACKGUI_GUIMODEENUMS_H +#ifndef SWIFT_GUI_GUIMODEENUMS_H +#define SWIFT_GUI_GUIMODEENUMS_H #include -namespace BlackCore +namespace swift::core { //! Modes, how GUI can be started (core/GUI) struct CoreModes diff --git a/src/blackcore/data/authenticateduser.h b/src/core/data/authenticateduser.h similarity index 85% rename from src/blackcore/data/authenticateduser.h rename to src/core/data/authenticateduser.h index e875e5de8..8fb0cfd3c 100644 --- a/src/blackcore/data/authenticateduser.h +++ b/src/core/data/authenticateduser.h @@ -3,14 +3,14 @@ //! \file -#ifndef BLACKCORE_DATA_AUTHENTICATEDUSER_H -#define BLACKCORE_DATA_AUTHENTICATEDUSER_H +#ifndef SWIFT_CORE_DATA_AUTHENTICATEDUSER_H +#define SWIFT_CORE_DATA_AUTHENTICATEDUSER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/datacache.h" #include "misc/network/authenticateduser.h" -namespace BlackCore::Data +namespace swift::core::data { //! Trait for for global cached DB user. //! This user has authenticated with the swift DB. diff --git a/src/blackcore/data/dbcaches.h b/src/core/data/dbcaches.h similarity index 97% rename from src/blackcore/data/dbcaches.h rename to src/core/data/dbcaches.h index f69ef41ac..64face1b4 100644 --- a/src/blackcore/data/dbcaches.h +++ b/src/core/data/dbcaches.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_DATA_DBCACHES -#define BLACKCORE_DATA_DBCACHES +#ifndef SWIFT_CORE_DATA_DBCACHES +#define SWIFT_CORE_DATA_DBCACHES #include "misc/datacache.h" #include "misc/simulation/aircraftmodellist.h" @@ -20,7 +20,7 @@ #include #include -namespace BlackCore::Data +namespace swift::core::data { //! Trait for DB model cache struct TDbModelCache : public swift::misc::TDataTrait diff --git a/src/blackcore/data/globalsetup.cpp b/src/core/data/globalsetup.cpp similarity index 97% rename from src/blackcore/data/globalsetup.cpp rename to src/core/data/globalsetup.cpp index 5de5f5fa7..a1a22c6b3 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/core/data/globalsetup.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "config/buildconfig.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/application.h" +#include "core/data/globalsetup.h" +#include "core/application.h" #include "misc/json.h" #include "misc/swiftdirectories.h" #include "misc/directoryutils.h" @@ -23,9 +23,9 @@ using namespace swift::misc; using namespace swift::misc::json; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup) -namespace BlackCore::Data +namespace swift::core::data { CGlobalSetup::CGlobalSetup() : CIdentifiable("CGlobalSetup") {} diff --git a/src/blackcore/data/globalsetup.h b/src/core/data/globalsetup.h similarity index 96% rename from src/blackcore/data/globalsetup.h rename to src/core/data/globalsetup.h index fe641026b..1a5fde4ac 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/core/data/globalsetup.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_DATA_GLOBALSETUP_H -#define BLACKCORE_DATA_GLOBALSETUP_H +#ifndef SWIFT_CORE_DATA_GLOBALSETUP_H +#define SWIFT_CORE_DATA_GLOBALSETUP_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/network/serverlist.h" #include "misc/network/url.h" #include "misc/identifiable.h" @@ -19,13 +19,13 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CGlobalSetup) -namespace BlackCore::Data +namespace swift::core::data { //! Global settings for readers, debug flags, etc. //! \note also called the bootstrap file as it is required once to get information where all the data are located - class BLACKCORE_EXPORT CGlobalSetup : + class SWIFT_CORE_EXPORT CGlobalSetup : public swift::misc::CValueObject, public swift::misc::CIdentifiable { @@ -202,6 +202,6 @@ namespace BlackCore::Data }; } // ns -Q_DECLARE_METATYPE(BlackCore::Data::CGlobalSetup) +Q_DECLARE_METATYPE(swift::core::data::CGlobalSetup) #endif // guard diff --git a/src/blackcore/data/launchersetup.cpp b/src/core/data/launchersetup.cpp similarity index 93% rename from src/blackcore/data/launchersetup.cpp rename to src/core/data/launchersetup.cpp index d9075fda8..a919f4226 100644 --- a/src/blackcore/data/launchersetup.cpp +++ b/src/core/data/launchersetup.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/launchersetup.h" +#include "core/data/launchersetup.h" #include "misc/stringutils.h" using namespace swift::misc; -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CLauncherSetup) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup) -namespace BlackCore::Data +namespace swift::core::data { QString CLauncherSetup::convertToQString(bool i18n) const { diff --git a/src/blackcore/data/launchersetup.h b/src/core/data/launchersetup.h similarity index 85% rename from src/blackcore/data/launchersetup.h rename to src/core/data/launchersetup.h index da1e364a6..7b8cde19c 100644 --- a/src/blackcore/data/launchersetup.h +++ b/src/core/data/launchersetup.h @@ -3,21 +3,21 @@ //! \file -#ifndef BLACKCORE_DATA_LAUNCHERSETUP -#define BLACKCORE_DATA_LAUNCHERSETUP +#ifndef SWIFT_CORE_DATA_LAUNCHERSETUP +#define SWIFT_CORE_DATA_LAUNCHERSETUP -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/propertyindex.h" #include "misc/datacache.h" #include "misc/valueobject.h" #include "misc/variant.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CLauncherSetup) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CLauncherSetup) -namespace BlackCore::Data +namespace swift::core::data { //! Launcher setup - class BLACKCORE_EXPORT CLauncherSetup : public swift::misc::CValueObject + class SWIFT_CORE_EXPORT CLauncherSetup : public swift::misc::CValueObject { public: //! Properties by index @@ -111,9 +111,9 @@ namespace BlackCore::Data }; } // ns -Q_DECLARE_METATYPE(BlackCore::Data::CLauncherSetup) -Q_DECLARE_METATYPE(BlackCore::Data::CLauncherSetup::AudioModeFlag) -Q_DECLARE_METATYPE(BlackCore::Data::CLauncherSetup::AudioMode) -Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::Data::CLauncherSetup::AudioMode) +Q_DECLARE_METATYPE(swift::core::data::CLauncherSetup) +Q_DECLARE_METATYPE(swift::core::data::CLauncherSetup::AudioModeFlag) +Q_DECLARE_METATYPE(swift::core::data::CLauncherSetup::AudioMode) +Q_DECLARE_OPERATORS_FOR_FLAGS(swift::core::data::CLauncherSetup::AudioMode) #endif // guard diff --git a/src/blackcore/data/networksetup.cpp b/src/core/data/networksetup.cpp similarity index 95% rename from src/blackcore/data/networksetup.cpp rename to src/core/data/networksetup.cpp index 6bb6ef3cc..e4df4debc 100644 --- a/src/blackcore/data/networksetup.cpp +++ b/src/core/data/networksetup.cpp @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/networksetup.h" -#include "blackcore/application.h" +#include "core/data/networksetup.h" +#include "core/application.h" #include "config/buildconfig.h" using namespace swift::config; using namespace swift::misc; using namespace swift::misc::network; -namespace BlackCore::Data +namespace swift::core::data { CNetworkSetup::CNetworkSetup() {} diff --git a/src/blackcore/data/networksetup.h b/src/core/data/networksetup.h similarity index 83% rename from src/blackcore/data/networksetup.h rename to src/core/data/networksetup.h index 1eff1007f..0f6440b05 100644 --- a/src/blackcore/data/networksetup.h +++ b/src/core/data/networksetup.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_DATA_NETWORKSETUP_H -#define BLACKCORE_DATA_NETWORKSETUP_H +#ifndef SWIFT_CORE_DATA_NETWORKSETUP_H +#define SWIFT_CORE_DATA_NETWORKSETUP_H -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/data/vatsimsetup.h" -#include "blackcore/blackcoreexport.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/data/vatsimsetup.h" +#include "core/swiftcoreexport.h" #include "misc/network/data/lastserver.h" #include "misc/network/settings/serversettings.h" #include "misc/network/serverlist.h" @@ -20,10 +20,10 @@ #include #include -namespace BlackCore::Data +namespace swift::core::data { //! Remembering the last servers and ecosystem. - class BLACKCORE_EXPORT CNetworkSetup : public QObject + class SWIFT_CORE_EXPORT CNetworkSetup : public QObject { Q_OBJECT @@ -71,7 +71,7 @@ namespace BlackCore::Data swift::misc::CSettingReadOnly m_otherTrafficNetworkServers { this, &CNetworkSetup::onSettingsChanged }; swift::misc::CData m_lastServer { this, &CNetworkSetup::onSettingsChanged }; //!< recently used server (VATSIM, other) - swift::misc::CData m_lastVatsimServer { this, &CNetworkSetup::onSettingsChanged }; //!< recently used VATSIM server + swift::misc::CData m_lastVatsimServer { this, &CNetworkSetup::onSettingsChanged }; //!< recently used VATSIM server }; } // ns diff --git a/src/blackcore/data/vatsimsetup.cpp b/src/core/data/vatsimsetup.cpp similarity index 95% rename from src/blackcore/data/vatsimsetup.cpp rename to src/core/data/vatsimsetup.cpp index aa51627d7..93532f485 100644 --- a/src/blackcore/data/vatsimsetup.cpp +++ b/src/core/data/vatsimsetup.cpp @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/vatsimsetup.h" +#include "core/data/vatsimsetup.h" #include using namespace swift::misc; using namespace swift::misc::network; -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CVatsimSetup) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup) -namespace BlackCore::Data +namespace swift::core::data { CVatsimSetup::CVatsimSetup() : ITimestampBased(0) {} diff --git a/src/blackcore/data/vatsimsetup.h b/src/core/data/vatsimsetup.h similarity index 94% rename from src/blackcore/data/vatsimsetup.h rename to src/core/data/vatsimsetup.h index adbe7ceb5..0d780f32d 100644 --- a/src/blackcore/data/vatsimsetup.h +++ b/src/core/data/vatsimsetup.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_DATA_VATSIMDATA_H -#define BLACKCORE_DATA_VATSIMDATA_H +#ifndef SWIFT_CORE_DATA_VATSIMDATA_H +#define SWIFT_CORE_DATA_VATSIMDATA_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/datacache.h" #include "misc/metaclass.h" #include "misc/network/serverlist.h" @@ -20,12 +20,12 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CVatsimSetup) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::data, CVatsimSetup) -namespace BlackCore::Data +namespace swift::core::data { //! VATSIM data (servers, URLs) cached as last known good setup. - class BLACKCORE_EXPORT CVatsimSetup : + class SWIFT_CORE_EXPORT CVatsimSetup : public swift::misc::CValueObject, public swift::misc::ITimestampBased { @@ -144,6 +144,6 @@ namespace BlackCore::Data }; } // ns -Q_DECLARE_METATYPE(BlackCore::Data::CVatsimSetup) +Q_DECLARE_METATYPE(swift::core::data::CVatsimSetup) #endif // guard diff --git a/src/blackcore/db/airportdatareader.cpp b/src/core/db/airportdatareader.cpp similarity index 98% rename from src/blackcore/db/airportdatareader.cpp rename to src/core/db/airportdatareader.cpp index a548444cc..28169c3b6 100644 --- a/src/blackcore/db/airportdatareader.cpp +++ b/src/core/db/airportdatareader.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/airportdatareader.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/application.h" +#include "core/db/airportdatareader.h" +#include "core/db/databaseutils.h" +#include "core/application.h" #include "misc/network/networkutils.h" #include "misc/logmessage.h" @@ -18,7 +18,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::db; -namespace BlackCore::Db +namespace swift::core::db { CAirportDataReader::CAirportDataReader(QObject *parent, const CDatabaseReaderConfigList &config) : CDatabaseReader(parent, config, QStringLiteral("CAirportDataReader")) { diff --git a/src/blackcore/db/airportdatareader.h b/src/core/db/airportdatareader.h similarity index 86% rename from src/blackcore/db/airportdatareader.h rename to src/core/db/airportdatareader.h index 7f6812915..dafbd9fc2 100644 --- a/src/blackcore/db/airportdatareader.h +++ b/src/core/db/airportdatareader.h @@ -3,22 +3,22 @@ //! \file -#ifndef BLACKCORE_AIRPORTDATAREADER_H -#define BLACKCORE_AIRPORTDATAREADER_H +#ifndef SWIFT_CORE_AIRPORTDATAREADER_H +#define SWIFT_CORE_AIRPORTDATAREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/data/dbcaches.h" -#include "blackcore/db/databasereader.h" +#include "core/swiftcoreexport.h" +#include "core/data/dbcaches.h" +#include "core/db/databasereader.h" #include "misc/aviation/airportlist.h" #include "misc/network/entityflags.h" #include #include -namespace BlackCore::Db +namespace swift::core::db { //! Reader for airport database data. - class BLACKCORE_EXPORT CAirportDataReader : public CDatabaseReader + class SWIFT_CORE_EXPORT CAirportDataReader : public CDatabaseReader { Q_OBJECT @@ -62,11 +62,11 @@ namespace BlackCore::Db virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: - swift::misc::CData m_airportCache { this, &CAirportDataReader::airportCacheChanged }; //!< cache file + swift::misc::CData m_airportCache { this, &CAirportDataReader::airportCacheChanged }; //!< cache file std::atomic_bool m_syncedAirportCache { false }; //!< already synchronized? //! Reader URL (we read from where?) used to detect changes of location - swift::misc::CData m_readerUrlCache { this, &CAirportDataReader::baseUrlCacheChanged }; + swift::misc::CData m_readerUrlCache { this, &CAirportDataReader::baseUrlCacheChanged }; //! \copydoc CDatabaseReader::read void read(swift::misc::network::CEntityFlags::Entity entity, swift::misc::db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) override; diff --git a/src/blackcore/db/backgrounddataupdater.cpp b/src/core/db/backgrounddataupdater.cpp similarity index 96% rename from src/blackcore/db/backgrounddataupdater.cpp rename to src/core/db/backgrounddataupdater.cpp index ca4123f3c..fe619077f 100644 --- a/src/blackcore/db/backgrounddataupdater.cpp +++ b/src/core/db/backgrounddataupdater.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/backgrounddataupdater.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/db/databasewriter.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/db/backgrounddataupdater.h" +#include "core/db/databaseutils.h" +#include "core/db/databasewriter.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/threadutils.h" #include "misc/eventloop.h" @@ -16,10 +16,10 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::data; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; -namespace BlackCore::Db +namespace swift::core::db { const QStringList &CBackgroundDataUpdater::getLogCategories() { diff --git a/src/blackcore/db/backgrounddataupdater.h b/src/core/db/backgrounddataupdater.h similarity index 90% rename from src/blackcore/db/backgrounddataupdater.h rename to src/core/db/backgrounddataupdater.h index aeb360e5a..2cac1ccd3 100644 --- a/src/blackcore/db/backgrounddataupdater.h +++ b/src/core/db/backgrounddataupdater.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_DB_BACKGROUNDDATAUPDATER_H -#define BLACKCORE_DB_BACKGROUNDDATAUPDATER_H +#ifndef SWIFT_CORE_DB_BACKGROUNDDATAUPDATER_H +#define SWIFT_CORE_DB_BACKGROUNDDATAUPDATER_H -#include "blackcore/data/dbcaches.h" -#include "blackcore/blackcoreexport.h" +#include "core/data/dbcaches.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/data/modelcaches.h" #include "misc/network/entityflags.h" #include "misc/statusmessagelist.h" @@ -17,10 +17,10 @@ #include #include -namespace BlackCore::Db +namespace swift::core::db { //! Update and consolidation of DB data - class BLACKCORE_EXPORT CBackgroundDataUpdater : public swift::misc::CContinuousWorker + class SWIFT_CORE_EXPORT CBackgroundDataUpdater : public swift::misc::CContinuousWorker { Q_OBJECT diff --git a/src/blackcore/db/databaseauthentication.cpp b/src/core/db/databaseauthentication.cpp similarity index 97% rename from src/blackcore/db/databaseauthentication.cpp rename to src/core/db/databaseauthentication.cpp index 360c28faa..e82f9eb8e 100644 --- a/src/blackcore/db/databaseauthentication.cpp +++ b/src/core/db/databaseauthentication.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/databaseauthentication.h" +#include "core/application.h" +#include "core/data/globalsetup.h" +#include "core/db/databaseauthentication.h" #include "misc/json.h" #include "misc/logcategories.h" #include "misc/logmessage.h" @@ -26,7 +26,7 @@ using namespace swift::misc; using namespace swift::misc::network; -namespace BlackCore::Db +namespace swift::core::db { const QStringList &CDatabaseAuthenticationService::getLogCategories() { diff --git a/src/blackcore/db/databaseauthentication.h b/src/core/db/databaseauthentication.h similarity index 78% rename from src/blackcore/db/databaseauthentication.h rename to src/core/db/databaseauthentication.h index 58bb0f0eb..3eef5ef79 100644 --- a/src/blackcore/db/databaseauthentication.h +++ b/src/core/db/databaseauthentication.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_DATABASE_CDATABASEUATHENTICATIONSERVICE_H -#define BLACKCORE_DATABASE_CDATABASEUATHENTICATIONSERVICE_H +#ifndef SWIFT_CORE_DATABASE_CDATABASEUATHENTICATIONSERVICE_H +#define SWIFT_CORE_DATABASE_CDATABASEUATHENTICATIONSERVICE_H -#include "blackcore/data/authenticateduser.h" -#include "blackcore/blackcoreexport.h" +#include "core/data/authenticateduser.h" +#include "core/swiftcoreexport.h" #include "misc/datacache.h" #include "misc/logcategories.h" #include "misc/statusmessagelist.h" @@ -21,10 +21,10 @@ namespace swift::misc::network { class CAuthenticatedUser; } -namespace BlackCore::Db +namespace swift::core::db { //! Database user used with swift DB. Features role and cookie handling. - class BLACKCORE_EXPORT CDatabaseAuthenticationService : public QObject + class SWIFT_CORE_EXPORT CDatabaseAuthenticationService : public QObject { Q_OBJECT @@ -64,7 +64,7 @@ namespace BlackCore::Db //! User object changed void userChanged(); - swift::misc::CData m_swiftDbUser { this, &CDatabaseAuthenticationService::userChanged }; + swift::misc::CData m_swiftDbUser { this, &CDatabaseAuthenticationService::userChanged }; bool m_shutdown = false; }; } // ns diff --git a/src/blackcore/db/databasereader.cpp b/src/core/db/databasereader.cpp similarity index 99% rename from src/blackcore/db/databasereader.cpp rename to src/core/db/databasereader.cpp index 57ff340e6..e44179259 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/core/db/databasereader.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/databasereader.h" -#include "blackcore/db/infodatareader.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/webdataservices.h" -#include "blackcore/application.h" +#include "core/db/databasereader.h" +#include "core/db/infodatareader.h" +#include "core/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/application.h" #include "misc/db/datastoreutility.h" #include "misc/network/networkutils.h" #include "misc/network/entityflags.h" @@ -32,11 +32,11 @@ using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Data; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::data; +using namespace swift::core::db; -namespace BlackCore::Db +namespace swift::core::db { CDatabaseReader::CDatabaseReader(QObject *owner, const CDatabaseReaderConfigList &config, const QString &name) : CThreadedReader(owner, name), m_config(config) {} diff --git a/src/blackcore/db/databasereader.h b/src/core/db/databasereader.h similarity index 97% rename from src/blackcore/db/databasereader.h rename to src/core/db/databasereader.h index 5fe2c0f73..ffcb5e958 100644 --- a/src/blackcore/db/databasereader.h +++ b/src/core/db/databasereader.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_DB_DATABASEREADER_H -#define BLACKCORE_DB_DATABASEREADER_H +#ifndef SWIFT_CORE_DB_DATABASEREADER_H +#define SWIFT_CORE_DB_DATABASEREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/db/databasereaderconfig.h" +#include "core/swiftcoreexport.h" +#include "core/db/databasereaderconfig.h" #include "misc/db/dbinfolist.h" #include "misc/pq/time.h" #include "misc/network/url.h" #include "misc/statusmessage.h" -#include "blackcore/threadedreader.h" +#include "core/threadedreader.h" #include "misc/sequence.h" #include "misc/valueobject.h" @@ -32,10 +32,10 @@ namespace swift::misc { class CLogCategoryList; } -namespace BlackCore::Db +namespace swift::core::db { //! Specialized version of threaded reader for DB data - class BLACKCORE_EXPORT CDatabaseReader : public CThreadedReader + class SWIFT_CORE_EXPORT CDatabaseReader : public CThreadedReader { Q_OBJECT @@ -230,11 +230,11 @@ namespace BlackCore::Db bool hasSharedFileHeaders(const swift::misc::network::CEntityFlags::Entity entities) const; //! Obtain latest object timestamp from DB info objects - //! \sa BlackCore::Db::CInfoDataReader + //! \sa swift::core::db::CInfoDataReader QDateTime getLatestEntityTimestampFromDbInfoObjects(swift::misc::network::CEntityFlags::Entity entity) const; //! Obtain latest object timestamp from shared info objects - //! \sa BlackCore::Db::CInfoDataReader + //! \sa swift::core::db::CInfoDataReader QDateTime getLatestEntityTimestampFromSharedInfoObjects(swift::misc::network::CEntityFlags::Entity entity) const; //! Header timestamp (last-modified) for shared file @@ -315,11 +315,11 @@ namespace BlackCore::Db CDatabaseReader::JsonDatastoreResponse setStatusAndTransformReplyIntoDatastoreResponse(QNetworkReply *nwReply); //! DB Info list (latest data timestamps from DB web service) - //! \sa BlackCore::Db::CInfoDataReader + //! \sa swift::core::db::CInfoDataReader swift::misc::db::CDbInfoList getDbInfoObjects() const; //! Shared info list (latest data timestamps from DB web service) - //! \sa BlackCore::Db::CInfoDataReader + //! \sa swift::core::db::CInfoDataReader swift::misc::db::CDbInfoList getSharedInfoObjects() const; //! Config for given entity diff --git a/src/blackcore/db/databasereaderconfig.cpp b/src/core/db/databasereaderconfig.cpp similarity index 98% rename from src/blackcore/db/databasereaderconfig.cpp rename to src/core/db/databasereaderconfig.cpp index 23b845d93..81860cc61 100644 --- a/src/blackcore/db/databasereaderconfig.cpp +++ b/src/core/db/databasereaderconfig.cpp @@ -4,7 +4,7 @@ //! \cond PRIVATE // without the Doxygen exclusion I get a strange no matching class member found for warning in the gcc build -#include "blackcore/db/databasereaderconfig.h" +#include "core/db/databasereaderconfig.h" #include using namespace swift::misc; @@ -12,10 +12,10 @@ using namespace swift::misc::db; using namespace swift::misc::network; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Db, CDatabaseReaderConfig) -BLACK_DEFINE_SEQUENCE_MIXINS(BlackCore::Db, CDatabaseReaderConfig, CDatabaseReaderConfigList) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig) +BLACK_DEFINE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList) -namespace BlackCore::Db +namespace swift::core::db { CDatabaseReaderConfig::CDatabaseReaderConfig(CEntityFlags::Entity entities, CDbFlags::DataRetrievalMode retrievalFlags, const CTime &cacheLifetime) : m_entities(entities), m_retrievalMode(retrievalFlags), m_cacheLifetime(cacheLifetime) { diff --git a/src/blackcore/db/databasereaderconfig.h b/src/core/db/databasereaderconfig.h similarity index 87% rename from src/blackcore/db/databasereaderconfig.h rename to src/core/db/databasereaderconfig.h index c50294ad7..cc9994f15 100644 --- a/src/blackcore/db/databasereaderconfig.h +++ b/src/core/db/databasereaderconfig.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_DB_DATABASE_READERCONFIG_H -#define BLACKCORE_DB_DATABASE_READERCONFIG_H +#ifndef SWIFT_CORE_DB_DATABASE_READERCONFIG_H +#define SWIFT_CORE_DB_DATABASE_READERCONFIG_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/pq/time.h" #include "misc/network/entityflags.h" #include "misc/db/dbflags.h" @@ -21,12 +21,12 @@ #include #include -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Db, CDatabaseReaderConfig) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::db, CDatabaseReaderConfig) -namespace BlackCore::Db +namespace swift::core::db { //! Details how to read a certain entity - class BLACKCORE_EXPORT CDatabaseReaderConfig : public swift::misc::CValueObject + class SWIFT_CORE_EXPORT CDatabaseReaderConfig : public swift::misc::CValueObject { public: //! Default constructor. @@ -84,12 +84,12 @@ namespace BlackCore::Db }; } -BLACK_DECLARE_SEQUENCE_MIXINS(BlackCore::Db, CDatabaseReaderConfig, CDatabaseReaderConfigList) +BLACK_DECLARE_SEQUENCE_MIXINS(swift::core::db, CDatabaseReaderConfig, CDatabaseReaderConfigList) -namespace BlackCore::Db +namespace swift::core::db { //! Value object encapsulating a list of reader configs. - class BLACKCORE_EXPORT CDatabaseReaderConfigList : + class SWIFT_CORE_EXPORT CDatabaseReaderConfigList : public swift::misc::CSequence, public swift::misc::mixin::MetaType { @@ -148,8 +148,8 @@ namespace BlackCore::Db }; } // ns -Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfig) -Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfigList) -Q_DECLARE_METATYPE(swift::misc::CCollection) +Q_DECLARE_METATYPE(swift::core::db::CDatabaseReaderConfig) +Q_DECLARE_METATYPE(swift::core::db::CDatabaseReaderConfigList) +Q_DECLARE_METATYPE(swift::misc::CCollection) #endif // guard diff --git a/src/blackcore/db/databaseutils.cpp b/src/core/db/databaseutils.cpp similarity index 99% rename from src/blackcore/db/databaseutils.cpp rename to src/core/db/databaseutils.cpp index e251bc0f9..ba39ae6e1 100644 --- a/src/blackcore/db/databaseutils.cpp +++ b/src/core/db/databaseutils.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/databaseutils.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/db/databaseutils.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/logmessage.h" #include "misc/fileutils.h" #include "misc/compressutils.h" @@ -14,7 +14,7 @@ using namespace swift::misc::json; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -namespace BlackCore::Db +namespace swift::core::db { const QStringList &CDatabaseUtils::getLogCategories() { diff --git a/src/blackcore/db/databaseutils.h b/src/core/db/databaseutils.h similarity index 95% rename from src/blackcore/db/databaseutils.h rename to src/core/db/databaseutils.h index 649408a23..583706a2b 100644 --- a/src/blackcore/db/databaseutils.h +++ b/src/core/db/databaseutils.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_DB_DATABASEUTILS_H -#define BLACKCORE_DB_DATABASEUTILS_H +#ifndef SWIFT_CORE_DB_DATABASEUTILS_H +#define SWIFT_CORE_DB_DATABASEUTILS_H -#include "blackcore/progress.h" -#include "blackcore/blackcoreexport.h" +#include "core/progress.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/autopublishdata.h" @@ -17,10 +17,10 @@ #include #include -namespace BlackCore::Db +namespace swift::core::db { //! Read information about data from Database - class BLACKCORE_EXPORT CDatabaseUtils + class SWIFT_CORE_EXPORT CDatabaseUtils { public: //! No constructor @@ -69,7 +69,7 @@ namespace BlackCore::Db static int fillInMissingAircraftAndLiveryEntities(swift::misc::simulation::CAircraftModelList &models); //! Create stash models if the DB models miss that simulator - static swift::misc::simulation::CAircraftModelList updateSimulatorForFsFamily(const swift::misc::simulation::CAircraftModelList &ownModels, swift::misc::CStatusMessageList *updateInfo, int maxToStash = -1, BlackCore::IProgressIndicator *progressIndicator = nullptr, bool processEvents = true); + static swift::misc::simulation::CAircraftModelList updateSimulatorForFsFamily(const swift::misc::simulation::CAircraftModelList &ownModels, swift::misc::CStatusMessageList *updateInfo, int maxToStash = -1, swift::core::IProgressIndicator *progressIndicator = nullptr, bool processEvents = true); //! Database JSON from content string, which can be compressed static QJsonDocument databaseJsonToQJsonDocument(const QString &content); diff --git a/src/blackcore/db/databasewriter.cpp b/src/core/db/databasewriter.cpp similarity index 98% rename from src/blackcore/db/databasewriter.cpp rename to src/core/db/databasewriter.cpp index fb7a738a2..65b74a443 100644 --- a/src/blackcore/db/databasewriter.cpp +++ b/src/core/db/databasewriter.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/databasewriter.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/application.h" +#include "core/data/globalsetup.h" +#include "core/db/databasewriter.h" +#include "core/db/databaseutils.h" +#include "core/application.h" #include "misc/simulation/autopublishdata.h" #include "misc/network/networkutils.h" #include "misc/db/datastoreutility.h" @@ -26,9 +26,9 @@ using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore::Db; +using namespace swift::core::db; -namespace BlackCore::Db +namespace swift::core::db { CDatabaseWriter::CDatabaseWriter(const network::CUrl &baseUrl, QObject *parent) : QObject(parent), m_modelPublishUrl(CDatabaseWriter::getModelPublishUrl(baseUrl)), diff --git a/src/blackcore/db/databasewriter.h b/src/core/db/databasewriter.h similarity index 95% rename from src/blackcore/db/databasewriter.h rename to src/core/db/databasewriter.h index 134bf4b3f..c4fff2d7d 100644 --- a/src/blackcore/db/databasewriter.h +++ b/src/core/db/databasewriter.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_DATABASE_WRITER_H -#define BLACKCORE_DATABASE_WRITER_H +#ifndef SWIFT_CORE_DATABASE_WRITER_H +#define SWIFT_CORE_DATABASE_WRITER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/network/urlloglist.h" #include "misc/network/url.h" @@ -22,10 +22,10 @@ namespace swift::misc::simulation { class CAutoPublishData; } -namespace BlackCore::Db +namespace swift::core::db { //! Write to the swift DB - class BLACKCORE_EXPORT CDatabaseWriter : public QObject + class SWIFT_CORE_EXPORT CDatabaseWriter : public QObject { Q_OBJECT diff --git a/src/blackcore/db/icaodatareader.cpp b/src/core/db/icaodatareader.cpp similarity index 99% rename from src/blackcore/db/icaodatareader.cpp rename to src/core/db/icaodatareader.cpp index b6f5961a9..22fc916ca 100644 --- a/src/blackcore/db/icaodatareader.cpp +++ b/src/core/db/icaodatareader.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/icaodatareader.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/application.h" +#include "core/data/globalsetup.h" +#include "core/db/icaodatareader.h" +#include "core/db/databaseutils.h" +#include "core/application.h" #include "misc/aviation/aircraftcategorylist.h" #include "misc/fileutils.h" #include "misc/json.h" @@ -33,9 +33,9 @@ using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::aviation; using namespace swift::misc::network; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Db +namespace swift::core::db { CIcaoDataReader::CIcaoDataReader(QObject *owner, const CDatabaseReaderConfigList &config) : CDatabaseReader(owner, config, "CIcaoDataReader") { diff --git a/src/blackcore/db/icaodatareader.h b/src/core/db/icaodatareader.h similarity index 90% rename from src/blackcore/db/icaodatareader.h rename to src/core/db/icaodatareader.h index 66e89552a..63b3c3124 100644 --- a/src/blackcore/db/icaodatareader.h +++ b/src/core/db/icaodatareader.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_ICAODATAREADER_H -#define BLACKCORE_ICAODATAREADER_H +#ifndef SWIFT_CORE_ICAODATAREADER_H +#define SWIFT_CORE_ICAODATAREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/db/databasereader.h" -#include "blackcore/data/dbcaches.h" +#include "core/swiftcoreexport.h" +#include "core/db/databasereader.h" +#include "core/data/dbcaches.h" #include "misc/aviation/aircrafticaocodelist.h" #include "misc/aviation/airlineicaocodelist.h" #include "misc/network/entityflags.h" @@ -25,10 +25,10 @@ class QDateTime; class QNetworkReply; -namespace BlackCore::Db +namespace swift::core::db { //! Read ICAO data from Database - class BLACKCORE_EXPORT CIcaoDataReader : public CDatabaseReader + class SWIFT_CORE_EXPORT CIcaoDataReader : public CDatabaseReader { Q_OBJECT @@ -155,10 +155,10 @@ namespace BlackCore::Db virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: - swift::misc::CData m_aircraftIcaoCache { this, &CIcaoDataReader::aircraftIcaoCacheChanged }; - swift::misc::CData m_airlineIcaoCache { this, &CIcaoDataReader::airlineIcaoCacheChanged }; - swift::misc::CData m_countryCache { this, &CIcaoDataReader::countryCacheChanged }; - swift::misc::CData m_categoryCache { this, &CIcaoDataReader::aircraftCategoryCacheChanged }; + swift::misc::CData m_aircraftIcaoCache { this, &CIcaoDataReader::aircraftIcaoCacheChanged }; + swift::misc::CData m_airlineIcaoCache { this, &CIcaoDataReader::airlineIcaoCacheChanged }; + swift::misc::CData m_countryCache { this, &CIcaoDataReader::countryCacheChanged }; + swift::misc::CData m_categoryCache { this, &CIcaoDataReader::aircraftCategoryCacheChanged }; std::atomic_bool m_syncedAircraftIcaoCache { false }; //!< already synchronized? std::atomic_bool m_syncedAirlineIcaoCache { false }; //!< already synchronized? std::atomic_bool m_syncedCountryCache { false }; //!< already synchronized? @@ -169,7 +169,7 @@ namespace BlackCore::Db swift::misc::db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) override; //! Reader URL (we read from where?) used to detect changes of location - swift::misc::CData m_readerUrlCache { this, &CIcaoDataReader::baseUrlCacheChanged }; + swift::misc::CData m_readerUrlCache { this, &CIcaoDataReader::baseUrlCacheChanged }; //! Aircraft have been read void parseAircraftIcaoData(QNetworkReply *nwReply); diff --git a/src/blackcore/db/infodatareader.cpp b/src/core/db/infodatareader.cpp similarity index 98% rename from src/blackcore/db/infodatareader.cpp rename to src/core/db/infodatareader.cpp index ae84fd096..5314fbd95 100644 --- a/src/blackcore/db/infodatareader.cpp +++ b/src/core/db/infodatareader.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/infodatareader.h" -#include "blackcore/application.h" -#include "blackcore/webdataservices.h" +#include "core/db/infodatareader.h" +#include "core/application.h" +#include "core/webdataservices.h" #include "misc/sequence.h" #include "misc/logmessage.h" #include "misc/network/networkutils.h" @@ -16,9 +16,9 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::db; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Db +namespace swift::core::db { CInfoDataReader::CInfoDataReader(QObject *owner, const CDatabaseReaderConfigList &config, CDbFlags::DataRetrievalModeFlag mode) : CDatabaseReader(owner, config, "CInfoDataReader"), m_mode(mode) { diff --git a/src/blackcore/db/infodatareader.h b/src/core/db/infodatareader.h similarity index 93% rename from src/blackcore/db/infodatareader.h rename to src/core/db/infodatareader.h index 0eb153d74..5540681f5 100644 --- a/src/blackcore/db/infodatareader.h +++ b/src/core/db/infodatareader.h @@ -3,23 +3,23 @@ //! \file -#ifndef BLACKCORE_DB_INFODATAREADER_H -#define BLACKCORE_DB_INFODATAREADER_H +#ifndef SWIFT_CORE_DB_INFODATAREADER_H +#define SWIFT_CORE_DB_INFODATAREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/db/databasereader.h" +#include "core/swiftcoreexport.h" +#include "core/db/databasereader.h" #include "misc/db/dbinfolist.h" #include #include #include -namespace BlackCore::Db +namespace swift::core::db { //! Read information about data from Database or shared files //! such as when updated and number of entries. //! \see swift::misc::db::CDbInfo - class BLACKCORE_EXPORT CInfoDataReader : public CDatabaseReader + class SWIFT_CORE_EXPORT CInfoDataReader : public CDatabaseReader { Q_OBJECT diff --git a/src/blackcore/db/modeldatareader.cpp b/src/core/db/modeldatareader.cpp similarity index 99% rename from src/blackcore/db/modeldatareader.cpp rename to src/core/db/modeldatareader.cpp index b43591322..209ca2570 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/core/db/modeldatareader.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/modeldatareader.h" -#include "blackcore/db/databaseutils.h" -#include "blackcore/webdataservices.h" -#include "blackcore/application.h" +#include "core/data/globalsetup.h" +#include "core/db/modeldatareader.h" +#include "core/db/databaseutils.h" +#include "core/webdataservices.h" +#include "core/application.h" #include "misc/fileutils.h" #include "misc/json.h" #include "misc/logmessage.h" @@ -32,10 +32,10 @@ using namespace swift::misc::db; using namespace swift::misc::aviation; using namespace swift::misc::simulation; using namespace swift::misc::network; -using namespace BlackCore::Data; -using namespace BlackCore::Db; +using namespace swift::core::data; +using namespace swift::core::db; -namespace BlackCore::Db +namespace swift::core::db { CModelDataReader::CModelDataReader(QObject *owner, const CDatabaseReaderConfigList &config) : CDatabaseReader(owner, config, "CModelDataReader") { diff --git a/src/blackcore/db/modeldatareader.h b/src/core/db/modeldatareader.h similarity index 91% rename from src/blackcore/db/modeldatareader.h rename to src/core/db/modeldatareader.h index 7c59f560a..f02d38cf8 100644 --- a/src/blackcore/db/modeldatareader.h +++ b/src/core/db/modeldatareader.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_MODELDATAREADER_H -#define BLACKCORE_MODELDATAREADER_H +#ifndef SWIFT_CORE_MODELDATAREADER_H +#define SWIFT_CORE_MODELDATAREADER_H -#include "blackcore/data/dbcaches.h" -#include "blackcore/db/databasereader.h" -#include "blackcore/blackcoreexport.h" +#include "core/data/dbcaches.h" +#include "core/db/databasereader.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/distributorlist.h" #include "misc/aviation/aircraftcategorylist.h" @@ -27,10 +27,10 @@ class QNetworkReply; -namespace BlackCore::Db +namespace swift::core::db { //! Read model related data from Database - class BLACKCORE_EXPORT CModelDataReader : public CDatabaseReader + class SWIFT_CORE_EXPORT CModelDataReader : public CDatabaseReader { Q_OBJECT @@ -149,9 +149,9 @@ namespace BlackCore::Db virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: - swift::misc::CData m_liveryCache { this, &CModelDataReader::liveryCacheChanged }; - swift::misc::CData m_modelCache { this, &CModelDataReader::modelCacheChanged }; - swift::misc::CData m_distributorCache { this, &CModelDataReader::distributorCacheChanged }; + swift::misc::CData m_liveryCache { this, &CModelDataReader::liveryCacheChanged }; + swift::misc::CData m_modelCache { this, &CModelDataReader::modelCacheChanged }; + swift::misc::CData m_distributorCache { this, &CModelDataReader::distributorCacheChanged }; std::atomic_bool m_syncedLiveryCache { false }; //!< already synchronized? std::atomic_bool m_syncedModelCache { false }; //!< already synchronized? std::atomic_bool m_syncedDistributorCache { false }; //!< already synchronized? @@ -161,7 +161,7 @@ namespace BlackCore::Db swift::misc::db::CDbFlags::DataRetrievalModeFlag mode = swift::misc::db::CDbFlags::DbReading, const QDateTime &newerThan = QDateTime()) override; //! Reader URL (we read from where?) used to detect changes of location - swift::misc::CData m_readerUrlCache { this, &CModelDataReader::baseUrlCacheChanged }; + swift::misc::CData m_readerUrlCache { this, &CModelDataReader::baseUrlCacheChanged }; //! Liveries have been read void parseLiveryData(QNetworkReply *nwReply); diff --git a/src/blackcore/fsd/addatc.cpp b/src/core/fsd/addatc.cpp similarity index 93% rename from src/blackcore/fsd/addatc.cpp rename to src/core/fsd/addatc.cpp index 9d9351511..66f5a78eb 100644 --- a/src/blackcore/fsd/addatc.cpp +++ b/src/core/fsd/addatc.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/addatc.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/addatc.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { AddAtc::AddAtc() : MessageBase() {} diff --git a/src/blackcore/fsd/addatc.h b/src/core/fsd/addatc.h similarity index 90% rename from src/blackcore/fsd/addatc.h rename to src/core/fsd/addatc.h index adaa10883..af7f80587 100644 --- a/src/blackcore/fsd/addatc.h +++ b/src/core/fsd/addatc.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_FSD_ADDATC_H -#define BLACKCORE_FSD_ADDATC_H +#ifndef SWIFT_CORE_FSD_ADDATC_H +#define SWIFT_CORE_FSD_ADDATC_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" #include #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Add ATC message - class BLACKCORE_EXPORT AddAtc : public MessageBase + class SWIFT_CORE_EXPORT AddAtc : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/addpilot.cpp b/src/core/fsd/addpilot.cpp similarity index 94% rename from src/blackcore/fsd/addpilot.cpp rename to src/core/fsd/addpilot.cpp index 5465affe4..652c94f67 100644 --- a/src/blackcore/fsd/addpilot.cpp +++ b/src/core/fsd/addpilot.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/addpilot.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/addpilot.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" using namespace swift::misc; -namespace BlackCore::Fsd +namespace swift::core::fsd { AddPilot::AddPilot(const QString &callsign, const QString &cid, const QString &password, PilotRating rating, int protocolRevision, SimType simType, const QString &realName) diff --git a/src/blackcore/fsd/addpilot.h b/src/core/fsd/addpilot.h similarity index 90% rename from src/blackcore/fsd/addpilot.h rename to src/core/fsd/addpilot.h index 29301fb2e..019bbb76f 100644 --- a/src/blackcore/fsd/addpilot.h +++ b/src/core/fsd/addpilot.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_FSD_ADDPILOT_H -#define BLACKCORE_FSD_ADDPILOT_H +#ifndef SWIFT_CORE_FSD_ADDPILOT_H +#define SWIFT_CORE_FSD_ADDPILOT_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" #include #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message: Add Pilot - class BLACKCORE_EXPORT AddPilot : public MessageBase + class SWIFT_CORE_EXPORT AddPilot : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/atcdataupdate.cpp b/src/core/fsd/atcdataupdate.cpp similarity index 95% rename from src/blackcore/fsd/atcdataupdate.cpp rename to src/core/fsd/atcdataupdate.cpp index 3444f04c2..139ccc62e 100644 --- a/src/blackcore/fsd/atcdataupdate.cpp +++ b/src/core/fsd/atcdataupdate.cpp @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/atcdataupdate.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/atcdataupdate.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" using namespace swift::misc; using namespace swift::misc::network; -namespace BlackCore::Fsd +namespace swift::core::fsd { AtcDataUpdate::AtcDataUpdate() : MessageBase() {} diff --git a/src/blackcore/fsd/atcdataupdate.h b/src/core/fsd/atcdataupdate.h similarity index 89% rename from src/blackcore/fsd/atcdataupdate.h rename to src/core/fsd/atcdataupdate.h index 304f5082e..b32d9def5 100644 --- a/src/blackcore/fsd/atcdataupdate.h +++ b/src/core/fsd/atcdataupdate.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_FSD_ATCPOSITION_H -#define BLACKCORE_FSD_ATCPOSITION_H +#ifndef SWIFT_CORE_FSD_ATCPOSITION_H +#define SWIFT_CORE_FSD_ATCPOSITION_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" #include "misc/network/facilitytype.h" #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message: ATC data update - class BLACKCORE_EXPORT AtcDataUpdate : public MessageBase + class SWIFT_CORE_EXPORT AtcDataUpdate : public MessageBase { friend bool operator==(const AtcDataUpdate &, const AtcDataUpdate &); diff --git a/src/blackcore/fsd/authchallenge.cpp b/src/core/fsd/authchallenge.cpp similarity index 94% rename from src/blackcore/fsd/authchallenge.cpp rename to src/core/fsd/authchallenge.cpp index 6883742de..78297f8cf 100644 --- a/src/blackcore/fsd/authchallenge.cpp +++ b/src/core/fsd/authchallenge.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/authchallenge.h" +#include "core/fsd/authchallenge.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { AuthChallenge::AuthChallenge() : MessageBase() {} diff --git a/src/blackcore/fsd/authchallenge.h b/src/core/fsd/authchallenge.h similarity index 85% rename from src/blackcore/fsd/authchallenge.h rename to src/core/fsd/authchallenge.h index 578427f17..70b60cf0c 100644 --- a/src/blackcore/fsd/authchallenge.h +++ b/src/core/fsd/authchallenge.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_AUTHCHALLENGE_H -#define BLACKCORE_FSD_AUTHCHALLENGE_H +#ifndef SWIFT_CORE_FSD_AUTHCHALLENGE_H +#define SWIFT_CORE_FSD_AUTHCHALLENGE_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message: auth challenge - class BLACKCORE_EXPORT AuthChallenge : public MessageBase + class SWIFT_CORE_EXPORT AuthChallenge : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/authresponse.cpp b/src/core/fsd/authresponse.cpp similarity index 94% rename from src/blackcore/fsd/authresponse.cpp rename to src/core/fsd/authresponse.cpp index 13b4db921..17d877188 100644 --- a/src/blackcore/fsd/authresponse.cpp +++ b/src/core/fsd/authresponse.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/authresponse.h" +#include "core/fsd/authresponse.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { AuthResponse::AuthResponse() : MessageBase() {} diff --git a/src/blackcore/fsd/authresponse.h b/src/core/fsd/authresponse.h similarity index 86% rename from src/blackcore/fsd/authresponse.h rename to src/core/fsd/authresponse.h index 687c22de9..78b42b50c 100644 --- a/src/blackcore/fsd/authresponse.h +++ b/src/core/fsd/authresponse.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_AUTHRESPONSE_H -#define BLACKCORE_FSD_AUTHRESPONSE_H +#ifndef SWIFT_CORE_FSD_AUTHRESPONSE_H +#define SWIFT_CORE_FSD_AUTHRESPONSE_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Responds to an authentication challenge. //! The protocol for formulating and responding to auth challenges restricted. - class BLACKCORE_EXPORT AuthResponse : public MessageBase + class SWIFT_CORE_EXPORT AuthResponse : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/clientidentification.cpp b/src/core/fsd/clientidentification.cpp similarity index 96% rename from src/blackcore/fsd/clientidentification.cpp rename to src/core/fsd/clientidentification.cpp index 764fce514..a8691abc1 100644 --- a/src/blackcore/fsd/clientidentification.cpp +++ b/src/core/fsd/clientidentification.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/clientidentification.h" +#include "core/fsd/clientidentification.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { ClientIdentification::ClientIdentification() : MessageBase() {} diff --git a/src/blackcore/fsd/clientidentification.h b/src/core/fsd/clientidentification.h similarity index 91% rename from src/blackcore/fsd/clientidentification.h rename to src/core/fsd/clientidentification.h index 7bbcbb4c2..6ef7b46ef 100644 --- a/src/blackcore/fsd/clientidentification.h +++ b/src/core/fsd/clientidentification.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKCORE_FSD_CLIENTIDENTIFICATION_H -#define BLACKCORE_FSD_CLIENTIDENTIFICATION_H +#ifndef SWIFT_CORE_FSD_CLIENTIDENTIFICATION_H +#define SWIFT_CORE_FSD_CLIENTIDENTIFICATION_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" #include "config/buildconfig.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is sent by any client that supports the VATSIM client authentication protocol, //! in response to a $DI query from the server. //! Further information to the client authentication protocol is kept restricted. - class BLACKCORE_EXPORT ClientIdentification : public MessageBase + class SWIFT_CORE_EXPORT ClientIdentification : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/clientquery.cpp b/src/core/fsd/clientquery.cpp similarity index 92% rename from src/blackcore/fsd/clientquery.cpp rename to src/core/fsd/clientquery.cpp index 512217dc5..ffbfe1225 100644 --- a/src/blackcore/fsd/clientquery.cpp +++ b/src/core/fsd/clientquery.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/clientquery.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/clientquery.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { ClientQuery::ClientQuery() : MessageBase() {} diff --git a/src/blackcore/fsd/clientquery.h b/src/core/fsd/clientquery.h similarity index 88% rename from src/blackcore/fsd/clientquery.h rename to src/core/fsd/clientquery.h index b72704f2f..de7421c8c 100644 --- a/src/blackcore/fsd/clientquery.h +++ b/src/core/fsd/clientquery.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_FSD_CLIENTQUERY_H -#define BLACKCORE_FSD_CLIENTQUERY_H +#ifndef SWIFT_CORE_FSD_CLIENTQUERY_H +#define SWIFT_CORE_FSD_CLIENTQUERY_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is used to query a client’s data. //! @@ -17,7 +17,7 @@ namespace BlackCore::Fsd //! All requests are sent directly to the client to be queried, currently, except the flight-plan request which is sent to //! the server. Therefore, the only client which will return an error is SERVER. //! Other clients will simply not reply if the code is unrecognised or request invalid. - class BLACKCORE_EXPORT ClientQuery : public MessageBase + class SWIFT_CORE_EXPORT ClientQuery : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/clientresponse.cpp b/src/core/fsd/clientresponse.cpp similarity index 92% rename from src/blackcore/fsd/clientresponse.cpp rename to src/core/fsd/clientresponse.cpp index 9ec1863bc..6d4bd7d91 100644 --- a/src/blackcore/fsd/clientresponse.cpp +++ b/src/core/fsd/clientresponse.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/clientresponse.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/clientresponse.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { ClientResponse::ClientResponse() {} diff --git a/src/blackcore/fsd/clientresponse.h b/src/core/fsd/clientresponse.h similarity index 86% rename from src/blackcore/fsd/clientresponse.h rename to src/core/fsd/clientresponse.h index efdaf30c1..048444c5b 100644 --- a/src/blackcore/fsd/clientresponse.h +++ b/src/core/fsd/clientresponse.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_ClientResponse_H -#define BLACKCORE_FSD_ClientResponse_H +#ifndef SWIFT_CORE_FSD_ClientResponse_H +#define SWIFT_CORE_FSD_ClientResponse_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is used to respond to a client data request. - class BLACKCORE_EXPORT ClientResponse : public MessageBase + class SWIFT_CORE_EXPORT ClientResponse : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/deleteatc.cpp b/src/core/fsd/deleteatc.cpp similarity index 93% rename from src/blackcore/fsd/deleteatc.cpp rename to src/core/fsd/deleteatc.cpp index 224713c77..76c702b0f 100644 --- a/src/blackcore/fsd/deleteatc.cpp +++ b/src/core/fsd/deleteatc.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/deleteatc.h" +#include "core/fsd/deleteatc.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { DeleteAtc::DeleteAtc() : MessageBase() {} diff --git a/src/blackcore/fsd/deleteatc.h b/src/core/fsd/deleteatc.h similarity index 84% rename from src/blackcore/fsd/deleteatc.h rename to src/core/fsd/deleteatc.h index 0d8464071..535120302 100644 --- a/src/blackcore/fsd/deleteatc.h +++ b/src/core/fsd/deleteatc.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_DELETEATC_H -#define BLACKCORE_FSD_DELETEATC_H +#ifndef SWIFT_CORE_FSD_DELETEATC_H +#define SWIFT_CORE_FSD_DELETEATC_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message Delete ATC - class BLACKCORE_EXPORT DeleteAtc : public MessageBase + class SWIFT_CORE_EXPORT DeleteAtc : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/deletepilot.cpp b/src/core/fsd/deletepilot.cpp similarity index 94% rename from src/blackcore/fsd/deletepilot.cpp rename to src/core/fsd/deletepilot.cpp index 7ae3d4583..585ea1d92 100644 --- a/src/blackcore/fsd/deletepilot.cpp +++ b/src/core/fsd/deletepilot.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/deletepilot.h" +#include "core/fsd/deletepilot.h" #include "misc/logmessage.h" using namespace swift::misc; -namespace BlackCore::Fsd +namespace swift::core::fsd { DeletePilot::DeletePilot() : MessageBase() {} diff --git a/src/blackcore/fsd/deletepilot.h b/src/core/fsd/deletepilot.h similarity index 86% rename from src/blackcore/fsd/deletepilot.h rename to src/core/fsd/deletepilot.h index 37ef3dd9e..b5579ce51 100644 --- a/src/blackcore/fsd/deletepilot.h +++ b/src/core/fsd/deletepilot.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_DELETEPILOT_H -#define BLACKCORE_FSD_DELETEPILOT_H +#ifndef SWIFT_CORE_FSD_DELETEPILOT_H +#define SWIFT_CORE_FSD_DELETEPILOT_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Used to notify the server of the intention to close the connection. //! If a client receives this packet it should remove the client from its internal database. - class BLACKCORE_EXPORT DeletePilot : public MessageBase + class SWIFT_CORE_EXPORT DeletePilot : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/enums.h b/src/core/fsd/enums.h similarity index 93% rename from src/blackcore/fsd/enums.h rename to src/core/fsd/enums.h index 0314cd8cd..1b0d82e39 100644 --- a/src/blackcore/fsd/enums.h +++ b/src/core/fsd/enums.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_FSD_ENUMS_H -#define BLACKCORE_FSD_ENUMS_H +#ifndef SWIFT_CORE_FSD_ENUMS_H +#define SWIFT_CORE_FSD_ENUMS_H #include -namespace BlackCore::Fsd +namespace swift::core::fsd { /*! ATC ratings */ enum class AtcRating @@ -204,13 +204,13 @@ namespace BlackCore::Fsd }; } -Q_DECLARE_METATYPE(BlackCore::Fsd::AtcRating) -Q_DECLARE_METATYPE(BlackCore::Fsd::PilotRating) -Q_DECLARE_METATYPE(BlackCore::Fsd::SimType) -Q_DECLARE_METATYPE(BlackCore::Fsd::ClientQueryType) -Q_DECLARE_METATYPE(BlackCore::Fsd::FlightType) -Q_DECLARE_METATYPE(BlackCore::Fsd::ServerErrorCode) -Q_DECLARE_METATYPE(BlackCore::Fsd::ServerType) -Q_DECLARE_METATYPE(BlackCore::Fsd::Capabilities) +Q_DECLARE_METATYPE(swift::core::fsd::AtcRating) +Q_DECLARE_METATYPE(swift::core::fsd::PilotRating) +Q_DECLARE_METATYPE(swift::core::fsd::SimType) +Q_DECLARE_METATYPE(swift::core::fsd::ClientQueryType) +Q_DECLARE_METATYPE(swift::core::fsd::FlightType) +Q_DECLARE_METATYPE(swift::core::fsd::ServerErrorCode) +Q_DECLARE_METATYPE(swift::core::fsd::ServerType) +Q_DECLARE_METATYPE(swift::core::fsd::Capabilities) #endif // guard diff --git a/src/blackcore/fsd/euroscopesimdata.cpp b/src/core/fsd/euroscopesimdata.cpp similarity index 98% rename from src/blackcore/fsd/euroscopesimdata.cpp rename to src/core/fsd/euroscopesimdata.cpp index 66485b21b..8f6d8196d 100644 --- a/src/blackcore/fsd/euroscopesimdata.cpp +++ b/src/core/fsd/euroscopesimdata.cpp @@ -3,13 +3,13 @@ //! \file -#include "blackcore/fsd/euroscopesimdata.h" +#include "core/fsd/euroscopesimdata.h" #include "misc/logmessage.h" using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { EuroscopeSimData::EuroscopeSimData() = default; diff --git a/src/blackcore/fsd/euroscopesimdata.h b/src/core/fsd/euroscopesimdata.h similarity index 91% rename from src/blackcore/fsd/euroscopesimdata.h rename to src/core/fsd/euroscopesimdata.h index 2c94485a0..9e30573d1 100644 --- a/src/blackcore/fsd/euroscopesimdata.h +++ b/src/core/fsd/euroscopesimdata.h @@ -3,17 +3,17 @@ //! \file -#ifndef BLACKCORE_FSD_EUROSCOPESIMDATA_H -#define BLACKCORE_FSD_EUROSCOPESIMDATA_H +#ifndef SWIFT_CORE_FSD_EUROSCOPESIMDATA_H +#define SWIFT_CORE_FSD_EUROSCOPESIMDATA_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" #include "misc/aviation/aircraftlights.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Pilot data update broadcast by Euroscope Simulator every second. - class BLACKCORE_EXPORT EuroscopeSimData : public MessageBase + class SWIFT_CORE_EXPORT EuroscopeSimData : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/flightplan.cpp b/src/core/fsd/flightplan.cpp similarity index 96% rename from src/blackcore/fsd/flightplan.cpp rename to src/core/fsd/flightplan.cpp index 1d1ff6dc4..b8910f0ed 100644 --- a/src/blackcore/fsd/flightplan.cpp +++ b/src/core/fsd/flightplan.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/flightplan.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/flightplan.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { FlightPlan::FlightPlan() {} diff --git a/src/blackcore/fsd/flightplan.h b/src/core/fsd/flightplan.h similarity index 92% rename from src/blackcore/fsd/flightplan.h rename to src/core/fsd/flightplan.h index bb3085b99..1a927220e 100644 --- a/src/blackcore/fsd/flightplan.h +++ b/src/core/fsd/flightplan.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_FLIGHTPLAN_H -#define BLACKCORE_FSD_FLIGHTPLAN_H +#ifndef SWIFT_CORE_FSD_FLIGHTPLAN_H +#define SWIFT_CORE_FSD_FLIGHTPLAN_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message: flightplan - class BLACKCORE_EXPORT FlightPlan : public MessageBase + class SWIFT_CORE_EXPORT FlightPlan : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/fsdclient.cpp b/src/core/fsd/fsdclient.cpp similarity index 98% rename from src/blackcore/fsd/fsdclient.cpp rename to src/core/fsd/fsdclient.cpp index 10ae59a69..e828d5c40 100644 --- a/src/blackcore/fsd/fsdclient.cpp +++ b/src/core/fsd/fsdclient.cpp @@ -1,41 +1,41 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/fsdclient.h" +#include "core/fsd/fsdclient.h" -#include "blackcore/application.h" -#include "blackcore/fsd/addatc.h" -#include "blackcore/fsd/addpilot.h" -#include "blackcore/fsd/atcdataupdate.h" -#include "blackcore/fsd/authchallenge.h" -#include "blackcore/fsd/authresponse.h" -#include "blackcore/fsd/clientidentification.h" -#include "blackcore/fsd/deleteatc.h" -#include "blackcore/fsd/deletepilot.h" -#include "blackcore/fsd/euroscopesimdata.h" -#include "blackcore/fsd/pilotdataupdate.h" -#include "blackcore/fsd/ping.h" -#include "blackcore/fsd/pong.h" -#include "blackcore/fsd/killrequest.h" -#include "blackcore/fsd/textmessage.h" -#include "blackcore/fsd/clientquery.h" -#include "blackcore/fsd/clientresponse.h" -#include "blackcore/fsd/flightplan.h" -#include "blackcore/fsd/fsdidentification.h" -#include "blackcore/fsd/serializer.h" -#include "blackcore/fsd/servererror.h" -#include "blackcore/fsd/interimpilotdataupdate.h" -#include "blackcore/fsd/visualpilotdataupdate.h" -#include "blackcore/fsd/visualpilotdataperiodic.h" -#include "blackcore/fsd/visualpilotdatastopped.h" -#include "blackcore/fsd/visualpilotdatatoggle.h" -#include "blackcore/fsd/planeinforequest.h" -#include "blackcore/fsd/planeinformation.h" -#include "blackcore/fsd/planeinforequestfsinn.h" -#include "blackcore/fsd/planeinformationfsinn.h" -#include "blackcore/fsd/revbclientparts.h" -#include "blackcore/fsd/rehost.h" -#include "blackcore/fsd/mute.h" +#include "core/application.h" +#include "core/fsd/addatc.h" +#include "core/fsd/addpilot.h" +#include "core/fsd/atcdataupdate.h" +#include "core/fsd/authchallenge.h" +#include "core/fsd/authresponse.h" +#include "core/fsd/clientidentification.h" +#include "core/fsd/deleteatc.h" +#include "core/fsd/deletepilot.h" +#include "core/fsd/euroscopesimdata.h" +#include "core/fsd/pilotdataupdate.h" +#include "core/fsd/ping.h" +#include "core/fsd/pong.h" +#include "core/fsd/killrequest.h" +#include "core/fsd/textmessage.h" +#include "core/fsd/clientquery.h" +#include "core/fsd/clientresponse.h" +#include "core/fsd/flightplan.h" +#include "core/fsd/fsdidentification.h" +#include "core/fsd/serializer.h" +#include "core/fsd/servererror.h" +#include "core/fsd/interimpilotdataupdate.h" +#include "core/fsd/visualpilotdataupdate.h" +#include "core/fsd/visualpilotdataperiodic.h" +#include "core/fsd/visualpilotdatastopped.h" +#include "core/fsd/visualpilotdatatoggle.h" +#include "core/fsd/planeinforequest.h" +#include "core/fsd/planeinformation.h" +#include "core/fsd/planeinforequestfsinn.h" +#include "core/fsd/planeinformationfsinn.h" +#include "core/fsd/revbclientparts.h" +#include "core/fsd/rehost.h" +#include "core/fsd/mute.h" #include "misc/aviation/flightplan.h" #include "misc/network/rawfsdmessage.h" @@ -53,7 +53,7 @@ #include using namespace swift::config; -using namespace BlackCore::Vatsim; +using namespace swift::core::vatsim; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::geo; @@ -62,7 +62,7 @@ using namespace swift::misc::network; using namespace swift::misc::physical_quantities; using namespace swift::misc::simulation; -namespace BlackCore::Fsd +namespace swift::core::fsd { QString convertToUnicodeEscaped(const QString &str) { @@ -1039,7 +1039,7 @@ namespace BlackCore::Fsd else { const QString error = json.value("error_msg").isString() ? json.value("error_msg").toString() : nwReply->errorString(); - CLogMessage(this).error(u"Vatsim auth token endpoint: %1") << error; + CLogMessage(this).error(u"VATSIM auth token endpoint: %1") << error; disconnectFromServer(); } nwReply->deleteLater(); diff --git a/src/blackcore/fsd/fsdclient.h b/src/core/fsd/fsdclient.h similarity index 98% rename from src/blackcore/fsd/fsdclient.h rename to src/core/fsd/fsdclient.h index aba46900d..d10ee2349 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/core/fsd/fsdclient.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_FSD_CLIENT_H -#define BLACKCORE_FSD_CLIENT_H +#ifndef SWIFT_CORE_FSD_CLIENT_H +#define SWIFT_CORE_FSD_CLIENT_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/fsd/enums.h" -#include "blackcore/fsd/messagebase.h" +#include "core/swiftcoreexport.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/fsd/enums.h" +#include "core/fsd/messagebase.h" #include "misc/simulation/ownaircraftprovider.h" #include "misc/simulation/remoteaircraftprovider.h" @@ -61,7 +61,7 @@ namespace BlackFsdTest { class CTestFSDClient; } -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Message groups enum class TextMessageGroups @@ -75,7 +75,7 @@ namespace BlackCore::Fsd //! FSD client //! Todo: Send (interim) data updates automatically //! Todo Check ':' in FSD messages. Disconnect if there is a wrong one - class BLACKCORE_EXPORT CFSDClient : + class SWIFT_CORE_EXPORT CFSDClient : public swift::misc::CContinuousWorker, public swift::misc::network::IEcosystemProvider, // provide info about used ecosystem public swift::misc::network::CClientAware, // network can set client information @@ -594,7 +594,7 @@ namespace BlackCore::Fsd swift::misc::aviation::CAtcStationList m_atcStations; - swift::misc::CSettingReadOnly m_fsdMessageSetting { this, &CFSDClient::fsdMessageSettingsChanged }; + swift::misc::CSettingReadOnly m_fsdMessageSetting { this, &CFSDClient::fsdMessageSettingsChanged }; QFile m_rawFsdMessageLogFile; std::atomic_bool m_rawFsdMessagesEnabled { false }; std::atomic_bool m_filterPasswordFromLogin { false }; diff --git a/src/blackcore/fsd/fsdidentification.cpp b/src/core/fsd/fsdidentification.cpp similarity index 94% rename from src/blackcore/fsd/fsdidentification.cpp rename to src/core/fsd/fsdidentification.cpp index ba171f666..86e523399 100644 --- a/src/blackcore/fsd/fsdidentification.cpp +++ b/src/core/fsd/fsdidentification.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/fsdidentification.h" +#include "core/fsd/fsdidentification.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { FSDIdentification::FSDIdentification() : MessageBase() {} diff --git a/src/blackcore/fsd/fsdidentification.h b/src/core/fsd/fsdidentification.h similarity index 80% rename from src/blackcore/fsd/fsdidentification.h rename to src/core/fsd/fsdidentification.h index 8b6b0b057..7eada2d18 100644 --- a/src/blackcore/fsd/fsdidentification.h +++ b/src/core/fsd/fsdidentification.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_FSDIDENTIFICATION_H -#define BLACKCORE_FSD_FSDIDENTIFICATION_H +#ifndef SWIFT_CORE_FSD_FSDIDENTIFICATION_H +#define SWIFT_CORE_FSD_FSDIDENTIFICATION_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is sent by the server immediately after a new client connection is made. - class BLACKCORE_EXPORT FSDIdentification : public MessageBase + class SWIFT_CORE_EXPORT FSDIdentification : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/interimpilotdataupdate.cpp b/src/core/fsd/interimpilotdataupdate.cpp similarity index 95% rename from src/blackcore/fsd/interimpilotdataupdate.cpp rename to src/core/fsd/interimpilotdataupdate.cpp index e850624d4..42486a23a 100644 --- a/src/blackcore/fsd/interimpilotdataupdate.cpp +++ b/src/core/fsd/interimpilotdataupdate.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/interimpilotdataupdate.h" -#include "blackcore/fsd/pbh.h" +#include "core/fsd/interimpilotdataupdate.h" +#include "core/fsd/pbh.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { InterimPilotDataUpdate::InterimPilotDataUpdate() : MessageBase() {} diff --git a/src/blackcore/fsd/interimpilotdataupdate.h b/src/core/fsd/interimpilotdataupdate.h similarity index 89% rename from src/blackcore/fsd/interimpilotdataupdate.h rename to src/core/fsd/interimpilotdataupdate.h index b9af3e922..8ca745c26 100644 --- a/src/blackcore/fsd/interimpilotdataupdate.h +++ b/src/core/fsd/interimpilotdataupdate.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_INTERIMPILOTDATAUPDATE_H -#define BLACKCORE_FSD_INTERIMPILOTDATAUPDATE_H +#ifndef SWIFT_CORE_FSD_INTERIMPILOTDATAUPDATE_H +#define SWIFT_CORE_FSD_INTERIMPILOTDATAUPDATE_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Interim pilot data update sent to specific receivers faster than //! the standard broadcast update. - class BLACKCORE_EXPORT InterimPilotDataUpdate : public MessageBase + class SWIFT_CORE_EXPORT InterimPilotDataUpdate : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/killrequest.cpp b/src/core/fsd/killrequest.cpp similarity index 94% rename from src/blackcore/fsd/killrequest.cpp rename to src/core/fsd/killrequest.cpp index 59bf8db07..498961ceb 100644 --- a/src/blackcore/fsd/killrequest.cpp +++ b/src/core/fsd/killrequest.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/killrequest.h" +#include "core/fsd/killrequest.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { KillRequest::KillRequest() : MessageBase() {} diff --git a/src/blackcore/fsd/killrequest.h b/src/core/fsd/killrequest.h similarity index 86% rename from src/blackcore/fsd/killrequest.h rename to src/core/fsd/killrequest.h index cc93c89ce..b7f6d57ed 100644 --- a/src/blackcore/fsd/killrequest.h +++ b/src/core/fsd/killrequest.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_KILLREQUEST_H -#define BLACKCORE_FSD_KILLREQUEST_H +#ifndef SWIFT_CORE_FSD_KILLREQUEST_H +#define SWIFT_CORE_FSD_KILLREQUEST_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Kill request initiated from the server or supervisor. //! Client needs to disconnect immediatly upon receiving it. - class BLACKCORE_EXPORT KillRequest : public MessageBase + class SWIFT_CORE_EXPORT KillRequest : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/messagebase.cpp b/src/core/fsd/messagebase.cpp similarity index 86% rename from src/blackcore/fsd/messagebase.cpp rename to src/core/fsd/messagebase.cpp index bcc39869b..b66907279 100644 --- a/src/blackcore/fsd/messagebase.cpp +++ b/src/core/fsd/messagebase.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { MessageBase::MessageBase(const QString &sender) : m_sender(sender) diff --git a/src/blackcore/fsd/messagebase.h b/src/core/fsd/messagebase.h similarity index 92% rename from src/blackcore/fsd/messagebase.h rename to src/core/fsd/messagebase.h index 08b161728..627830872 100644 --- a/src/blackcore/fsd/messagebase.h +++ b/src/core/fsd/messagebase.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_FSD_MESSAGEBASE_H -#define BLACKCORE_FSD_MESSAGEBASE_H +#ifndef SWIFT_CORE_FSD_MESSAGEBASE_H +#define SWIFT_CORE_FSD_MESSAGEBASE_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include #include @@ -51,10 +51,10 @@ enum class MessageType Mute, }; -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD message base class - class BLACKCORE_EXPORT MessageBase + class SWIFT_CORE_EXPORT MessageBase { public: //! Default Constructor diff --git a/src/blackcore/fsd/mute.cpp b/src/core/fsd/mute.cpp similarity index 94% rename from src/blackcore/fsd/mute.cpp rename to src/core/fsd/mute.cpp index 0ea1176ef..e46a18a23 100644 --- a/src/blackcore/fsd/mute.cpp +++ b/src/core/fsd/mute.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/mute.h" +#include "core/fsd/mute.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { Mute::Mute(const QString &sender, const QString &receiver, bool mute) : MessageBase(sender, receiver), diff --git a/src/blackcore/fsd/mute.h b/src/core/fsd/mute.h similarity index 86% rename from src/blackcore/fsd/mute.h rename to src/core/fsd/mute.h index 463f93fe3..de9c52e00 100644 --- a/src/blackcore/fsd/mute.h +++ b/src/core/fsd/mute.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_MUTE_H -#define BLACKCORE_FSD_MUTE_H +#ifndef SWIFT_CORE_FSD_MUTE_H +#define SWIFT_CORE_FSD_MUTE_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Mute the user for AFV - class BLACKCORE_EXPORT Mute : public MessageBase + class SWIFT_CORE_EXPORT Mute : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/pbh.h b/src/core/fsd/pbh.h similarity index 97% rename from src/blackcore/fsd/pbh.h rename to src/core/fsd/pbh.h index 22a4f775f..6e73a592f 100644 --- a/src/blackcore/fsd/pbh.h +++ b/src/core/fsd/pbh.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_FSD_PBH_H -#define BLACKCORE_FSD_PBH_H +#ifndef SWIFT_CORE_FSD_PBH_H +#define SWIFT_CORE_FSD_PBH_H #include #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Pitch bank heading union union PBH diff --git a/src/blackcore/fsd/pilotdataupdate.cpp b/src/core/fsd/pilotdataupdate.cpp similarity index 95% rename from src/blackcore/fsd/pilotdataupdate.cpp rename to src/core/fsd/pilotdataupdate.cpp index 012c1a0b7..98232a752 100644 --- a/src/blackcore/fsd/pilotdataupdate.cpp +++ b/src/core/fsd/pilotdataupdate.cpp @@ -1,16 +1,16 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/pilotdataupdate.h" -#include "blackcore/fsd/pbh.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/pilotdataupdate.h" +#include "core/fsd/pbh.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { PilotDataUpdate::PilotDataUpdate() : MessageBase() {} diff --git a/src/blackcore/fsd/pilotdataupdate.h b/src/core/fsd/pilotdataupdate.h similarity index 91% rename from src/blackcore/fsd/pilotdataupdate.h rename to src/core/fsd/pilotdataupdate.h index 1fc554ce7..4c6f4e7c2 100644 --- a/src/blackcore/fsd/pilotdataupdate.h +++ b/src/core/fsd/pilotdataupdate.h @@ -3,17 +3,17 @@ //! \file -#ifndef BLACKCORE_FSD_PILOTDATAUPDATE_H -#define BLACKCORE_FSD_PILOTDATAUPDATE_H +#ifndef SWIFT_CORE_FSD_PILOTDATAUPDATE_H +#define SWIFT_CORE_FSD_PILOTDATAUPDATE_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" #include "misc/aviation/transponder.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Pilot data update broadcasted to all clients in range every 5 seconds. - class BLACKCORE_EXPORT PilotDataUpdate : public MessageBase + class SWIFT_CORE_EXPORT PilotDataUpdate : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/ping.cpp b/src/core/fsd/ping.cpp similarity index 94% rename from src/blackcore/fsd/ping.cpp rename to src/core/fsd/ping.cpp index b514f2c37..009857c60 100644 --- a/src/blackcore/fsd/ping.cpp +++ b/src/core/fsd/ping.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/ping.h" +#include "core/fsd/ping.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { Ping::Ping() : MessageBase() {} diff --git a/src/blackcore/fsd/ping.h b/src/core/fsd/ping.h similarity index 86% rename from src/blackcore/fsd/ping.h rename to src/core/fsd/ping.h index 3f0ba6b56..9ea46e07b 100644 --- a/src/blackcore/fsd/ping.h +++ b/src/core/fsd/ping.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_PING_H -#define BLACKCORE_FSD_PING_H +#ifndef SWIFT_CORE_FSD_PING_H +#define SWIFT_CORE_FSD_PING_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Ping. Needs to be answered with a pong. - class BLACKCORE_EXPORT Ping : public MessageBase + class SWIFT_CORE_EXPORT Ping : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/planeinforequest.cpp b/src/core/fsd/planeinforequest.cpp similarity index 93% rename from src/blackcore/fsd/planeinforequest.cpp rename to src/core/fsd/planeinforequest.cpp index ee1fc862d..47be57dea 100644 --- a/src/blackcore/fsd/planeinforequest.cpp +++ b/src/core/fsd/planeinforequest.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/planeinforequest.h" +#include "core/fsd/planeinforequest.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { PlaneInfoRequest::PlaneInfoRequest() : MessageBase() {} diff --git a/src/blackcore/fsd/planeinforequest.h b/src/core/fsd/planeinforequest.h similarity index 84% rename from src/blackcore/fsd/planeinforequest.h rename to src/core/fsd/planeinforequest.h index 3d70d8e75..679a90ed0 100644 --- a/src/blackcore/fsd/planeinforequest.h +++ b/src/core/fsd/planeinforequest.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_PLANEINFOREQUEST_H -#define BLACKCORE_FSD_PLANEINFOREQUEST_H +#ifndef SWIFT_CORE_FSD_PLANEINFOREQUEST_H +#define SWIFT_CORE_FSD_PLANEINFOREQUEST_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Request to send plane information. //! Shall be answered by a PlaneInformation message. - class BLACKCORE_EXPORT PlaneInfoRequest : public MessageBase + class SWIFT_CORE_EXPORT PlaneInfoRequest : public MessageBase { public: //! Ctor diff --git a/src/blackcore/fsd/planeinforequestfsinn.cpp b/src/core/fsd/planeinforequestfsinn.cpp similarity index 96% rename from src/blackcore/fsd/planeinforequestfsinn.cpp rename to src/core/fsd/planeinforequestfsinn.cpp index f63c02215..725d16220 100644 --- a/src/blackcore/fsd/planeinforequestfsinn.cpp +++ b/src/core/fsd/planeinforequestfsinn.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/planeinforequestfsinn.h" +#include "core/fsd/planeinforequestfsinn.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { PlaneInfoRequestFsinn::PlaneInfoRequestFsinn() : MessageBase() {} diff --git a/src/blackcore/fsd/planeinforequestfsinn.h b/src/core/fsd/planeinforequestfsinn.h similarity index 89% rename from src/blackcore/fsd/planeinforequestfsinn.h rename to src/core/fsd/planeinforequestfsinn.h index 6019038c5..43e0c9c31 100644 --- a/src/blackcore/fsd/planeinforequestfsinn.h +++ b/src/core/fsd/planeinforequestfsinn.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_PLANEINFOREQUESTFSINN_H -#define BLACKCORE_FSD_PLANEINFOREQUESTFSINN_H +#ifndef SWIFT_CORE_FSD_PLANEINFOREQUESTFSINN_H +#define SWIFT_CORE_FSD_PLANEINFOREQUESTFSINN_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSinn specific version of plane information request - class BLACKCORE_EXPORT PlaneInfoRequestFsinn : public MessageBase + class SWIFT_CORE_EXPORT PlaneInfoRequestFsinn : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/planeinformation.cpp b/src/core/fsd/planeinformation.cpp similarity index 96% rename from src/blackcore/fsd/planeinformation.cpp rename to src/core/fsd/planeinformation.cpp index ce280b882..c171d8106 100644 --- a/src/blackcore/fsd/planeinformation.cpp +++ b/src/core/fsd/planeinformation.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/planeinformation.h" +#include "core/fsd/planeinformation.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { PlaneInformation::PlaneInformation() : MessageBase() {} diff --git a/src/blackcore/fsd/planeinformation.h b/src/core/fsd/planeinformation.h similarity index 87% rename from src/blackcore/fsd/planeinformation.h rename to src/core/fsd/planeinformation.h index 76892b12e..fb1b9813d 100644 --- a/src/blackcore/fsd/planeinformation.h +++ b/src/core/fsd/planeinformation.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_PLANEINFORMATION_H -#define BLACKCORE_FSD_PLANEINFORMATION_H +#ifndef SWIFT_CORE_FSD_PLANEINFORMATION_H +#define SWIFT_CORE_FSD_PLANEINFORMATION_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is sent in reply to a PIR request to inform the client which multiplayer model to use. //! The airline and livery fields are optional. - class BLACKCORE_EXPORT PlaneInformation : public MessageBase + class SWIFT_CORE_EXPORT PlaneInformation : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/planeinformationfsinn.cpp b/src/core/fsd/planeinformationfsinn.cpp similarity index 96% rename from src/blackcore/fsd/planeinformationfsinn.cpp rename to src/core/fsd/planeinformationfsinn.cpp index d9a20199d..6e9bba667 100644 --- a/src/blackcore/fsd/planeinformationfsinn.cpp +++ b/src/core/fsd/planeinformationfsinn.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/planeinformationfsinn.h" +#include "core/fsd/planeinformationfsinn.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { PlaneInformationFsinn::PlaneInformationFsinn() : MessageBase() {} diff --git a/src/blackcore/fsd/planeinformationfsinn.h b/src/core/fsd/planeinformationfsinn.h similarity index 89% rename from src/blackcore/fsd/planeinformationfsinn.h rename to src/core/fsd/planeinformationfsinn.h index f65d49f9e..8596fdf76 100644 --- a/src/blackcore/fsd/planeinformationfsinn.h +++ b/src/core/fsd/planeinformationfsinn.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_PLANEINFORMATIONFSINN_H -#define BLACKCORE_FSD_PLANEINFORMATIONFSINN_H +#ifndef SWIFT_CORE_FSD_PLANEINFORMATIONFSINN_H +#define SWIFT_CORE_FSD_PLANEINFORMATIONFSINN_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is sent in reply to a FSinn request (FSIPIR) - class BLACKCORE_EXPORT PlaneInformationFsinn : public MessageBase + class SWIFT_CORE_EXPORT PlaneInformationFsinn : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/pong.cpp b/src/core/fsd/pong.cpp similarity index 94% rename from src/blackcore/fsd/pong.cpp rename to src/core/fsd/pong.cpp index 3a1899741..23d0012c9 100644 --- a/src/blackcore/fsd/pong.cpp +++ b/src/core/fsd/pong.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/pong.h" +#include "core/fsd/pong.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { Pong::Pong() : MessageBase() {} diff --git a/src/blackcore/fsd/pong.h b/src/core/fsd/pong.h similarity index 86% rename from src/blackcore/fsd/pong.h rename to src/core/fsd/pong.h index 1df919dc7..7038ef47e 100644 --- a/src/blackcore/fsd/pong.h +++ b/src/core/fsd/pong.h @@ -3,15 +3,15 @@ //! \file -#ifndef BLACKCORE_FSD_PONG_H -#define BLACKCORE_FSD_PONG_H +#ifndef SWIFT_CORE_FSD_PONG_H +#define SWIFT_CORE_FSD_PONG_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Sent or received as reply to a ping. - class BLACKCORE_EXPORT Pong : public MessageBase + class SWIFT_CORE_EXPORT Pong : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/rehost.cpp b/src/core/fsd/rehost.cpp similarity index 97% rename from src/blackcore/fsd/rehost.cpp rename to src/core/fsd/rehost.cpp index 06c885610..cbc5fd547 100644 --- a/src/blackcore/fsd/rehost.cpp +++ b/src/core/fsd/rehost.cpp @@ -9,7 +9,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { Rehost::Rehost() : MessageBase() {} diff --git a/src/blackcore/fsd/rehost.h b/src/core/fsd/rehost.h similarity index 87% rename from src/blackcore/fsd/rehost.h rename to src/core/fsd/rehost.h index 583c9412d..c6525a169 100644 --- a/src/blackcore/fsd/rehost.h +++ b/src/core/fsd/rehost.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_REHOST_H -#define BLACKCORE_FSD_REHOST_H +#ifndef SWIFT_CORE_FSD_REHOST_H +#define SWIFT_CORE_FSD_REHOST_H #include "messagebase.h" #include "enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! The server requests us to connect to a different server. - class BLACKCORE_EXPORT Rehost : public MessageBase + class SWIFT_CORE_EXPORT Rehost : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/revbclientparts.cpp b/src/core/fsd/revbclientparts.cpp similarity index 91% rename from src/blackcore/fsd/revbclientparts.cpp rename to src/core/fsd/revbclientparts.cpp index 2a95a4e21..cee48442b 100644 --- a/src/blackcore/fsd/revbclientparts.cpp +++ b/src/core/fsd/revbclientparts.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2020 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/revbclientparts.h" -#include "blackcore/fsd/serializer.h" +#include "core/fsd/revbclientparts.h" +#include "core/fsd/serializer.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { RevBClientParts::RevBClientParts() {} diff --git a/src/blackcore/fsd/revbclientparts.h b/src/core/fsd/revbclientparts.h similarity index 86% rename from src/blackcore/fsd/revbclientparts.h rename to src/core/fsd/revbclientparts.h index 94a770a76..cb949d087 100644 --- a/src/blackcore/fsd/revbclientparts.h +++ b/src/core/fsd/revbclientparts.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKCORE_FSD_REVBCLIENTPARTS_H -#define BLACKCORE_FSD_REVBCLIENTPARTS_H +#ifndef SWIFT_CORE_FSD_REVBCLIENTPARTS_H +#define SWIFT_CORE_FSD_REVBCLIENTPARTS_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! This packet is used to translate client’s parts from RevB IVAO -MD. //! -MDMDN0104:262396:262396:262396 //! - class BLACKCORE_EXPORT RevBClientParts : public MessageBase + class SWIFT_CORE_EXPORT RevBClientParts : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/serializer.cpp b/src/core/fsd/serializer.cpp similarity index 99% rename from src/blackcore/fsd/serializer.cpp rename to src/core/fsd/serializer.cpp index 4c7aa2f0c..b143fb237 100644 --- a/src/blackcore/fsd/serializer.cpp +++ b/src/core/fsd/serializer.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/serializer.h" +#include "core/fsd/serializer.h" #include "misc/verify.h" #include "misc/logmessage.h" #include "misc/logcategories.h" @@ -12,7 +12,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; -namespace BlackCore::Fsd +namespace swift::core::fsd { //! \cond diff --git a/src/blackcore/fsd/serializer.h b/src/core/fsd/serializer.h similarity index 94% rename from src/blackcore/fsd/serializer.h rename to src/core/fsd/serializer.h index 74a2ea8cd..ee6128f47 100644 --- a/src/blackcore/fsd/serializer.h +++ b/src/core/fsd/serializer.h @@ -3,8 +3,8 @@ //! \file -#ifndef BLACKCORE_FSD_SERIALIZER_H -#define BLACKCORE_FSD_SERIALIZER_H +#ifndef SWIFT_CORE_FSD_SERIALIZER_H +#define SWIFT_CORE_FSD_SERIALIZER_H #include "enums.h" #include "misc/aviation/transponder.h" @@ -13,7 +13,7 @@ #include #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! \cond template diff --git a/src/blackcore/fsd/servererror.cpp b/src/core/fsd/servererror.cpp similarity index 96% rename from src/blackcore/fsd/servererror.cpp rename to src/core/fsd/servererror.cpp index 3e8858fdc..b5bcfdf50 100644 --- a/src/blackcore/fsd/servererror.cpp +++ b/src/core/fsd/servererror.cpp @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/servererror.h" +#include "core/fsd/servererror.h" #include #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { ServerError::ServerError() {} diff --git a/src/blackcore/fsd/servererror.h b/src/core/fsd/servererror.h similarity index 89% rename from src/blackcore/fsd/servererror.h rename to src/core/fsd/servererror.h index 8d3b10d09..24d4a11ae 100644 --- a/src/blackcore/fsd/servererror.h +++ b/src/core/fsd/servererror.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_SERVERERROR_H -#define BLACKCORE_FSD_SERVERERROR_H +#ifndef SWIFT_CORE_FSD_SERVERERROR_H +#define SWIFT_CORE_FSD_SERVERERROR_H -#include "blackcore/fsd/messagebase.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/messagebase.h" +#include "core/fsd/enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! FSD Message Server Error - class BLACKCORE_EXPORT ServerError : public MessageBase + class SWIFT_CORE_EXPORT ServerError : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/textmessage.cpp b/src/core/fsd/textmessage.cpp similarity index 96% rename from src/blackcore/fsd/textmessage.cpp rename to src/core/fsd/textmessage.cpp index 172f3c763..c6970bf85 100644 --- a/src/blackcore/fsd/textmessage.cpp +++ b/src/core/fsd/textmessage.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/fsd/textmessage.h" +#include "core/fsd/textmessage.h" #include "misc/logmessage.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { TextMessage::TextMessage() : MessageBase() {} diff --git a/src/blackcore/fsd/textmessage.h b/src/core/fsd/textmessage.h similarity index 84% rename from src/blackcore/fsd/textmessage.h rename to src/core/fsd/textmessage.h index be7c8e7c4..497c5865b 100644 --- a/src/blackcore/fsd/textmessage.h +++ b/src/core/fsd/textmessage.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_FSD_TEXTMESSAGE_H -#define BLACKCORE_FSD_TEXTMESSAGE_H +#ifndef SWIFT_CORE_FSD_TEXTMESSAGE_H +#define SWIFT_CORE_FSD_TEXTMESSAGE_H -#include "blackcore/fsd/messagebase.h" +#include "core/fsd/messagebase.h" #include #include #include -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Text, radio or private message - class BLACKCORE_EXPORT TextMessage : public MessageBase + class SWIFT_CORE_EXPORT TextMessage : public MessageBase { public: //! Message type diff --git a/src/blackcore/fsd/visualpilotdataperiodic.cpp b/src/core/fsd/visualpilotdataperiodic.cpp similarity index 99% rename from src/blackcore/fsd/visualpilotdataperiodic.cpp rename to src/core/fsd/visualpilotdataperiodic.cpp index 3355f497f..d74307ca2 100644 --- a/src/blackcore/fsd/visualpilotdataperiodic.cpp +++ b/src/core/fsd/visualpilotdataperiodic.cpp @@ -11,7 +11,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { VisualPilotDataPeriodic::VisualPilotDataPeriodic() : MessageBase() {} diff --git a/src/blackcore/fsd/visualpilotdataperiodic.h b/src/core/fsd/visualpilotdataperiodic.h similarity index 93% rename from src/blackcore/fsd/visualpilotdataperiodic.h rename to src/core/fsd/visualpilotdataperiodic.h index 521e3c1a2..06656a2d5 100644 --- a/src/blackcore/fsd/visualpilotdataperiodic.h +++ b/src/core/fsd/visualpilotdataperiodic.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKCORE_FSD_VISUALPILOTDATAPERIODIC_H -#define BLACKCORE_FSD_VISUALPILOTDATAPERIODIC_H +#ifndef SWIFT_CORE_FSD_VISUALPILOTDATAPERIODIC_H +#define SWIFT_CORE_FSD_VISUALPILOTDATAPERIODIC_H #include "messagebase.h" #include "enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { class VisualPilotDataUpdate; //! Every 25th VisualPilotDataUpdate is actually one of these ("slowfast"). - class BLACKCORE_EXPORT VisualPilotDataPeriodic : public MessageBase + class SWIFT_CORE_EXPORT VisualPilotDataPeriodic : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/visualpilotdatastopped.cpp b/src/core/fsd/visualpilotdatastopped.cpp similarity index 99% rename from src/blackcore/fsd/visualpilotdatastopped.cpp rename to src/core/fsd/visualpilotdatastopped.cpp index 152c5d363..cfc1c8d76 100644 --- a/src/blackcore/fsd/visualpilotdatastopped.cpp +++ b/src/core/fsd/visualpilotdatastopped.cpp @@ -11,7 +11,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { VisualPilotDataStopped::VisualPilotDataStopped() : MessageBase() {} diff --git a/src/blackcore/fsd/visualpilotdatastopped.h b/src/core/fsd/visualpilotdatastopped.h similarity index 91% rename from src/blackcore/fsd/visualpilotdatastopped.h rename to src/core/fsd/visualpilotdatastopped.h index 2d56fef25..9a188e5a0 100644 --- a/src/blackcore/fsd/visualpilotdatastopped.h +++ b/src/core/fsd/visualpilotdatastopped.h @@ -3,18 +3,18 @@ //! \file -#ifndef BLACKCORE_FSD_VISUALPILOTDATASTOPPED_H -#define BLACKCORE_FSD_VISUALPILOTDATASTOPPED_H +#ifndef SWIFT_CORE_FSD_VISUALPILOTDATASTOPPED_H +#define SWIFT_CORE_FSD_VISUALPILOTDATASTOPPED_H #include "messagebase.h" #include "enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { class VisualPilotDataUpdate; //! VisualPilotDataUpdate with velocity assumed to be zero. - class BLACKCORE_EXPORT VisualPilotDataStopped : public MessageBase + class SWIFT_CORE_EXPORT VisualPilotDataStopped : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/visualpilotdatatoggle.cpp b/src/core/fsd/visualpilotdatatoggle.cpp similarity index 97% rename from src/blackcore/fsd/visualpilotdatatoggle.cpp rename to src/core/fsd/visualpilotdatatoggle.cpp index 669bc1a20..d7877708d 100644 --- a/src/blackcore/fsd/visualpilotdatatoggle.cpp +++ b/src/core/fsd/visualpilotdatatoggle.cpp @@ -10,7 +10,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { VisualPilotDataToggle::VisualPilotDataToggle() : MessageBase() {} diff --git a/src/blackcore/fsd/visualpilotdatatoggle.h b/src/core/fsd/visualpilotdatatoggle.h similarity index 86% rename from src/blackcore/fsd/visualpilotdatatoggle.h rename to src/core/fsd/visualpilotdatatoggle.h index 2788c204d..184bd3b53 100644 --- a/src/blackcore/fsd/visualpilotdatatoggle.h +++ b/src/core/fsd/visualpilotdatatoggle.h @@ -3,16 +3,16 @@ //! \file -#ifndef BLACKCORE_FSD_VISUALPILOTDATATOGGLE_H -#define BLACKCORE_FSD_VISUALPILOTDATATOGGLE_H +#ifndef SWIFT_CORE_FSD_VISUALPILOTDATATOGGLE_H +#define SWIFT_CORE_FSD_VISUALPILOTDATATOGGLE_H #include "messagebase.h" #include "enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { //! Message from server to start or stop sending visual pilot data updates. - class BLACKCORE_EXPORT VisualPilotDataToggle : public MessageBase + class SWIFT_CORE_EXPORT VisualPilotDataToggle : public MessageBase { public: //! Constructor diff --git a/src/blackcore/fsd/visualpilotdataupdate.cpp b/src/core/fsd/visualpilotdataupdate.cpp similarity index 99% rename from src/blackcore/fsd/visualpilotdataupdate.cpp rename to src/core/fsd/visualpilotdataupdate.cpp index 7d1518e84..1f7a36f67 100644 --- a/src/blackcore/fsd/visualpilotdataupdate.cpp +++ b/src/core/fsd/visualpilotdataupdate.cpp @@ -12,7 +12,7 @@ using namespace swift::misc; using namespace swift::misc::aviation; -namespace BlackCore::Fsd +namespace swift::core::fsd { VisualPilotDataUpdate::VisualPilotDataUpdate() : MessageBase() {} diff --git a/src/blackcore/fsd/visualpilotdataupdate.h b/src/core/fsd/visualpilotdataupdate.h similarity index 94% rename from src/blackcore/fsd/visualpilotdataupdate.h rename to src/core/fsd/visualpilotdataupdate.h index aa13c7b2e..d23715930 100644 --- a/src/blackcore/fsd/visualpilotdataupdate.h +++ b/src/core/fsd/visualpilotdataupdate.h @@ -3,19 +3,19 @@ //! \file -#ifndef BLACKCORE_FSD_VISUALPILOTDATAUPDATE_H -#define BLACKCORE_FSD_VISUALPILOTDATAUPDATE_H +#ifndef SWIFT_CORE_FSD_VISUALPILOTDATAUPDATE_H +#define SWIFT_CORE_FSD_VISUALPILOTDATAUPDATE_H #include "messagebase.h" #include "enums.h" -namespace BlackCore::Fsd +namespace swift::core::fsd { class VisualPilotDataPeriodic; class VisualPilotDataStopped; //! Pilot data update broadcasted to pilots in range every 0.2 seconds. - class BLACKCORE_EXPORT VisualPilotDataUpdate : public MessageBase + class SWIFT_CORE_EXPORT VisualPilotDataUpdate : public MessageBase { public: //! Constructor diff --git a/src/blackcore/githubpackagesreader.cpp b/src/core/githubpackagesreader.cpp similarity index 93% rename from src/blackcore/githubpackagesreader.cpp rename to src/core/githubpackagesreader.cpp index 3ecde2d3c..0aa12e554 100644 --- a/src/blackcore/githubpackagesreader.cpp +++ b/src/core/githubpackagesreader.cpp @@ -3,8 +3,8 @@ //! \file -#include "blackcore/githubpackagesreader.h" -#include "blackcore/application.h" +#include "core/githubpackagesreader.h" +#include "core/application.h" #include "config/buildconfig.h" #include #include @@ -15,7 +15,7 @@ using namespace swift::misc::db; using namespace swift::config; -namespace BlackCore +namespace swift::core { CGitHubPackagesReader::CGitHubPackagesReader(QObject *parent) : QObject(parent) {} diff --git a/src/blackcore/githubpackagesreader.h b/src/core/githubpackagesreader.h similarity index 89% rename from src/blackcore/githubpackagesreader.h rename to src/core/githubpackagesreader.h index 7424213f0..4682af7c3 100644 --- a/src/blackcore/githubpackagesreader.h +++ b/src/core/githubpackagesreader.h @@ -3,13 +3,13 @@ //! \file -#ifndef BLACKCORE_GITHUBPACKAGESREADER_H -#define BLACKCORE_GITHUBPACKAGESREADER_H +#ifndef SWIFT_CORE_GITHUBPACKAGESREADER_H +#define SWIFT_CORE_GITHUBPACKAGESREADER_H #include "misc/db/updateinfo.h" #include -namespace BlackCore +namespace swift::core { /*! * Read available updates from GitHub Packages REST API. diff --git a/src/blackcore/inputmanager.cpp b/src/core/inputmanager.cpp similarity index 99% rename from src/blackcore/inputmanager.cpp rename to src/core/inputmanager.cpp index 71d649ac2..b968a1782 100644 --- a/src/blackcore/inputmanager.cpp +++ b/src/core/inputmanager.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/inputmanager.h" +#include "core/inputmanager.h" #include "misc/mixin/mixincompare.h" #include "misc/dictionary.h" #include "misc/input/actionhotkey.h" @@ -17,7 +17,7 @@ using namespace swift::input; using namespace swift::misc; using namespace swift::misc::input; -namespace BlackCore +namespace swift::core { CInputManager::CInputManager(QObject *parent) : QObject(parent) { diff --git a/src/blackcore/inputmanager.h b/src/core/inputmanager.h similarity index 94% rename from src/blackcore/inputmanager.h rename to src/core/inputmanager.h index cdf32fb6c..2b5db7087 100644 --- a/src/blackcore/inputmanager.h +++ b/src/core/inputmanager.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_INPUTMANAGER_H -#define BLACKCORE_INPUTMANAGER_H +#ifndef SWIFT_CORE_INPUTMANAGER_H +#define SWIFT_CORE_INPUTMANAGER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/application/applicationsettings.h" +#include "core/swiftcoreexport.h" +#include "core/application/applicationsettings.h" #include "input/joystick.h" #include "input/keyboard.h" #include "misc/input/hotkeycombination.h" @@ -25,10 +25,10 @@ #include #include -namespace BlackCore +namespace swift::core { //! Input manager handling hotkey function calls - class BLACKCORE_EXPORT CInputManager : public QObject + class SWIFT_CORE_EXPORT CInputManager : public QObject { Q_OBJECT @@ -144,7 +144,7 @@ namespace BlackCore swift::misc::input::CHotkeyCombination m_capturedCombination; swift::misc::input::CHotkeyCombination m_combinationBeforeCapture; - swift::misc::CSetting m_actionHotkeys { this, &CInputManager::reloadHotkeySettings }; + swift::misc::CSetting m_actionHotkeys { this, &CInputManager::reloadHotkeySettings }; }; } // ns diff --git a/src/blackcore/modelsetbuilder.cpp b/src/core/modelsetbuilder.cpp similarity index 93% rename from src/blackcore/modelsetbuilder.cpp rename to src/core/modelsetbuilder.cpp index 80f22211a..46491aaad 100644 --- a/src/blackcore/modelsetbuilder.cpp +++ b/src/core/modelsetbuilder.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/modelsetbuilder.h" -#include "blackcore/webdataservices.h" -#include "blackcore/db/databaseutils.h" +#include "core/application.h" +#include "core/modelsetbuilder.h" +#include "core/webdataservices.h" +#include "core/db/databaseutils.h" #include "misc/aviation/aircrafticaocodelist.h" #include "misc/simulation/aircraftmodel.h" @@ -13,9 +13,9 @@ #include using namespace swift::misc::simulation; -using namespace BlackCore::Db; +using namespace swift::core::db; -namespace BlackCore +namespace swift::core { CModelSetBuilder::CModelSetBuilder(QObject *parent) : QObject(parent) { diff --git a/src/blackcore/modelsetbuilder.h b/src/core/modelsetbuilder.h similarity index 78% rename from src/blackcore/modelsetbuilder.h rename to src/core/modelsetbuilder.h index 6a8156507..04be39cfc 100644 --- a/src/blackcore/modelsetbuilder.h +++ b/src/core/modelsetbuilder.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_CMODELSETBUILDER_H -#define BLACKCORE_CMODELSETBUILDER_H +#ifndef SWIFT_CORE_CMODELSETBUILDER_H +#define SWIFT_CORE_CMODELSETBUILDER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/distributorlist.h" #include "misc/simulation/simulatorinfo.h" @@ -15,12 +15,12 @@ #include #include -namespace BlackCore +namespace swift::core { /*! * Create model set (normally from own models) */ - class BLACKCORE_EXPORT CModelSetBuilder : public QObject + class SWIFT_CORE_EXPORT CModelSetBuilder : public QObject { Q_OBJECT @@ -50,8 +50,8 @@ namespace BlackCore }; } // ns -Q_DECLARE_METATYPE(BlackCore::CModelSetBuilder::BuilderFlag) -Q_DECLARE_METATYPE(BlackCore::CModelSetBuilder::Builder) -Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::CModelSetBuilder::Builder) +Q_DECLARE_METATYPE(swift::core::CModelSetBuilder::BuilderFlag) +Q_DECLARE_METATYPE(swift::core::CModelSetBuilder::Builder) +Q_DECLARE_OPERATORS_FOR_FLAGS(swift::core::CModelSetBuilder::Builder) #endif // guard diff --git a/src/blackcore/pluginmanager.cpp b/src/core/pluginmanager.cpp similarity index 97% rename from src/blackcore/pluginmanager.cpp rename to src/core/pluginmanager.cpp index f157dc094..8ed4b675c 100644 --- a/src/blackcore/pluginmanager.cpp +++ b/src/core/pluginmanager.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/pluginmanager.h" -#include "blackcore/application.h" +#include "core/pluginmanager.h" +#include "core/application.h" #include "misc/swiftdirectories.h" #include "misc/directoryutils.h" #include "misc/logmessage.h" @@ -19,7 +19,7 @@ using namespace swift::misc; -namespace BlackCore +namespace swift::core { IPluginManager::IPluginManager(QObject *parent) : QObject(parent) {} diff --git a/src/blackcore/pluginmanager.h b/src/core/pluginmanager.h similarity index 94% rename from src/blackcore/pluginmanager.h rename to src/core/pluginmanager.h index 8c461e609..8ea9665e7 100644 --- a/src/blackcore/pluginmanager.h +++ b/src/core/pluginmanager.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_PLUGIN_MANAGER_H -#define BLACKCORE_PLUGIN_MANAGER_H +#ifndef SWIFT_CORE_PLUGIN_MANAGER_H +#define SWIFT_CORE_PLUGIN_MANAGER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/sequence.h" #include @@ -14,13 +14,13 @@ #include #include -namespace BlackCore +namespace swift::core { /*! * Base class for all contexts that provide plugin support. * It is responsible for locating, validating and loading plugins. */ - class BLACKCORE_EXPORT IPluginManager : public QObject + class SWIFT_CORE_EXPORT IPluginManager : public QObject { Q_OBJECT diff --git a/src/blackcore/pluginmanagersimulator.cpp b/src/core/pluginmanagersimulator.cpp similarity index 91% rename from src/blackcore/pluginmanagersimulator.cpp rename to src/core/pluginmanagersimulator.cpp index 257113006..0e0de0280 100644 --- a/src/blackcore/pluginmanagersimulator.cpp +++ b/src/core/pluginmanagersimulator.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/pluginmanagersimulator.h" -#include "blackcore/simulator.h" +#include "core/application.h" +#include "core/pluginmanagersimulator.h" +#include "core/simulator.h" #include "misc/swiftdirectories.h" #include "misc/directoryutils.h" #include "misc/logmessage.h" @@ -13,7 +13,7 @@ #include #include -namespace BlackCore +namespace swift::core { using namespace swift::misc; using namespace swift::misc::simulation; @@ -89,7 +89,7 @@ namespace BlackCore for (const QJsonObject &json : plugins) { const QString iid = json["IID"].toString(); - if (iid == QStringLiteral("org.swift-project.blackcore.simulatorinterface")) + if (iid == QStringLiteral("org.swift-project.swift_core.simulatorinterface")) { auto it = m_plugins.insert(pluginIdentifier(json), {}); it->info.convertFromJson(json); @@ -100,7 +100,7 @@ namespace BlackCore CSequence CPluginManagerSimulator::acceptedIids() const { return { - QStringLiteral("org.swift-project.blackcore.simulatorinterface"), + QStringLiteral("org.swift-project.swift_core.simulatorinterface"), QStringLiteral("org.swift-project.blackgui.pluginconfiginterface") }; } diff --git a/src/blackcore/pluginmanagersimulator.h b/src/core/pluginmanagersimulator.h similarity index 81% rename from src/blackcore/pluginmanagersimulator.h rename to src/core/pluginmanagersimulator.h index 01d9c563f..05a45d5f5 100644 --- a/src/blackcore/pluginmanagersimulator.h +++ b/src/core/pluginmanagersimulator.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_PLUGIN_MANAGER_SIMULATOR_H -#define BLACKCORE_PLUGIN_MANAGER_SIMULATOR_H +#ifndef SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H +#define SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/pluginmanager.h" +#include "core/swiftcoreexport.h" +#include "core/pluginmanager.h" #include "misc/sequence.h" #include "misc/simulation/simulatorplugininfo.h" #include "misc/simulation/simulatorplugininfolist.h" @@ -18,7 +18,7 @@ #include #include -namespace BlackCore +namespace swift::core { class ISimulatorFactory; class ISimulatorListener; @@ -26,7 +26,7 @@ namespace BlackCore /*! * Manages plugins for the simulator context. */ - class BLACKCORE_EXPORT CPluginManagerSimulator : public BlackCore::IPluginManager + class SWIFT_CORE_EXPORT CPluginManagerSimulator : public swift::core::IPluginManager { Q_OBJECT @@ -52,14 +52,14 @@ namespace BlackCore //! Check if simulator is connected int checkAvailableListeners(); - //! \copydoc BlackCore::IPluginManager::collectPlugins() + //! \copydoc swift::core::IPluginManager::collectPlugins() virtual void collectPlugins() override; protected: - //! \copydoc BlackCore::IPluginManager::acceptedIids() + //! \copydoc swift::core::IPluginManager::acceptedIids() virtual swift::misc::CSequence acceptedIids() const override; - //! \copydoc BlackCore::IPluginManager::pluginDirectory() + //! \copydoc swift::core::IPluginManager::pluginDirectory() virtual const QString &pluginDirectory() const override; private: diff --git a/src/blackcore/progress.h b/src/core/progress.h similarity index 82% rename from src/blackcore/progress.h rename to src/core/progress.h index ea91b961b..df6a98c71 100644 --- a/src/blackcore/progress.h +++ b/src/core/progress.h @@ -1,12 +1,12 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#ifndef BLACKCORE_PROGRESS_H -#define BLACKCORE_PROGRESS_H +#ifndef SWIFT_CORE_PROGRESS_H +#define SWIFT_CORE_PROGRESS_H -#include "blackcore/application.h" +#include "core/application.h" -namespace BlackCore +namespace swift::core { /*! * Implementing class features a progress bar or something similar. @@ -25,7 +25,7 @@ namespace BlackCore void updateProgressIndicatorAndProcessEvents(int percentage) { this->updateProgressIndicator(percentage); - BlackCore::CApplication::processEventsFor(10); + swift::core::CApplication::processEventsFor(10); } }; } // ns diff --git a/src/blackcore/readme.txt b/src/core/readme.txt similarity index 100% rename from src/blackcore/readme.txt rename to src/core/readme.txt diff --git a/src/core/registermetadata.cpp b/src/core/registermetadata.cpp new file mode 100644 index 000000000..482beae68 --- /dev/null +++ b/src/core/registermetadata.cpp @@ -0,0 +1,62 @@ +// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors +// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 + +#include "core/registermetadata.h" +#include "core/context/contextapplication.h" +#include "core/data/launchersetup.h" +#include "core/data/globalsetup.h" +#include "core/data/vatsimsetup.h" +#include "core/db/databasereader.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/fsd/fsdclient.h" +#include "core/afv/clients/afvclient.h" +#include "core/simulator.h" +#include "core/webreaderflags.h" +#include "core/aircraftmatcher.h" +#include "misc/network/loginmode.h" +#include "misc/dbus.h" +#include "misc/valueobject.h" + +#include +#include + +using namespace swift::core::fsd; + +namespace swift::core +{ + void registerMetadata() + { + // not really clear when a type here has to be registered with qRegisterMetaType + // however, does not harm if it is redundant + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType("ConnectionStatus"); + qRegisterMetaType(); + qRegisterMetaType("TransceiverReceivingCallsignsChangedArgs"); + + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + + db::CDatabaseReaderConfig::registerMetadata(); + db::CDatabaseReaderConfigList::registerMetadata(); + data::CGlobalSetup::registerMetadata(); + data::CVatsimSetup::registerMetadata(); + data::CLauncherSetup::registerMetadata(); + vatsim::CReaderSettings::registerMetadata(); + vatsim::CRawFsdMessageSettings::registerMetadata(); + + // not really clear when a type here has to be registered with qRegisterMetaType + // however, does not harm if it is redundant + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + } +} // namespace diff --git a/src/core/registermetadata.h b/src/core/registermetadata.h new file mode 100644 index 000000000..8fca00a28 --- /dev/null +++ b/src/core/registermetadata.h @@ -0,0 +1,17 @@ +// SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors +// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 + +//! \file + +#ifndef SWIFT_CORE_REGISTERMETADATA_H +#define SWIFT_CORE_REGISTERMETADATA_H + +#include "core/swiftcoreexport.h" + +namespace swift::core +{ + //! Register all relevant metadata in swift::core + SWIFT_CORE_EXPORT void registerMetadata(); +} // ns + +#endif // guard diff --git a/src/blackcore/setupreader.cpp b/src/core/setupreader.cpp similarity index 94% rename from src/blackcore/setupreader.cpp rename to src/core/setupreader.cpp index c5e2d0e51..b7b64686d 100644 --- a/src/blackcore/setupreader.cpp +++ b/src/core/setupreader.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/application.h" -#include "blackcore/setupreader.h" +#include "core/application.h" +#include "core/setupreader.h" #include "misc/verify.h" #include "misc/mixin/mixincompare.h" #include "misc/fileutils.h" @@ -29,10 +29,10 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::db; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Data; +using namespace swift::core; +using namespace swift::core::data; -namespace BlackCore +namespace swift::core { CSetupReader::CSetupReader(QObject *parent) : QObject(parent) {} diff --git a/src/blackcore/setupreader.h b/src/core/setupreader.h similarity index 73% rename from src/blackcore/setupreader.h rename to src/core/setupreader.h index 52f8f6ca4..73e6598bf 100644 --- a/src/blackcore/setupreader.h +++ b/src/core/setupreader.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_SETUPREADER_H -#define BLACKCORE_SETUPREADER_H +#ifndef SWIFT_CORE_SETUPREADER_H +#define SWIFT_CORE_SETUPREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/data/globalsetup.h" +#include "core/swiftcoreexport.h" +#include "core/data/globalsetup.h" #include "misc/db/updateinfo.h" #include "misc/datacache.h" #include "misc/statusmessagelist.h" @@ -21,25 +21,25 @@ #include #include -namespace BlackCoreTest +namespace SwiftCoreTest { class CTestConnectivity; } -namespace BlackCore +namespace swift::core { //! Read the central URLs / locations of our data, setup and versions. //! - //! \details This class should be only used in BlackCore::CApplication. + //! \details This class should be only used in swift::core::CApplication. //! - //! \note This class is no(!) BlackCore::CThreadedReader as it will be loaded once during startup + //! \note This class is no(!) swift::core::CThreadedReader as it will be loaded once during startup //! and reading setup data is fast. The read file is also called "bootstrap" file as it tells //! swift which data and versions are located where. Without that file we cannot start. //! //! \sa swift::misc::db::TUpdateInfo - class BLACKCORE_EXPORT CSetupReader : public QObject + class SWIFT_CORE_EXPORT CSetupReader : public QObject { Q_OBJECT - friend class BlackCoreTest::CTestConnectivity; + friend class SwiftCoreTest::CTestConnectivity; public: //! Categories @@ -58,11 +58,11 @@ namespace BlackCore //! Current setup (reader URLs, DB location, crash server) //! \remarks aka "bootstrap file" //! \threadsafe - Data::CGlobalSetup getSetup() const; + data::CGlobalSetup getSetup() const; private: std::atomic m_setupAvailable { false }; //!< setup available? - Data::CGlobalSetup m_setup {}; //!< data setup + data::CGlobalSetup m_setup {}; //!< data setup //! Read by local file swift::misc::CStatusMessageList readLocalBootstrapFile(); diff --git a/src/blackcore/simulator.cpp b/src/core/simulator.cpp similarity index 99% rename from src/blackcore/simulator.cpp rename to src/core/simulator.cpp index 4b7b313b1..4c4ad58d6 100644 --- a/src/blackcore/simulator.cpp +++ b/src/core/simulator.cpp @@ -1,10 +1,10 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/db/databaseutils.h" -#include "blackcore/simulator.h" -#include "blackcore/webdataservices.h" -#include "blackcore/application.h" +#include "core/db/databaseutils.h" +#include "core/simulator.h" +#include "core/webdataservices.h" +#include "core/application.h" #include "misc/simulation/data/modelcaches.h" #include "misc/math/mathutils.h" #include "misc/crashhandler.h" @@ -37,9 +37,9 @@ using namespace swift::misc::simulation::settings; using namespace swift::misc::physical_quantities; using namespace swift::misc::network; using namespace swift::misc::weather; -using namespace BlackCore::Db; +using namespace swift::core::db; -namespace BlackCore +namespace swift::core { const QStringList &ISimulator::getLogCategories() { @@ -512,7 +512,7 @@ namespace BlackCore void ISimulator::registerHelp() { - if (CSimpleCommandParser::registered("BlackCore::ISimulator")) { return; } + if (CSimpleCommandParser::registered("swift::core::ISimulator")) { return; } CSimpleCommandParser::registerCommand({ ".drv", "alias: .driver .plugin" }); CSimpleCommandParser::registerCommand({ ".drv unload", "unload driver" }); CSimpleCommandParser::registerCommand({ ".drv cg length clear|modelstr.", "override CG" }); @@ -1241,7 +1241,7 @@ namespace BlackCore { if (CDatabaseUtils::hasDbAircraftData()) { - const CAircraftModel newModel = BlackCore::ISimulator::reverseLookupModel(model); + const CAircraftModel newModel = swift::core::ISimulator::reverseLookupModel(model); const bool updated = this->updateOwnModel(newModel); // update in provider (normally the context) if (updated) { diff --git a/src/blackcore/simulator.h b/src/core/simulator.h similarity index 96% rename from src/blackcore/simulator.h rename to src/core/simulator.h index 59cbe786d..be974b9eb 100644 --- a/src/blackcore/simulator.h +++ b/src/core/simulator.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_SIMULATOR_H -#define BLACKCORE_SIMULATOR_H +#ifndef SWIFT_CORE_SIMULATOR_H +#define SWIFT_CORE_SIMULATOR_H -#include "blackcore/application.h" -#include "blackcore/blackcoreexport.h" +#include "core/application.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/simulatedaircraft.h" @@ -44,10 +44,10 @@ namespace swift::misc::network class CTextMessage; } -namespace BlackCore +namespace swift::core { //! Interface to a simulator. - class BLACKCORE_EXPORT ISimulator : + class SWIFT_CORE_EXPORT ISimulator : public QObject, public swift::misc::simulation::COwnAircraftAware, // access to in memory own aircraft data public swift::misc::simulation::CRemoteAircraftAware, // access to in memory remote aircraft data @@ -255,18 +255,18 @@ namespace BlackCore //! \ingroup swiftdotcommands //! 
-        //! .drv cg length clear|modelstring  set overridden CG for model string      BlackCore::ISimulator
-        //! .drv unload                       unload plugin                           BlackCore::ISimulator
-        //! .drv limit number                 limit the number of updates             BlackCore::ISimulator
-        //! .drv logint callsign              log interpolator for callsign           BlackCore::ISimulator
-        //! .drv logint off                   no log information for interpolator     BlackCore::ISimulator
-        //! .drv logint write                 write interpolator log to file          BlackCore::ISimulator
-        //! .drv logint clear                 clear current log                       BlackCore::ISimulator
-        //! .drv pos callsign                 shows current position in simulator     BlackCore::ISimulator
-        //! .drv spline|linear callsign       interpolator spline or linear           BlackCore::ISimulator
-        //! .drv aircraft readd callsign      re-add (add again) aircraft             BlackCore::ISimulator
-        //! .drv aircraft readd all           re-add all aircraft                     BlackCore::ISimulator
-        //! .drv aircraft rm callsign         remove aircraft                         BlackCore::ISimulator
+        //! .drv cg length clear|modelstring  set overridden CG for model string      swift::core::ISimulator
+        //! .drv unload                       unload plugin                           swift::core::ISimulator
+        //! .drv limit number                 limit the number of updates             swift::core::ISimulator
+        //! .drv logint callsign              log interpolator for callsign           swift::core::ISimulator
+        //! .drv logint off                   no log information for interpolator     swift::core::ISimulator
+        //! .drv logint write                 write interpolator log to file          swift::core::ISimulator
+        //! .drv logint clear                 clear current log                       swift::core::ISimulator
+        //! .drv pos callsign                 shows current position in simulator     swift::core::ISimulator
+        //! .drv spline|linear callsign       interpolator spline or linear           swift::core::ISimulator
+        //! .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
         //!
//! Parse command line for simulator drivers, derived classes can add specific parsing by overriding ISimulator::parseDetails @@ -342,7 +342,7 @@ namespace BlackCore signals: //! Simulator combined status - void simulatorStatusChanged(BlackCore::ISimulator::SimulatorStatus status); // use emitSimulatorCombinedStatus to emit + void simulatorStatusChanged(swift::core::ISimulator::SimulatorStatus status); // use emitSimulatorCombinedStatus to emit //! Emitted when own aircraft model has changed void ownAircraftModelChanged(const swift::misc::simulation::CAircraftModel &model); @@ -602,7 +602,7 @@ namespace BlackCore //! \details The simulator listener is responsible for letting the core know, //! when the corresponding simulator is started. //! \note Will be moved to a background thread (context) - class BLACKCORE_EXPORT ISimulatorListener : public QObject + class SWIFT_CORE_EXPORT ISimulatorListener : public QObject { Q_OBJECT @@ -663,7 +663,7 @@ namespace BlackCore }; //! Factory pattern class to create instances of ISimulator - class BLACKCORE_EXPORT ISimulatorFactory + class SWIFT_CORE_EXPORT ISimulatorFactory { public: //! ISimulatorVirtual destructor @@ -697,10 +697,10 @@ namespace BlackCore }; } // namespace -Q_DECLARE_METATYPE(BlackCore::ISimulator::SimulatorStatusFlag) -Q_DECLARE_METATYPE(BlackCore::ISimulator::SimulatorStatus) -Q_DECLARE_INTERFACE(BlackCore::ISimulator, "org.swift-project.blackcore.simulator") -Q_DECLARE_INTERFACE(BlackCore::ISimulatorFactory, "org.swift-project.blackcore.simulatorfactory") -Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::ISimulator::SimulatorStatus) +Q_DECLARE_METATYPE(swift::core::ISimulator::SimulatorStatusFlag) +Q_DECLARE_METATYPE(swift::core::ISimulator::SimulatorStatus) +Q_DECLARE_INTERFACE(swift::core::ISimulator, "org.swift-project.swift_core.simulator") +Q_DECLARE_INTERFACE(swift::core::ISimulatorFactory, "org.swift-project.swift_core.simulatorfactory") +Q_DECLARE_OPERATORS_FOR_FLAGS(swift::core::ISimulator::SimulatorStatus) #endif // guard diff --git a/src/blackcore/blackcore.dox b/src/core/swiftcore.dox similarity index 76% rename from src/blackcore/blackcore.dox rename to src/core/swiftcore.dox index 5553e3be2..c0bc753ef 100644 --- a/src/blackcore/blackcore.dox +++ b/src/core/swiftcore.dox @@ -4,37 +4,37 @@ //! \file /*! - * \defgroup blackcore BlackCore Library + * \defgroup swift_core Core Library * Backend services of the swift project, like dealing with the network or the simulators. */ /*! - * \namespace BlackCore + * \namespace swift::core * Backend services of the swift project, like dealing with the network or the simulators. */ /*! - * \namespace BlackCore::Data + * \namespace swift::core::data * Core data traits (aka cached values) and classes. */ /*! - * \namespace BlackCore::Db + * \namespace swift::core::db * Classes interacting with the swift database (aka "datastore"). This includes the readers and related classes. * Related model classes can be found in swift::misc::db */ /*! - * \namespace BlackCore::Settings + * \namespace swift::core::Settings * Core settings traits. */ /*! - * \namespace BlackCore::Settings::Network + * \namespace swift::core::Settings::Network * Network settings traits. */ /*! * \defgroup dbus DBus related functions, classes, or definitions. - * \ingroup blackcore + * \ingroup swift_core */ diff --git a/src/blackcore/blackcoreexport.h b/src/core/swiftcoreexport.h similarity index 55% rename from src/blackcore/blackcoreexport.h rename to src/core/swiftcoreexport.h index 83b025056..fddb1b7cc 100644 --- a/src/blackcore/blackcoreexport.h +++ b/src/core/swiftcoreexport.h @@ -3,24 +3,24 @@ //! \file -#ifndef BLACKCORE_BLACKCOREEXPORT_H -#define BLACKCORE_BLACKCOREEXPORT_H +#ifndef SWIFT_CORE_SWIFT_COREEXPORT_H +#define SWIFT_CORE_SWIFT_COREEXPORT_H #include /*! - * \def BLACKCORE_EXPORT + * \def SWIFT_CORE_EXPORT * Export a class or function from the library */ #ifndef WITH_STATIC -# if defined(BUILD_BLACKCORE_LIB) -# define BLACKCORE_EXPORT Q_DECL_EXPORT +# if defined(BUILD_SWIFT_CORE_LIB) +# define SWIFT_CORE_EXPORT Q_DECL_EXPORT # else -# define BLACKCORE_EXPORT Q_DECL_IMPORT +# define SWIFT_CORE_EXPORT Q_DECL_IMPORT # endif #else -# define BLACKCORE_EXPORT +# define SWIFT_CORE_EXPORT #endif #endif // guard diff --git a/src/blackcore/threadedreader.cpp b/src/core/threadedreader.cpp similarity index 98% rename from src/blackcore/threadedreader.cpp rename to src/core/threadedreader.cpp index a440426e7..12d87bd4d 100644 --- a/src/blackcore/threadedreader.cpp +++ b/src/core/threadedreader.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/threadedreader.h" -#include "blackcore/application.h" +#include "core/threadedreader.h" +#include "core/application.h" #include "misc/network/networkutils.h" #include "misc/threadutils.h" #include "misc/logmessage.h" @@ -17,9 +17,9 @@ using namespace swift::misc; using namespace swift::misc::network; -using namespace BlackCore::Vatsim; +using namespace swift::core::vatsim; -namespace BlackCore +namespace swift::core { const QStringList &CThreadedReader::getLogCategories() { diff --git a/src/blackcore/threadedreader.h b/src/core/threadedreader.h similarity index 95% rename from src/blackcore/threadedreader.h rename to src/core/threadedreader.h index dabae44ae..4bf7822e5 100644 --- a/src/blackcore/threadedreader.h +++ b/src/core/threadedreader.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_THREADED_READER_H -#define BLACKCORE_THREADED_READER_H +#ifndef SWIFT_CORE_THREADED_READER_H +#define SWIFT_CORE_THREADED_READER_H -#include "blackcore/vatsim/vatsimsettings.h" -#include "blackcore/blackcoreexport.h" +#include "core/vatsim/vatsimsettings.h" +#include "core/swiftcoreexport.h" #include "misc/network/urlloglist.h" #include "misc/logcategories.h" #include "misc/worker.h" @@ -23,11 +23,11 @@ class QNetworkReply; class QTimer; -namespace BlackCore +namespace swift::core { //! Support for threaded based reading and parsing tasks such //! as data files via http, or file system and parsing (such as FSX models) - class BLACKCORE_EXPORT CThreadedReader : public swift::misc::CContinuousWorker + class SWIFT_CORE_EXPORT CThreadedReader : public swift::misc::CContinuousWorker { Q_OBJECT diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/core/vatsim/vatsimdatafilereader.cpp similarity index 98% rename from src/blackcore/vatsim/vatsimdatafilereader.cpp rename to src/core/vatsim/vatsimdatafilereader.cpp index 68abd62cd..f3a745fb3 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/core/vatsim/vatsimdatafilereader.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/vatsim/vatsimdatafilereader.h" -#include "blackcore/application.h" +#include "core/vatsim/vatsimdatafilereader.h" +#include "core/application.h" #include "misc/aviation/aircraftsituation.h" #include "misc/aviation/altitude.h" #include "misc/aviation/atcstation.h" @@ -45,9 +45,9 @@ using namespace swift::misc::network; using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { CVatsimDataFileReader::CVatsimDataFileReader(QObject *owner) : CThreadedReader(owner, "CVatsimDataFileReader") { diff --git a/src/blackcore/vatsim/vatsimdatafilereader.h b/src/core/vatsim/vatsimdatafilereader.h similarity index 92% rename from src/blackcore/vatsim/vatsimdatafilereader.h rename to src/core/vatsim/vatsimdatafilereader.h index ad9da69dd..22c4e58d6 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.h +++ b/src/core/vatsim/vatsimdatafilereader.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_VATSIM_VATSIMDATAFILEREADER_H -#define BLACKCORE_VATSIM_VATSIMDATAFILEREADER_H +#ifndef SWIFT_CORE_VATSIM_VATSIMDATAFILEREADER_H +#define SWIFT_CORE_VATSIM_VATSIMDATAFILEREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/data/vatsimsetup.h" +#include "core/swiftcoreexport.h" +#include "core/data/vatsimsetup.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/airlineicaocode.h" #include "misc/aviation/atcstationlist.h" @@ -19,7 +19,7 @@ #include "misc/network/voicecapabilities.h" #include "misc/simulation/simulatedaircraftlist.h" #include "misc/datacache.h" -#include "blackcore/threadedreader.h" +#include "core/threadedreader.h" #include #include @@ -32,10 +32,10 @@ namespace swift::misc::simulation { class CSimulatedAircraft; } -namespace BlackCore::Vatsim +namespace swift::core::vatsim { //! Read vatsim data file - class BLACKCORE_EXPORT CVatsimDataFileReader : + class SWIFT_CORE_EXPORT CVatsimDataFileReader : public CThreadedReader { Q_OBJECT @@ -131,7 +131,7 @@ namespace BlackCore::Vatsim swift::misc::aviation::CAtcStationList m_atcStations; swift::misc::simulation::CSimulatedAircraftList m_aircraft; - swift::misc::CSettingReadOnly m_settings { this, &CVatsimDataFileReader::reloadSettings }; + swift::misc::CSettingReadOnly m_settings { this, &CVatsimDataFileReader::reloadSettings }; QMap m_flightPlanRemarks; //!< cache for flight plan remarks //! Data have been read, parse VATSIM file diff --git a/src/blackcore/vatsim/vatsimmetarreader.cpp b/src/core/vatsim/vatsimmetarreader.cpp similarity index 97% rename from src/blackcore/vatsim/vatsimmetarreader.cpp rename to src/core/vatsim/vatsimmetarreader.cpp index 0feaed7ce..d3e8fe314 100644 --- a/src/blackcore/vatsim/vatsimmetarreader.cpp +++ b/src/core/vatsim/vatsimmetarreader.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/vatsim/vatsimmetarreader.h" -#include "blackcore/application.h" +#include "core/vatsim/vatsimmetarreader.h" +#include "core/application.h" #include "misc/mixin/mixincompare.h" #include "misc/logmessage.h" #include "misc/network/entityflags.h" @@ -25,9 +25,9 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::weather; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { CVatsimMetarReader::CVatsimMetarReader(QObject *owner) : CThreadedReader(owner, "CVatsimMetarReader") { diff --git a/src/blackcore/vatsim/vatsimmetarreader.h b/src/core/vatsim/vatsimmetarreader.h similarity index 80% rename from src/blackcore/vatsim/vatsimmetarreader.h rename to src/core/vatsim/vatsimmetarreader.h index d049c6085..c16b29ab0 100644 --- a/src/blackcore/vatsim/vatsimmetarreader.h +++ b/src/core/vatsim/vatsimmetarreader.h @@ -3,26 +3,26 @@ //! \file -#ifndef BLACKCORE_VATSIM_VATSIMMETARREADER_H -#define BLACKCORE_VATSIM_VATSIMMETARREADER_H +#ifndef SWIFT_CORE_VATSIM_VATSIMMETARREADER_H +#define SWIFT_CORE_VATSIM_VATSIMMETARREADER_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/weather/metar.h" #include "misc/weather/metardecoder.h" #include "misc/weather/metarlist.h" #include "misc/network/entityflags.h" #include "misc/aviation/airporticaocode.h" -#include "blackcore/threadedreader.h" +#include "core/threadedreader.h" #include class QNetworkReply; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { //! Read METARs from VATSIM - class BLACKCORE_EXPORT CVatsimMetarReader : - public BlackCore::CThreadedReader + class SWIFT_CORE_EXPORT CVatsimMetarReader : + public swift::core::CThreadedReader { Q_OBJECT @@ -66,7 +66,7 @@ namespace BlackCore::Vatsim private: swift::misc::weather::CMetarDecoder m_metarDecoder; swift::misc::weather::CMetarList m_metars; - swift::misc::CSettingReadOnly m_settings { this, &CVatsimMetarReader::reloadSettings }; + swift::misc::CSettingReadOnly m_settings { this, &CVatsimMetarReader::reloadSettings }; }; } // ns #endif // guard diff --git a/src/blackcore/vatsim/vatsimserverfilereader.cpp b/src/core/vatsim/vatsimserverfilereader.cpp similarity index 97% rename from src/blackcore/vatsim/vatsimserverfilereader.cpp rename to src/core/vatsim/vatsimserverfilereader.cpp index 9a82363b7..b40b726bd 100644 --- a/src/blackcore/vatsim/vatsimserverfilereader.cpp +++ b/src/core/vatsim/vatsimserverfilereader.cpp @@ -1,8 +1,8 @@ // SPDX-FileCopyrightText: Copyright (C) 2023 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/vatsim/vatsimserverfilereader.h" -#include "blackcore/application.h" +#include "core/vatsim/vatsimserverfilereader.h" +#include "core/application.h" #include "misc/network/entityflags.h" #include "misc/network/server.h" #include "misc/network/user.h" @@ -24,9 +24,9 @@ using namespace swift::misc::network; using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { CVatsimServerFileReader::CVatsimServerFileReader(QObject *owner) : CThreadedReader(owner, "CVatsimServerFileReader") {} diff --git a/src/blackcore/vatsim/vatsimserverfilereader.h b/src/core/vatsim/vatsimserverfilereader.h similarity index 80% rename from src/blackcore/vatsim/vatsimserverfilereader.h rename to src/core/vatsim/vatsimserverfilereader.h index a786f7c0c..cb3b20021 100644 --- a/src/blackcore/vatsim/vatsimserverfilereader.h +++ b/src/core/vatsim/vatsimserverfilereader.h @@ -3,11 +3,11 @@ //! \file -#ifndef BLACKCORE_VATSIM_VATSIMSERVERFILEREADER_H -#define BLACKCORE_VATSIM_VATSIMSERVERFILEREADER_H +#ifndef SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H +#define SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/data/vatsimsetup.h" +#include "core/swiftcoreexport.h" +#include "core/data/vatsimsetup.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/airlineicaocode.h" #include "misc/aviation/atcstationlist.h" @@ -19,7 +19,7 @@ #include "misc/network/voicecapabilities.h" #include "misc/simulation/simulatedaircraftlist.h" #include "misc/datacache.h" -#include "blackcore/threadedreader.h" +#include "core/threadedreader.h" #include #include @@ -28,11 +28,11 @@ class QNetworkReply; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { //! Read VATSIM server file //! \sa https://data.vatsim.net/v3/vatsim-servers.json - class BLACKCORE_EXPORT CVatsimServerFileReader : + class SWIFT_CORE_EXPORT CVatsimServerFileReader : public CThreadedReader { Q_OBJECT @@ -56,13 +56,13 @@ namespace BlackCore::Vatsim void dataRead(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CEntityFlags::ReadState state, int number, const QUrl &url); protected: - //! \name BlackCore::CThreadedReader overrides + //! \name swift::core::CThreadedReader overrides //! @{ virtual void doWorkImpl() override; //! @} private: - swift::misc::CData m_lastGoodSetup { this }; + swift::misc::CData m_lastGoodSetup { this }; //! Data have been read, parse VATSIM server file void parseVatsimFile(QNetworkReply *nwReply); diff --git a/src/blackcore/vatsim/vatsimsettings.cpp b/src/core/vatsim/vatsimsettings.cpp similarity index 95% rename from src/blackcore/vatsim/vatsimsettings.cpp rename to src/core/vatsim/vatsimsettings.cpp index caf31907e..3402fef19 100644 --- a/src/blackcore/vatsim/vatsimsettings.cpp +++ b/src/core/vatsim/vatsimsettings.cpp @@ -1,15 +1,15 @@ // SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/vatsim/vatsimsettings.h" +#include "core/vatsim/vatsimsettings.h" using namespace swift::misc; using namespace swift::misc::physical_quantities; -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CReaderSettings) -BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CRawFsdMessageSettings) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings) +BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings) -namespace BlackCore::Vatsim +namespace swift::core::vatsim { CReaderSettings::CReaderSettings() {} diff --git a/src/blackcore/vatsim/vatsimsettings.h b/src/core/vatsim/vatsimsettings.h similarity index 82% rename from src/blackcore/vatsim/vatsimsettings.h rename to src/core/vatsim/vatsimsettings.h index ff312f27c..2c8bec1d5 100644 --- a/src/blackcore/vatsim/vatsimsettings.h +++ b/src/core/vatsim/vatsimsettings.h @@ -3,10 +3,10 @@ //! \file -#ifndef BLACKCORE_VATSIM_SETTINGS_H -#define BLACKCORE_VATSIM_SETTINGS_H +#ifndef SWIFT_CORE_VATSIM_SETTINGS_H +#define SWIFT_CORE_VATSIM_SETTINGS_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/settingscache.h" #include "misc/valueobject.h" #include "misc/pq/time.h" @@ -15,15 +15,15 @@ #include "misc/directoryutils.h" #include "misc/fileutils.h" -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CReaderSettings) -BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CRawFsdMessageSettings) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CReaderSettings) +BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings) -namespace BlackCore::Vatsim +namespace swift::core::vatsim { /*! * Settings used with readers */ - class BLACKCORE_EXPORT CReaderSettings : public swift::misc::CValueObject + class SWIFT_CORE_EXPORT CReaderSettings : public swift::misc::CValueObject { public: //! Properties by index @@ -94,9 +94,9 @@ namespace BlackCore::Vatsim } //! \copydoc swift::misc::TSettingTrait::defaultValue - static const BlackCore::Vatsim::CReaderSettings &defaultValue() + static const swift::core::vatsim::CReaderSettings &defaultValue() { - static const BlackCore::Vatsim::CReaderSettings reader { { 25.0, swift::misc::physical_quantities::CTimeUnit::s() }, { 120.0, swift::misc::physical_quantities::CTimeUnit::s() } }; + static const swift::core::vatsim::CReaderSettings reader { { 25.0, swift::misc::physical_quantities::CTimeUnit::s() }, { 120.0, swift::misc::physical_quantities::CTimeUnit::s() } }; return reader; } }; @@ -115,15 +115,15 @@ namespace BlackCore::Vatsim } //! \copydoc swift::misc::TSettingTrait::defaultValue - static const BlackCore::Vatsim::CReaderSettings &defaultValue() + static const swift::core::vatsim::CReaderSettings &defaultValue() { - static const BlackCore::Vatsim::CReaderSettings reader { { 35.0, swift::misc::physical_quantities::CTimeUnit::s() }, { 300.0, swift::misc::physical_quantities::CTimeUnit::s() } }; + static const swift::core::vatsim::CReaderSettings reader { { 35.0, swift::misc::physical_quantities::CTimeUnit::s() }, { 300.0, swift::misc::physical_quantities::CTimeUnit::s() } }; return reader; } }; //! FSD Message settings - class BLACKCORE_EXPORT CRawFsdMessageSettings : public swift::misc::CValueObject + class SWIFT_CORE_EXPORT CRawFsdMessageSettings : public swift::misc::CValueObject { public: //! File writing mode @@ -209,9 +209,9 @@ namespace BlackCore::Vatsim }; } // ns -Q_DECLARE_METATYPE(BlackCore::Vatsim::CReaderSettings) -Q_DECLARE_METATYPE(swift::misc::CCollection) -Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings) -Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings::FileWriteMode) +Q_DECLARE_METATYPE(swift::core::vatsim::CReaderSettings) +Q_DECLARE_METATYPE(swift::misc::CCollection) +Q_DECLARE_METATYPE(swift::core::vatsim::CRawFsdMessageSettings) +Q_DECLARE_METATYPE(swift::core::vatsim::CRawFsdMessageSettings::FileWriteMode) #endif diff --git a/src/blackcore/vatsim/vatsimstatusfilereader.cpp b/src/core/vatsim/vatsimstatusfilereader.cpp similarity index 96% rename from src/blackcore/vatsim/vatsimstatusfilereader.cpp rename to src/core/vatsim/vatsimstatusfilereader.cpp index 12883e4e9..75076ccd1 100644 --- a/src/blackcore/vatsim/vatsimstatusfilereader.cpp +++ b/src/core/vatsim/vatsimstatusfilereader.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/vatsim/vatsimstatusfilereader.h" -#include "blackcore/application.h" -#include "blackcore/data/globalsetup.h" +#include "core/vatsim/vatsimstatusfilereader.h" +#include "core/application.h" +#include "core/data/globalsetup.h" #include "misc/logmessage.h" #include "misc/network/url.h" #include "misc/statusmessage.h" @@ -26,9 +26,9 @@ using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; -using namespace BlackCore::Data; +using namespace swift::core::data; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { CVatsimStatusFileReader::CVatsimStatusFileReader(QObject *owner) : CThreadedReader(owner, "CVatsimStatusFileReader") { diff --git a/src/blackcore/vatsim/vatsimstatusfilereader.h b/src/core/vatsim/vatsimstatusfilereader.h similarity index 76% rename from src/blackcore/vatsim/vatsimstatusfilereader.h rename to src/core/vatsim/vatsimstatusfilereader.h index 7eb7cf263..d728a4554 100644 --- a/src/blackcore/vatsim/vatsimstatusfilereader.h +++ b/src/core/vatsim/vatsimstatusfilereader.h @@ -3,25 +3,25 @@ //! \file -#ifndef BLACKCORE_VATSIM_VATSIMSTATUSFILEREADER_H -#define BLACKCORE_VATSIM_VATSIMSTATUSFILEREADER_H +#ifndef SWIFT_CORE_VATSIM_VATSIMSTATUSFILEREADER_H +#define SWIFT_CORE_VATSIM_VATSIMSTATUSFILEREADER_H -#include "blackcore/blackcoreexport.h" -#include "blackcore/data/vatsimsetup.h" +#include "core/swiftcoreexport.h" +#include "core/data/vatsimsetup.h" #include "misc/datacache.h" #include "misc/network/entityflags.h" #include "misc/network/url.h" -#include "blackcore/threadedreader.h" +#include "core/threadedreader.h" #include class QNetworkReply; -namespace BlackCore::Vatsim +namespace swift::core::vatsim { //! Sole purpose is to read the URLs where VATSIM data can be downloaded //! \sa https://status.vatsim.net/ - class BLACKCORE_EXPORT CVatsimStatusFileReader : public BlackCore::CThreadedReader + class SWIFT_CORE_EXPORT CVatsimStatusFileReader : public swift::core::CThreadedReader { Q_OBJECT @@ -54,7 +54,7 @@ namespace BlackCore::Vatsim //! Data have been read, parse VATSIM file void parseVatsimFile(QNetworkReply *nwReply); - swift::misc::CData m_lastGoodSetup { this }; + swift::misc::CData m_lastGoodSetup { this }; }; } // ns diff --git a/src/blackcore/webdataservices.cpp b/src/core/webdataservices.cpp similarity index 98% rename from src/blackcore/webdataservices.cpp rename to src/core/webdataservices.cpp index f15499f3c..379506615 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/core/webdataservices.cpp @@ -1,20 +1,20 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextnetwork.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/airportdatareader.h" -#include "blackcore/db/infodatareader.h" -#include "blackcore/db/icaodatareader.h" -#include "blackcore/db/databasewriter.h" -#include "blackcore/db/modeldatareader.h" -#include "blackcore/vatsim/vatsimdatafilereader.h" -#include "blackcore/vatsim/vatsimmetarreader.h" -#include "blackcore/vatsim/vatsimstatusfilereader.h" -#include "blackcore/vatsim/vatsimserverfilereader.h" -#include "blackcore/webdataservices.h" -#include "blackcore/setupreader.h" -#include "blackcore/application.h" +#include "core/context/contextnetwork.h" +#include "core/data/globalsetup.h" +#include "core/db/airportdatareader.h" +#include "core/db/infodatareader.h" +#include "core/db/icaodatareader.h" +#include "core/db/databasewriter.h" +#include "core/db/modeldatareader.h" +#include "core/vatsim/vatsimdatafilereader.h" +#include "core/vatsim/vatsimmetarreader.h" +#include "core/vatsim/vatsimstatusfilereader.h" +#include "core/vatsim/vatsimserverfilereader.h" +#include "core/webdataservices.h" +#include "core/setupreader.h" +#include "core/application.h" #include "misc/fileutils.h" #include "misc/logcategories.h" #include "misc/logmessage.h" @@ -31,11 +31,11 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Db; -using namespace BlackCore::Data; -using namespace BlackCore::Vatsim; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::db; +using namespace swift::core::data; +using namespace swift::core::vatsim; +using namespace swift::core::context; using namespace swift::config; using namespace swift::misc; using namespace swift::misc::db; @@ -44,7 +44,7 @@ using namespace swift::misc::network; using namespace swift::misc::aviation; using namespace swift::misc::weather; -namespace BlackCore +namespace swift::core { CWebDataServices::CWebDataServices(CWebReaderFlags::WebReader readers, const CDatabaseReaderConfigList &dbReaderConfig, QObject *parent) : QObject(parent), m_dbReaderConfig(dbReaderConfig) { diff --git a/src/blackcore/webdataservices.h b/src/core/webdataservices.h similarity index 93% rename from src/blackcore/webdataservices.h rename to src/core/webdataservices.h index d21056b84..be0fac526 100644 --- a/src/blackcore/webdataservices.h +++ b/src/core/webdataservices.h @@ -3,12 +3,12 @@ //! \file -#ifndef BLACKCORE_WEBDATASERVICES_H -#define BLACKCORE_WEBDATASERVICES_H +#ifndef SWIFT_CORE_WEBDATASERVICES_H +#define SWIFT_CORE_WEBDATASERVICES_H -#include "blackcore/db/databasereader.h" -#include "blackcore/webreaderflags.h" -#include "blackcore/blackcoreexport.h" +#include "core/db/databasereader.h" +#include "core/webreaderflags.h" +#include "core/swiftcoreexport.h" #include "misc/simulation/aircraftmodellist.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/distributorlist.h" @@ -52,9 +52,9 @@ namespace swift::misc } } -namespace BlackCore +namespace swift::core { - namespace Vatsim + namespace vatsim { class CVatsimDataFileReader; class CVatsimMetarReader; @@ -62,7 +62,7 @@ namespace BlackCore class CVatsimServerFileReader; } - namespace Db + namespace db { class CAirportDataReader; class CDatabaseWriter; @@ -75,7 +75,7 @@ namespace BlackCore /*! * Encapsulates reading data from web sources */ - class BLACKCORE_EXPORT CWebDataServices : + class SWIFT_CORE_EXPORT CWebDataServices : public QObject { Q_OBJECT @@ -84,8 +84,8 @@ namespace BlackCore //! Log categories static const QStringList &getLogCategories(); - //! Constructor, only allowed from BlackCore::CApplication - CWebDataServices(CWebReaderFlags::WebReader readerFlags, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig, QObject *parent = nullptr); + //! Constructor, only allowed from swift::core::CApplication + CWebDataServices(CWebReaderFlags::WebReader readerFlags, const swift::core::db::CDatabaseReaderConfigList &dbReaderConfig, QObject *parent = nullptr); //! Destructor virtual ~CWebDataServices() override; @@ -94,19 +94,19 @@ namespace BlackCore void gracefulShutdown(); //! Data file reader - Vatsim::CVatsimDataFileReader *getVatsimDataFileReader() const { return m_vatsimDataFileReader; } + vatsim::CVatsimDataFileReader *getVatsimDataFileReader() const { return m_vatsimDataFileReader; } //! Metar reader - Vatsim::CVatsimMetarReader *getMetarReader() const { return m_vatsimMetarReader; } + vatsim::CVatsimMetarReader *getMetarReader() const { return m_vatsimMetarReader; } //! DB info data reader - BlackCore::Db::CInfoDataReader *getDbInfoDataReader() const { return m_dbInfoDataReader; } + swift::core::db::CInfoDataReader *getDbInfoDataReader() const { return m_dbInfoDataReader; } //! Shared info data reader - BlackCore::Db::CInfoDataReader *getSharedInfoDataReader() const { return m_sharedInfoDataReader; } + swift::core::db::CInfoDataReader *getSharedInfoDataReader() const { return m_sharedInfoDataReader; } //! DB writer class - Db::CDatabaseWriter *getDatabaseWriter() const { return m_databaseWriter; } + db::CDatabaseWriter *getDatabaseWriter() const { return m_databaseWriter; } //! All DB entities for those readers used and not ignored swift::misc::network::CEntityFlags::Entity allDbEntitiesForUsedReaders() const; @@ -568,7 +568,7 @@ namespace BlackCore void initSharedInfoObjectReaderAndTriggerRead(); //! DB reader for given entity - Db::CDatabaseReader *getDbReader(swift::misc::network::CEntityFlags::Entity entity) const; + db::CDatabaseReader *getDbReader(swift::misc::network::CEntityFlags::Entity entity) const; //! Init the writers void initWriters(); @@ -577,7 +577,7 @@ namespace BlackCore bool signalEntitiesAlreadyRead(swift::misc::network::CEntityFlags::Entity entities); //! Info object count from shared/DB info objects - int getInfoObjectCount(swift::misc::network::CEntityFlags::Entity entity, BlackCore::Db::CInfoDataReader *reader) const; + int getInfoObjectCount(swift::misc::network::CEntityFlags::Entity entity, swift::core::db::CInfoDataReader *reader) const; //! Entities from DB with cached data (i.e. count > 0) //! \remark requires the caches already read @@ -596,29 +596,29 @@ namespace BlackCore //! Wait for info objects to be read //! \return true means info objects available - bool waitForInfoObjectsThenRead(swift::misc::network::CEntityFlags::Entity entities, const QString &info, BlackCore::Db::CInfoDataReader *infoReader, QDateTime &timeOut); + bool waitForInfoObjectsThenRead(swift::misc::network::CEntityFlags::Entity entities, const QString &info, swift::core::db::CInfoDataReader *infoReader, QDateTime &timeOut); swift::misc::network::CEntityFlags::Entity m_entitiesPeriodicallyRead = swift::misc::network::CEntityFlags::NoEntity; //!< entities permanently updated by timers swift::misc::network::CEntityFlags::Entity m_swiftDbEntitiesRead = swift::misc::network::CEntityFlags::NoEntity; //!< entities read - BlackCore::Db::CDatabaseReaderConfigList m_dbReaderConfig; //!< how to read DB data + swift::core::db::CDatabaseReaderConfigList m_dbReaderConfig; //!< how to read DB data std::atomic_bool m_shuttingDown { false }; //!< shutting down? QDateTime m_dbInfoObjectTimeout; //!< started reading DB info objects QDateTime m_sharedInfoObjectsTimeout; //!< started reading shared info objects QSet m_signalledEntities; //!< remember signalled entites // for reading XML and VATSIM data files - Vatsim::CVatsimStatusFileReader *m_vatsimStatusReader = nullptr; - Vatsim::CVatsimDataFileReader *m_vatsimDataFileReader = nullptr; - Vatsim::CVatsimMetarReader *m_vatsimMetarReader = nullptr; - Vatsim::CVatsimServerFileReader *m_vatsimServerFileReader = nullptr; - Db::CIcaoDataReader *m_icaoDataReader = nullptr; - Db::CModelDataReader *m_modelDataReader = nullptr; - Db::CAirportDataReader *m_airportDataReader = nullptr; - Db::CInfoDataReader *m_dbInfoDataReader = nullptr; - Db::CInfoDataReader *m_sharedInfoDataReader = nullptr; + vatsim::CVatsimStatusFileReader *m_vatsimStatusReader = nullptr; + vatsim::CVatsimDataFileReader *m_vatsimDataFileReader = nullptr; + vatsim::CVatsimMetarReader *m_vatsimMetarReader = nullptr; + vatsim::CVatsimServerFileReader *m_vatsimServerFileReader = nullptr; + db::CIcaoDataReader *m_icaoDataReader = nullptr; + db::CModelDataReader *m_modelDataReader = nullptr; + db::CAirportDataReader *m_airportDataReader = nullptr; + db::CInfoDataReader *m_dbInfoDataReader = nullptr; + db::CInfoDataReader *m_sharedInfoDataReader = nullptr; // writing objects directly into DB - Db::CDatabaseWriter *m_databaseWriter = nullptr; + db::CDatabaseWriter *m_databaseWriter = nullptr; }; } // namespace diff --git a/src/blackcore/webdataservicesms.cpp b/src/core/webdataservicesms.cpp similarity index 86% rename from src/blackcore/webdataservicesms.cpp rename to src/core/webdataservicesms.cpp index a70d44f04..70532cbae 100644 --- a/src/blackcore/webdataservicesms.cpp +++ b/src/core/webdataservicesms.cpp @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webdataservicesms.h" -#include "blackcore/webdataservices.h" -#include "blackcore/application.h" +#include "core/webdataservicesms.h" +#include "core/webdataservices.h" +#include "core/application.h" #include "misc/aviation/aircrafticaocodelist.h" using namespace swift::misc::aviation; -namespace BlackCore +namespace swift::core { int MSWebServices::countAircraftIcaoCodesForDesignator(const QString &designator) const { diff --git a/src/blackcore/webdataservicesms.h b/src/core/webdataservicesms.h similarity index 77% rename from src/blackcore/webdataservicesms.h rename to src/core/webdataservicesms.h index 743b4feae..a2779b548 100644 --- a/src/blackcore/webdataservicesms.h +++ b/src/core/webdataservicesms.h @@ -3,21 +3,21 @@ //! \file -#ifndef BLACKCORE_WEBDATASERVICES_MATCHINGSCRIPT_H -#define BLACKCORE_WEBDATASERVICES_MATCHINGSCRIPT_H +#ifndef SWIFT_CORE_WEBDATASERVICES_MATCHINGSCRIPT_H +#define SWIFT_CORE_WEBDATASERVICES_MATCHINGSCRIPT_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include -namespace BlackCore +namespace swift::core { /*! * Encapsulates reading data from web sources */ //! Access to database - class BLACKCORE_EXPORT MSWebServices : public QObject + class SWIFT_CORE_EXPORT MSWebServices : public QObject { Q_OBJECT diff --git a/src/blackcore/webreaderflags.cpp b/src/core/webreaderflags.cpp similarity index 98% rename from src/blackcore/webreaderflags.cpp rename to src/core/webreaderflags.cpp index 3b174baaa..c55072e49 100644 --- a/src/blackcore/webreaderflags.cpp +++ b/src/core/webreaderflags.cpp @@ -1,11 +1,11 @@ // SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webreaderflags.h" +#include "core/webreaderflags.h" using namespace swift::misc::network; -namespace BlackCore +namespace swift::core { CWebReaderFlags::WebReader CWebReaderFlags::entitiesToReaders(CEntityFlags::Entity entities) { diff --git a/src/blackcore/webreaderflags.h b/src/core/webreaderflags.h similarity index 85% rename from src/blackcore/webreaderflags.h rename to src/core/webreaderflags.h index d429d3d7f..032b1e426 100644 --- a/src/blackcore/webreaderflags.h +++ b/src/core/webreaderflags.h @@ -3,21 +3,21 @@ //! \file -#ifndef BLACKCORE_CWEBREADERFLAGS_H -#define BLACKCORE_CWEBREADERFLAGS_H +#ifndef SWIFT_CORE_CWEBREADERFLAGS_H +#define SWIFT_CORE_CWEBREADERFLAGS_H -#include "blackcore/blackcoreexport.h" +#include "core/swiftcoreexport.h" #include "misc/network/entityflags.h" #include #include -namespace BlackCore +namespace swift::core { /*! * Flags reg. the web readers */ - class BLACKCORE_EXPORT CWebReaderFlags + class SWIFT_CORE_EXPORT CWebReaderFlags { public: //! Which readers to init @@ -61,8 +61,8 @@ namespace BlackCore }; } // namespace -Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::WebReaderFlag) -Q_DECLARE_METATYPE(BlackCore::CWebReaderFlags::WebReader) -Q_DECLARE_OPERATORS_FOR_FLAGS(BlackCore::CWebReaderFlags::WebReader) +Q_DECLARE_METATYPE(swift::core::CWebReaderFlags::WebReaderFlag) +Q_DECLARE_METATYPE(swift::core::CWebReaderFlags::WebReader) +Q_DECLARE_OPERATORS_FOR_FLAGS(swift::core::CWebReaderFlags::WebReader) #endif diff --git a/src/misc/network/data/lastserver.h b/src/misc/network/data/lastserver.h index a2fefcdd6..387dfae24 100644 --- a/src/misc/network/data/lastserver.h +++ b/src/misc/network/data/lastserver.h @@ -14,13 +14,13 @@ namespace swift::misc::network::data //! Trait for last (most recently) used server and user struct TLastServer : public TDataTrait { - //! \copydoc BlackCore::TDataTrait::key + //! \copydoc swift::core::TDataTrait::key static const char *key() { return "lastserver"; } - //! \copydoc BlackCore::TDataTrait::isPinned + //! \copydoc swift::core::TDataTrait::isPinned static constexpr bool isPinned() { return true; } - //! \copydoc BlackCore::TDataTrait::humanReadable + //! \copydoc swift::core::TDataTrait::humanReadable static const QString &humanReadable() { static const QString name("Last used server"); diff --git a/src/misc/sharedstate/dbus/hub.h b/src/misc/sharedstate/dbus/hub.h index 90dbc0df2..68773fe23 100644 --- a/src/misc/sharedstate/dbus/hub.h +++ b/src/misc/sharedstate/dbus/hub.h @@ -6,7 +6,7 @@ #ifndef SWIFT_MISC_SHAREDSTATE_DBUS_HUB_H #define SWIFT_MISC_SHAREDSTATE_DBUS_HUB_H -#include "blackcore/corefacadeconfig.h" +#include "core/corefacadeconfig.h" #include "misc/swiftmiscexport.h" #include #include diff --git a/src/misc/simulation/aircraftmodelloader.h b/src/misc/simulation/aircraftmodelloader.h index 56ce63cbd..ef457961a 100644 --- a/src/misc/simulation/aircraftmodelloader.h +++ b/src/misc/simulation/aircraftmodelloader.h @@ -88,7 +88,7 @@ namespace swift::misc::simulation static bool needsCacheSynchronized(LoadMode mode); //! Callback to consolidate data, normally with DB data - //! \remark this has to be a abstarct, as DB handling is subject of BlackCore + //! \remark this has to be a abstarct, as DB handling is subject of swift::core using ModelConsolidationCallback = std::function; //! Destructor diff --git a/src/misc/simulation/remoteaircraftprovider.h b/src/misc/simulation/remoteaircraftprovider.h index 5046646e4..857a38b55 100644 --- a/src/misc/simulation/remoteaircraftprovider.h +++ b/src/misc/simulation/remoteaircraftprovider.h @@ -400,7 +400,7 @@ namespace swift::misc::simulation //! An aircraft disappeared void removedAircraft(const swift::misc::aviation::CCallsign &callsign); - //! \copydoc BlackCore::CAirspaceAnalyzer::airspaceAircraftSnapshot + //! \copydoc swift::core::CAirspaceAnalyzer::airspaceAircraftSnapshot void airspaceAircraftSnapshot(const swift::misc::simulation::CAirspaceAircraftSnapshot &snapshot); protected: diff --git a/src/misc/simulation/settings/fgswiftbussettings.h b/src/misc/simulation/settings/fgswiftbussettings.h index 482c164d5..653675b7c 100644 --- a/src/misc/simulation/settings/fgswiftbussettings.h +++ b/src/misc/simulation/settings/fgswiftbussettings.h @@ -61,7 +61,7 @@ namespace swift::misc::simulation::settings //! \copydoc swift::misc::TSettingTrait::key static const char *key() { return "fgswiftbus/settings"; } - //! \copydoc BlackCore::TSettingTrait::humanReadable + //! \copydoc swift::core::TSettingTrait::humanReadable static const QString &humanReadable() { static const QString name("FGSwiftBus"); diff --git a/src/misc/simulation/simulatorplugininfo.h b/src/misc/simulation/simulatorplugininfo.h index 3ee2531da..a1c553586 100644 --- a/src/misc/simulation/simulatorplugininfo.h +++ b/src/misc/simulation/simulatorplugininfo.h @@ -38,7 +38,7 @@ namespace swift::misc::simulation //! Check if the provided plugin metadata is valid. //! Simulator plugin (driver) has to meet the following requirements: - //! * implements org.swift-project.blackcore.simulatorinterface; + //! * implements org.swift-project.swift_core.simulatorinterface; //! * provides plugin name; //! * specifies simulator it handles. //! Unspecified sim is considered as invalid. diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index 4fb86d0fb..fac1896ee 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -3,7 +3,7 @@ #include "simulatoremulated.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/simulatorplugininfo.h" #include "misc/aviation/altitude.h" #include "misc/math/mathutils.h" @@ -21,8 +21,8 @@ using namespace swift::misc::network; using namespace swift::misc::math; using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; namespace BlackSimPlugin::Emulated { diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index d3a79e671..db47ffbd0 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -27,14 +27,14 @@ namespace BlackSimPlugin::Emulated class CSimulatorEmulated : public Common::CSimulatorPluginCommon { Q_OBJECT - Q_INTERFACES(BlackCore::ISimulator) + Q_INTERFACES(swift::core::ISimulator) Q_INTERFACES(swift::misc::simulation::ISimulationEnvironmentProvider) Q_INTERFACES(swift::misc::simulation::IInterpolationSetupProvider) friend class CSimulatorEmulatedMonitorDialog; //!< the monitor widget represents the simulator and needs access to internals (i.e. private/protected) public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorEmulated( const swift::misc::simulation::CSimulatorPluginInfo &info, swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, @@ -78,7 +78,7 @@ namespace BlackSimPlugin::Emulated //! .drv show show emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated //! .drv hide hide emulated driver window BlackSimPlugin::Swift::CSimulatorEmulated //! - //! \copydoc BlackCore::ISimulator::parseCommandLine + //! \copydoc swift::core::ISimulator::parseCommandLine virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! UI setter @@ -129,7 +129,7 @@ namespace BlackSimPlugin::Emulated virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; virtual int physicallyRemoveAllRemoteAircraft() override; - //! \copydoc BlackCore::ISimulator::parseDetails + //! \copydoc swift::core::ISimulator::parseDetails virtual bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override; private: @@ -176,7 +176,7 @@ namespace BlackSimPlugin::Emulated }; //! Listener for swift - class CSimulatorEmulatedListener : public BlackCore::ISimulatorListener + class CSimulatorEmulatedListener : public swift::core::ISimulatorListener { Q_OBJECT @@ -185,13 +185,13 @@ namespace BlackSimPlugin::Emulated CSimulatorEmulatedListener(const swift::misc::simulation::CSimulatorPluginInfo &info); protected: - //! \copydoc BlackCore::ISimulatorListener::startImpl + //! \copydoc swift::core::ISimulatorListener::startImpl virtual void startImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void stopImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void checkImpl() override; }; } // ns diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp index 2044c335f..6e6bc5e2b 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.cpp @@ -11,16 +11,16 @@ using namespace swift::misc::simulation; namespace BlackSimPlugin::Emulated { - BlackCore::ISimulator *CSimulatorEmulatedFactory::create(const CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *remoteAircraftProvider, - network::IClientProvider *clientProvider) + swift::core::ISimulator *CSimulatorEmulatedFactory::create(const CSimulatorPluginInfo &info, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + network::IClientProvider *clientProvider) { Q_ASSERT(ownAircraftProvider); return new CSimulatorEmulated(info, ownAircraftProvider, remoteAircraftProvider, clientProvider, this); } - BlackCore::ISimulatorListener *CSimulatorEmulatedFactory::createListener(const CSimulatorPluginInfo &info) + swift::core::ISimulatorListener *CSimulatorEmulatedFactory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorEmulatedListener(info); } diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.h b/src/plugins/simulator/emulated/simulatoremulatedfactory.h index 0a338eafd..d87d1056b 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.h +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.h @@ -6,7 +6,7 @@ #ifndef BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H #define BLACKSIMPLUGIN_EMULATED_SIMULATOREMULATEDFACTORY_H -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatorplugininfo.h" #include @@ -17,21 +17,21 @@ namespace BlackSimPlugin::Emulated //! Factory implementation to create CSimulatorEmulated instances class CSimulatorEmulatedFactory : public QObject, - public BlackCore::ISimulatorFactory + public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatoremulated.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatoremulated.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; }; } // namespace diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index d293f3318..fb39ea7c0 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -4,7 +4,7 @@ #include "simulatoremulatedmonitordialog.h" #include "ui_simulatoremulatedmonitordialog.h" #include "simulatoremulated.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "blackgui/components/cockpitcomtransmissioncomponent.h" #include "blackgui/guiapplication.h" #include "misc/logmessage.h" diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp index a11472334..f9b90550d 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "flightgearmpaircraft.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/interpolation/interpolatormulti.h" -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h index 5efe47644..67393b44f 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.h @@ -11,7 +11,7 @@ #include #include -namespace BlackCore +namespace swift::core { class ISimulator; } @@ -26,7 +26,7 @@ namespace BlackSimPlugin::Flightgear //! Constructor providing initial situation/parts CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, - BlackCore::ISimulator *simulator, + swift::core::ISimulator *simulator, swift::misc::simulation::CInterpolationLogger *logger); //! Destructor diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index d59560f1c..dd832b61b 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -5,7 +5,7 @@ #include "qcompilerdetection.h" #include "fgswiftbusserviceproxy.h" #include "fgswiftbustrafficproxy.h" -#include "blackcore/aircraftmatcher.h" +#include "core/aircraftmatcher.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/simulatedaircraftlist.h" @@ -61,7 +61,7 @@ using namespace swift::misc::simulation; using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::weather; -using namespace BlackCore; +using namespace swift::core; namespace { diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.h b/src/plugins/simulator/flightgear/simulatorflightgear.h index ce60fbee7..c3d3fca72 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.h +++ b/src/plugins/simulator/flightgear/simulatorflightgear.h @@ -249,7 +249,7 @@ namespace BlackSimPlugin::Flightgear }; //! Listener waits for fgswiftbus service to show up - class CSimulatorFlightgearListener : public BlackCore::ISimulatorListener + class CSimulatorFlightgearListener : public swift::core::ISimulatorListener { Q_OBJECT @@ -258,13 +258,13 @@ namespace BlackSimPlugin::Flightgear CSimulatorFlightgearListener(const swift::misc::simulation::CSimulatorPluginInfo &info); protected: - //! \copydoc BlackCore::ISimulatorListener::startImpl + //! \copydoc swift::core::ISimulatorListener::startImpl virtual void startImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void stopImpl() override; - //! \copydoc BlackCore::ISimulatorListener::checkImpl + //! \copydoc swift::core::ISimulatorListener::checkImpl virtual void checkImpl() override; private: @@ -282,21 +282,21 @@ namespace BlackSimPlugin::Flightgear }; //! Factory for creating CSimulatorFlightgear instance - class CSimulatorFlightgearFactory : public QObject, public BlackCore::ISimulatorFactory + class CSimulatorFlightgearFactory : public QObject, public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorflightgear.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatorflightgear.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorFlightgearListener(info); } + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorFlightgearListener(info); } }; } // ns diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp index ba7844dfb..8c35bf6bc 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp @@ -3,7 +3,7 @@ #include "ui_simulatorflightgearconfigwindow.h" #include "simulatorflightgearconfigwindow.h" -#include "blackcore/application.h" +#include "core/application.h" #include "blackgui/guiapplication.h" #include diff --git a/src/plugins/simulator/fs9/fs9client.cpp b/src/plugins/simulator/fs9/fs9client.cpp index 46c291f0c..5aae516d5 100644 --- a/src/plugins/simulator/fs9/fs9client.cpp +++ b/src/plugins/simulator/fs9/fs9client.cpp @@ -9,7 +9,7 @@ #include "directplayerror.h" #include "directplayutils.h" #include "../fscommon/simulatorfscommonfunctions.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/aviation/aircraftsituation.h" #include "misc/geo/coordinategeodetic.h" #include "misc/logmessage.h" @@ -20,7 +20,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::simulation; using namespace swift::misc::physical_quantities; using namespace swift::misc::geo; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::FsCommon; namespace BlackSimPlugin::Fs9 diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h index 414a5fe1b..d4f5a0d8f 100644 --- a/src/plugins/simulator/fs9/fs9client.h +++ b/src/plugins/simulator/fs9/fs9client.h @@ -14,7 +14,7 @@ //! \file -namespace BlackCore +namespace swift::core { class ISimulator; } @@ -37,7 +37,7 @@ namespace BlackSimPlugin::Fs9 CFs9Client(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft, const swift::misc::physical_quantities::CTime &updateInterval, swift::misc::simulation::CInterpolationLogger *logger, - BlackCore::ISimulator *simulator); + swift::core::ISimulator *simulator); //! Destructor virtual ~CFs9Client() override; @@ -96,7 +96,7 @@ namespace BlackSimPlugin::Fs9 void handleConnectionCompleted(); //! Simulator interface - const BlackCore::ISimulator *simulator() const; + const swift::core::ISimulator *simulator() const; swift::misc::simulation::CSimulatedAircraft m_remoteAircraft; swift::misc::physical_quantities::CTime m_updateInterval; diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp index 38f35ee66..d34a09c98 100644 --- a/src/plugins/simulator/fs9/fs9host.cpp +++ b/src/plugins/simulator/fs9/fs9host.cpp @@ -3,7 +3,7 @@ #define _CRT_SECURE_NO_WARNINGS -#include "blackcore/application.h" +#include "core/application.h" #include "misc/logmessage.h" #include "directplayerror.h" #include "directplayutils.h" diff --git a/src/plugins/simulator/fs9/lobbyclient.cpp b/src/plugins/simulator/fs9/lobbyclient.cpp index 7ef65a0c1..0f760fec0 100644 --- a/src/plugins/simulator/fs9/lobbyclient.cpp +++ b/src/plugins/simulator/fs9/lobbyclient.cpp @@ -3,8 +3,8 @@ #define _CRT_SECURE_NO_WARNINGS -#include "blackcore/actionbind.h" -#include "blackcore/application.h" +#include "core/actionbind.h" +#include "core/application.h" #include "directplayerror.h" #include "directplayutils.h" #include "fs9.h" diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index 1a6815165..fe86ea2e0 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -29,7 +29,7 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::FsCommon; using namespace swift::config; diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index 80e87f642..439d8370f 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -10,7 +10,7 @@ #include "fs9client.h" #include "lobbyclient.h" #include "../fscommon/simulatorfscommon.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/settings/simulatorsettings.h" #include "misc/simulation/interpolation/interpolator.h" #include "misc/simulation/simulatedaircraft.h" @@ -31,7 +31,7 @@ namespace BlackSimPlugin::Fs9 Q_OBJECT public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorFs9(const swift::misc::simulation::CSimulatorPluginInfo &info, const QSharedPointer &fs9Host, const QSharedPointer &lobbyClient, @@ -109,7 +109,7 @@ namespace BlackSimPlugin::Fs9 //! Listener starts the FS9 multiplayer host and tries to make the running instance //! of simulator to connect to it. When emitting the simulatorStarted() signal, //! FS9 is already connected. - class CSimulatorFs9Listener : public BlackCore::ISimulatorListener + class CSimulatorFs9Listener : public swift::core::ISimulatorListener { Q_OBJECT @@ -120,13 +120,13 @@ namespace BlackSimPlugin::Fs9 const QSharedPointer &lobbyClient); protected: - //! \copydoc BlackCore::ISimulatorListener::startImpl + //! \copydoc swift::core::ISimulatorListener::startImpl virtual void startImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void stopImpl() override; - //! \copydoc BlackCore::ISimulatorListener::checkImpl + //! \copydoc swift::core::ISimulatorListener::checkImpl virtual void checkImpl() override; private: @@ -142,11 +142,11 @@ namespace BlackSimPlugin::Fs9 }; //! Factory implementation to create CSimulatorFs9 instances - class CSimulatorFs9Factory : public QObject, public BlackCore::ISimulatorFactory + class CSimulatorFs9Factory : public QObject, public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorfs9.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.blaswift_coreckcore.simulatorinterface" FILE "simulatorfs9.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: //! Constructor @@ -155,15 +155,15 @@ namespace BlackSimPlugin::Fs9 //! Destructor virtual ~CSimulatorFs9Factory() override; - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create( + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; private: QSharedPointer m_fs9Host; diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.cpp b/src/plugins/simulator/fscommon/simulatorfscommon.cpp index aba57ed85..51c447ac4 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.cpp +++ b/src/plugins/simulator/fscommon/simulatorfscommon.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "simulatorfscommon.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include "misc/simplecommandparser.h" #include "misc/logmessage.h" #include "misc/stringutils.h" @@ -14,7 +14,7 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::Common; namespace BlackSimPlugin::FsCommon diff --git a/src/plugins/simulator/fscommon/simulatorfscommon.h b/src/plugins/simulator/fscommon/simulatorfscommon.h index 0d0111bac..91d8eaff5 100644 --- a/src/plugins/simulator/fscommon/simulatorfscommon.h +++ b/src/plugins/simulator/fscommon/simulatorfscommon.h @@ -20,7 +20,7 @@ namespace BlackSimPlugin::FsCommon class FSCOMMON_EXPORT CSimulatorFsCommon : public Common::CSimulatorPluginCommon { Q_OBJECT - Q_INTERFACES(BlackCore::ISimulator) + Q_INTERFACES(swift::core::ISimulator) Q_INTERFACES(swift::misc::simulation::ISimulationEnvironmentProvider) Q_INTERFACES(swift::misc::simulation::IInterpolationSetupProvider) @@ -51,7 +51,7 @@ namespace BlackSimPlugin::FsCommon //! When swift DB data are read virtual void onSwiftDbAirportsRead() override; - //! \copydoc BlackCore::ISimulator::reset + //! \copydoc swift::core::ISimulator::reset virtual void reset() override; //! Register help diff --git a/src/plugins/simulator/fsx/simulatorfsx.cpp b/src/plugins/simulator/fsx/simulatorfsx.cpp index 1b0c5f6f6..7ca17b84b 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.cpp +++ b/src/plugins/simulator/fsx/simulatorfsx.cpp @@ -11,7 +11,7 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; -using namespace BlackCore; +using namespace swift::core; namespace BlackSimPlugin::Fsx { diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index 2d1591422..68125420f 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -16,7 +16,7 @@ namespace BlackSimPlugin::Fsx Q_OBJECT public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorFsx(const swift::misc::simulation::CSimulatorPluginInfo &info, swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp index 7d905a61d..80f8d32ba 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.cpp +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; namespace BlackSimPlugin::Fsx { diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h index 136cae6ee..ec4318fde 100644 --- a/src/plugins/simulator/fsx/simulatorfsxfactory.h +++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h @@ -6,7 +6,7 @@ #ifndef BLACKSIMPLUGIN_SIMULATOR_FSXFACTORY_H #define BLACKSIMPLUGIN_SIMULATOR_FSXFACTORY_H -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatorplugininfo.h" #include @@ -17,21 +17,21 @@ namespace BlackSimPlugin::Fsx //! Factory implementation to create CSimulatorFsx instances class CSimulatorFsxFactory : public QObject, - public BlackCore::ISimulatorFactory + public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorfsx.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatorfsx.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; }; } // namespace diff --git a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp index 1c6dadde8..0eeb8cd8d 100644 --- a/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp @@ -6,14 +6,14 @@ #include "simulatorfsxcommon.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "config/buildconfig.h" #include #include -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::simulation; diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index 82cbd4103..d49400704 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -4,8 +4,8 @@ #include "simconnectobject.h" #include "misc/stringutils.h" #include "simulatorfsxcommon.h" -#include "blackcore/simulator.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" +#include "core/simulator.h" #include "misc/simulation/interpolation/interpolatormulti.h" #include "config/buildconfig.h" @@ -13,7 +13,7 @@ using namespace swift::config; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; namespace BlackSimPlugin::FsxCommon { diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index e51c14e6f..97a0042a2 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -4,8 +4,8 @@ #include "simconnectsettingscomponent.h" #include "ui_simconnectsettingscomponent.h" #include "blackgui/guiapplication.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextapplication.h" +#include "core/context/contextsimulator.h" #include "misc/simulation/fsx/simconnectutilities.h" #include "misc/network/networkutils.h" #include "misc/logmessage.h" diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 512b0fa89..d0dde5e2e 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -4,7 +4,7 @@ #include "simulatorfsxcommon.h" #include "simconnectsymbols.h" #include "../fscommon/simulatorfscommonfunctions.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/network/textmessage.h" #include "misc/simulation/fsx/simconnectutilities.h" #include "misc/simulation/fscommon/aircraftcfgparser.h" @@ -41,7 +41,7 @@ using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; using namespace swift::misc::simulation::Fsx; using namespace swift::misc::simulation::settings; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::FsCommon; namespace BlackSimPlugin::FsxCommon diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index 34c677317..fca5681b5 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -11,7 +11,7 @@ #include "plugins/simulator/fsxcommon/simconnectobject.h" #include "plugins/simulator/fsxcommon/simconnectwindows.h" #include "plugins/simulator/fscommon/simulatorfscommon.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/interpolation/interpolatorlinear.h" #include "misc/simulation/simulatorplugininfo.h" #include "misc/simulation/settings/simulatorsettings.h" @@ -118,12 +118,12 @@ namespace BlackSimPlugin::FsxCommon class FSXCOMMON_EXPORT CSimulatorFsxCommon : public FsCommon::CSimulatorFsCommon { Q_OBJECT - Q_INTERFACES(BlackCore::ISimulator) + Q_INTERFACES(swift::core::ISimulator) Q_INTERFACES(swift::misc::simulation::ISimulationEnvironmentProvider) Q_INTERFACES(swift::misc::simulation::IInterpolationSetupProvider) public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorFsxCommon(const swift::misc::simulation::CSimulatorPluginInfo &info, swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, @@ -644,7 +644,7 @@ namespace BlackSimPlugin::FsxCommon }; //! Listener for FSX - class FSXCOMMON_EXPORT CSimulatorFsxCommonListener : public BlackCore::ISimulatorListener + class FSXCOMMON_EXPORT CSimulatorFsxCommonListener : public swift::core::ISimulatorListener { Q_OBJECT @@ -652,17 +652,17 @@ namespace BlackSimPlugin::FsxCommon //! Constructor CSimulatorFsxCommonListener(const swift::misc::simulation::CSimulatorPluginInfo &info); - //! \copydoc BlackCore::ISimulatorListener::backendInfo + //! \copydoc swift::core::ISimulatorListener::backendInfo virtual QString backendInfo() const override; protected: - //! \copydoc BlackCore::ISimulatorListener::startImpl + //! \copydoc swift::core::ISimulatorListener::startImpl virtual void startImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void stopImpl() override; - //! \copydoc BlackCore::ISimulatorListener::checkImpl + //! \copydoc swift::core::ISimulatorListener::checkImpl virtual void checkImpl() override; private: diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 3e396d624..1f424c827 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -3,7 +3,7 @@ #include "simulatorfsxcommon.h" #include "simconnectdatadefinition.h" -#include "blackcore/application.h" +#include "core/application.h" #include "misc/simulation/fscommon/bcdconversions.h" #include "misc/simulation/fsx/simconnectutilities.h" #include "misc/simulation/simulatorplugininfo.h" @@ -13,7 +13,7 @@ #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::config; using namespace swift::misc; using namespace swift::misc::simulation; diff --git a/src/plugins/simulator/msfs/simulatormsfs.cpp b/src/plugins/simulator/msfs/simulatormsfs.cpp index 9f5fc8a52..0b6b184b1 100644 --- a/src/plugins/simulator/msfs/simulatormsfs.cpp +++ b/src/plugins/simulator/msfs/simulatormsfs.cpp @@ -11,7 +11,7 @@ using namespace swift::misc::geo; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::FsxCommon; namespace BlackSimPlugin::Msfs diff --git a/src/plugins/simulator/msfs/simulatormsfs.h b/src/plugins/simulator/msfs/simulatormsfs.h index 9798da5d4..bc975fbf3 100644 --- a/src/plugins/simulator/msfs/simulatormsfs.h +++ b/src/plugins/simulator/msfs/simulatormsfs.h @@ -16,7 +16,7 @@ namespace BlackSimPlugin::Msfs Q_OBJECT public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorMsFs(const swift::misc::simulation::CSimulatorPluginInfo &info, swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, diff --git a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp b/src/plugins/simulator/msfs/simulatormsfsfactory.cpp index 778d46dc9..b47055557 100644 --- a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp +++ b/src/plugins/simulator/msfs/simulatormsfsfactory.cpp @@ -7,7 +7,7 @@ using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; +using namespace swift::core; namespace BlackSimPlugin::Msfs { diff --git a/src/plugins/simulator/msfs/simulatormsfsfactory.h b/src/plugins/simulator/msfs/simulatormsfsfactory.h index f585fe5ff..a9a10459a 100644 --- a/src/plugins/simulator/msfs/simulatormsfsfactory.h +++ b/src/plugins/simulator/msfs/simulatormsfsfactory.h @@ -6,7 +6,7 @@ #ifndef BLACKSIMPLUGIN_SIMULATOR_MSFSFACTORY_H #define BLACKSIMPLUGIN_SIMULATOR_MSFSFACTORY_H -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatorplugininfo.h" #include @@ -17,21 +17,21 @@ namespace BlackSimPlugin::Msfs //! Factory implementation to create CSimulatorFsx instances class CSimulatorMsFsFactory : public QObject, - public BlackCore::ISimulatorFactory + public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatormsfs.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatormsfs.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; }; } // namespace diff --git a/src/plugins/simulator/p3d/simulatorp3d.cpp b/src/plugins/simulator/p3d/simulatorp3d.cpp index f4e0f8b73..c290e73ef 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.cpp +++ b/src/plugins/simulator/p3d/simulatorp3d.cpp @@ -17,7 +17,7 @@ using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::misc::simulation::fscommon; using namespace BlackSimPlugin::FsxCommon; -using namespace BlackCore; +using namespace swift::core; using namespace BlackSimPlugin::FsCommon; namespace BlackSimPlugin::P3D diff --git a/src/plugins/simulator/p3d/simulatorp3d.h b/src/plugins/simulator/p3d/simulatorp3d.h index d8dd17031..cf8e74412 100644 --- a/src/plugins/simulator/p3d/simulatorp3d.h +++ b/src/plugins/simulator/p3d/simulatorp3d.h @@ -23,12 +23,12 @@ namespace BlackSimPlugin::P3D class CSimulatorP3D : public FsxCommon::CSimulatorFsxCommon { Q_OBJECT - Q_INTERFACES(BlackCore::ISimulator) + Q_INTERFACES(swift::core::ISimulator) Q_INTERFACES(swift::misc::simulation::ISimulationEnvironmentProvider) Q_INTERFACES(swift::misc::simulation::IInterpolationSetupProvider) public: - //! Constructor, parameters as in \sa BlackCore::ISimulatorFactory::create + //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create CSimulatorP3D(const swift::misc::simulation::CSimulatorPluginInfo &info, swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, @@ -44,7 +44,7 @@ namespace BlackSimPlugin::P3D //! \copydoc swift::misc::simulation::ISimulationEnvironmentProvider::requestElevation virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, const swift::misc::aviation::CCallsign &callsign) override; - //! \copydoc BlackCore::ISimulator::followAircraft + //! \copydoc swift::core::ISimulator::followAircraft virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; #endif // guard diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp index ddc1ef57e..bc37a18b1 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.cpp +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.cpp @@ -10,16 +10,16 @@ using namespace swift::misc::network; namespace BlackSimPlugin::P3D { - BlackCore::ISimulator *CSimulatorP3DFactory::create(const CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, - IRemoteAircraftProvider *remoteAircraftProvider, - IClientProvider *clientProvider) + swift::core::ISimulator *CSimulatorP3DFactory::create(const CSimulatorPluginInfo &info, + IOwnAircraftProvider *ownAircraftProvider, + IRemoteAircraftProvider *remoteAircraftProvider, + IClientProvider *clientProvider) { Q_ASSERT(ownAircraftProvider); return new CSimulatorP3D(info, ownAircraftProvider, remoteAircraftProvider, clientProvider, this); } - BlackCore::ISimulatorListener *CSimulatorP3DFactory::createListener(const CSimulatorPluginInfo &info) + swift::core::ISimulatorListener *CSimulatorP3DFactory::createListener(const CSimulatorPluginInfo &info) { return new CSimulatorP3DListener(info); } diff --git a/src/plugins/simulator/p3d/simulatorp3dfactory.h b/src/plugins/simulator/p3d/simulatorp3dfactory.h index a86e4014e..31dc31bdb 100644 --- a/src/plugins/simulator/p3d/simulatorp3dfactory.h +++ b/src/plugins/simulator/p3d/simulatorp3dfactory.h @@ -6,7 +6,7 @@ #ifndef BLACKSIMPLUGIN_SIMULATOR_P3DFACTORY_H #define BLACKSIMPLUGIN_SIMULATOR_P3DFACTORY_H -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/simulatorplugininfo.h" #include @@ -17,21 +17,21 @@ namespace BlackSimPlugin::P3D //! Factory implementation to create CSimulatorP3D instances class CSimulatorP3DFactory : public QObject, - public BlackCore::ISimulatorFactory + public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorp3d.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatorp3d.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; }; } // namespace diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp index f5c702d92..09bb647e8 100644 --- a/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp +++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.cpp @@ -8,7 +8,7 @@ using namespace BlackGui; using namespace BlackGui::Components; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.h b/src/plugins/simulator/plugincommon/simulatorplugincommon.h index 28acd5b70..4860a2737 100644 --- a/src/plugins/simulator/plugincommon/simulatorplugincommon.h +++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.h @@ -7,7 +7,7 @@ #define BLACKSIMPLUGIN_COMMON_SIMULATORPLUGINCOMMON_H #include "plugins/simulator/plugincommon/simulatorplugincommonexport.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include #include @@ -18,10 +18,10 @@ namespace BlackGui::Components namespace BlackSimPlugin::Common { //! Common base class for simulator plugins - class SIMULATORPLUGINCOMMON_EXPORT CSimulatorPluginCommon : public BlackCore::ISimulator + class SIMULATORPLUGINCOMMON_EXPORT CSimulatorPluginCommon : public swift::core::ISimulator { Q_OBJECT - Q_INTERFACES(BlackCore::ISimulator) + Q_INTERFACES(swift::core::ISimulator) Q_INTERFACES(swift::misc::simulation::ISimulationEnvironmentProvider) Q_INTERFACES(swift::misc::simulation::IInterpolationSetupProvider) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 9b05de381..8158107b1 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -5,7 +5,7 @@ #include "qcompilerdetection.h" #include "xswiftbusserviceproxy.h" #include "xswiftbustrafficproxy.h" -#include "blackcore/aircraftmatcher.h" +#include "core/aircraftmatcher.h" #include "misc/simulation/aircraftmodel.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/simulatedaircraftlist.h" @@ -64,7 +64,7 @@ using namespace swift::misc::geo; using namespace swift::misc::simulation; using namespace swift::misc::simulation::settings; using namespace swift::misc::weather; -using namespace BlackCore; +using namespace swift::core; namespace { diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 1b7fd374d..da421efd9 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -290,7 +290,7 @@ namespace BlackSimPlugin::XPlane }; //! Listener waits for xswiftbus service to show up - class CSimulatorXPlaneListener : public BlackCore::ISimulatorListener + class CSimulatorXPlaneListener : public swift::core::ISimulatorListener { Q_OBJECT @@ -299,13 +299,13 @@ namespace BlackSimPlugin::XPlane CSimulatorXPlaneListener(const swift::misc::simulation::CSimulatorPluginInfo &info); protected: - //! \copydoc BlackCore::ISimulatorListener::startImpl + //! \copydoc swift::core::ISimulatorListener::startImpl virtual void startImpl() override; - //! \copydoc BlackCore::ISimulatorListener::stopImpl + //! \copydoc swift::core::ISimulatorListener::stopImpl virtual void stopImpl() override; - //! \copydoc BlackCore::ISimulatorListener::checkImpl + //! \copydoc swift::core::ISimulatorListener::checkImpl virtual void checkImpl() override; private: @@ -324,21 +324,21 @@ namespace BlackSimPlugin::XPlane }; //! Factory for creating CSimulatorXPlane instance - class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory + class CSimulatorXPlaneFactory : public QObject, public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.blackcore.simulatorinterface" FILE "simulatorxplane.json") - Q_INTERFACES(BlackCore::ISimulatorFactory) + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatorxplane.json") + Q_INTERFACES(swift::core::ISimulatorFactory) public: - //! \copydoc BlackCore::ISimulatorFactory::create - virtual BlackCore::ISimulator *create(const swift::misc::simulation::CSimulatorPluginInfo &info, + //! \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; - //! \copydoc BlackCore::ISimulatorFactory::createListener - virtual BlackCore::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); } + //! \copydoc swift::core::ISimulatorFactory::createListener + virtual swift::core::ISimulatorListener *createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); } }; } // ns diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index 36d4bf00c..cdb114660 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "xplanempaircraft.h" -#include "blackcore/simulator.h" +#include "core/simulator.h" #include "misc/simulation/interpolation/interpolatormulti.h" -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index c97ef5dfb..bc72912d0 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -11,7 +11,7 @@ #include #include -namespace BlackCore +namespace swift::core { class ISimulator; } @@ -26,7 +26,7 @@ namespace BlackSimPlugin::XPlane //! Constructor providing initial situation/parts CXPlaneMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, - BlackCore::ISimulator *simulator, + swift::core::ISimulator *simulator, swift::misc::simulation::CInterpolationLogger *logger); //! Destructor diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp index 0006c816e..86b94eea6 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp @@ -3,7 +3,7 @@ #include "ui_simulatorxplaneconfigwindow.h" #include "simulatorxplaneconfigwindow.h" -#include "blackcore/context/contextsimulator.h" +#include "core/context/contextsimulator.h" #include "blackgui/guiapplication.h" #include "misc/simulation/xplane/xswiftbusconfigwriter.h" @@ -12,7 +12,7 @@ #include using namespace BlackGui; -using namespace BlackCore::Context; +using namespace swift::core::context; using namespace swift::misc; using namespace swift::misc::simulation::settings; using namespace swift::misc::simulation::xplane; diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp index 9be44724f..faa4b4f90 100644 --- a/src/swiftcore/main.cpp +++ b/src/swiftcore/main.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/corefacadeconfig.h" +#include "core/corefacadeconfig.h" #include "blackgui/guiapplication.h" #include "misc/icons.h" #include "misc/crashhandler.h" @@ -14,7 +14,7 @@ #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; int main(int argc, char *argv[]) diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index 7c23c9569..260a5a870 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -11,9 +11,9 @@ #include "blackgui/components/rawfsdmessagesdialog.h" #include "blackgui/guiapplication.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/corefacade.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/corefacade.h" #include "misc/dbusserver.h" #include "misc/icons.h" #include "misc/loghandler.h" @@ -32,7 +32,7 @@ #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui; using namespace BlackGui::Components; diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h index 8a3680830..e619c4af1 100644 --- a/src/swiftcore/swiftcore.h +++ b/src/swiftcore/swiftcore.h @@ -6,7 +6,7 @@ #ifndef SWIFTCORE_H #define SWIFTCORE_H -#include "blackcore/coremodeenums.h" +#include "core/coremodeenums.h" #include "blackgui/mainwindowaccess.h" #include "blackgui/systemtraywindow.h" #include "misc/identifiable.h" diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp index 261b72590..644a434e6 100644 --- a/src/swiftdata/main.cpp +++ b/src/swiftdata/main.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/webreaderflags.h" +#include "core/webreaderflags.h" #include "blackgui/guiapplication.h" #include "misc/icons.h" #include "misc/crashhandler.h" @@ -12,8 +12,8 @@ #include using namespace swift::misc; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; using namespace BlackGui; int main(int argc, char *argv[]) @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) CGuiApplication a(CApplicationInfo::swiftMappingTool(), CApplicationInfo::MappingTool, CIcons::swiftDatabase48()); if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; } a.splashScreen(CIcons::swiftDatabase256()); - a.initAndStartWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool()); + a.initAndStartWebDataServices(swift::core::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool()); a.startCoreFacadeWithoutContexts(); if (!a.start()) { diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index f077e80fb..9122ae480 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -9,7 +9,7 @@ #include "blackgui/components/autopublishdialog.h" #include "blackgui/guiapplication.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/data/globalsetup.h" +#include "core/data/globalsetup.h" #include "misc/simulation/autopublishdata.h" #include "misc/simulation/distributorlist.h" #include "misc/sharedstate/datalinkdbus.h" @@ -31,9 +31,9 @@ using namespace swift::misc; using namespace swift::misc::network; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Data; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::data; +using namespace swift::core::db; using namespace BlackGui; using namespace BlackGui::Components; using namespace swift::config; diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 8a5d22df1..d93e05d78 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -9,7 +9,7 @@ #include "blackgui/settings/guisettings.h" #include "blackgui/mainwindowaccess.h" #include "blackgui/managedstatusbar.h" -#include "blackcore/db/backgrounddataupdater.h" +#include "core/db/backgrounddataupdater.h" #include "misc/loghistory.h" #include "misc/identifiable.h" #include "misc/statusmessage.h" @@ -22,7 +22,7 @@ namespace Ui { class CSwiftData; } -namespace BlackCore +namespace swift::core { class CWebDataServices; } @@ -86,7 +86,7 @@ private: QScopedPointer ui; BlackGui::CManagedStatusBar m_statusBar; - BlackCore::Db::CBackgroundDataUpdater *m_updater = nullptr; //!< consolidate with DB data + swift::core::db::CBackgroundDataUpdater *m_updater = nullptr; //!< consolidate with DB data swift::misc::CSettingReadOnly m_consolidationSettings { this, &CSwiftData::consolidationSettingChanged }; //!< consolidation time swift::misc::CLogHistoryReplica m_logHistory { this }; diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp index e307fddfb..3763cb33d 100644 --- a/src/swiftdata/swiftdatamenus.cpp +++ b/src/swiftdata/swiftdatamenus.cpp @@ -20,7 +20,7 @@ #include using namespace BlackGui; -using namespace BlackCore; +using namespace swift::core; using namespace BlackGui::Components; using namespace swift::misc; diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp index 6d84f97c1..755be5352 100644 --- a/src/swiftguistandard/main.cpp +++ b/src/swiftguistandard/main.cpp @@ -17,7 +17,7 @@ using namespace BlackGui; using namespace swift::misc; using namespace swift::misc::audio; -using namespace BlackCore; +using namespace swift::core; int main(int argc, char *argv[]) { diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 98b30506e..abbb524be 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -13,12 +13,12 @@ #include "blackgui/guiapplication.h" #include "blackgui/guiutility.h" #include "blackgui/overlaymessagesframe.h" -#include "blackcore/context/contextapplication.h" -#include "blackcore/context/contextaudio.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/webdataservices.h" -#include "blackcore/corefacadeconfig.h" +#include "core/context/contextapplication.h" +#include "core/context/contextaudio.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/webdataservices.h" +#include "core/corefacadeconfig.h" #include "misc/audio/notificationsounds.h" #include "misc/icons.h" #include "misc/logcategories.h" @@ -58,8 +58,8 @@ namespace swift::misc class CIdentifiable; } -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace BlackGui; using namespace BlackGui::Components; using namespace swift::misc; diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 9d0680ff0..a5b28d198 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -14,7 +14,7 @@ #include "blackgui/mainwindowaccess.h" #include "blackgui/managedstatusbar.h" #include "blackgui/guiactionbind.h" -#include "blackcore/actionbind.h" +#include "core/actionbind.h" #include "misc/network/connectionstatus.h" #include "misc/simulation/simulatedaircraft.h" #include "misc/simulation/autopublishdata.h" @@ -124,8 +124,8 @@ private: QScopedPointer m_modelBrower; //!< model browser QScopedPointer m_validationDialog; //!< aircraft model validation dialog swift::misc::CData m_lastAutoPublish { this }; - BlackCore::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; - BlackCore::CActionBindings m_menuHotkeyHandlers; + swift::core::CActionBind m_actionPtt { swift::misc::input::pttHotkeyAction(), swift::misc::CIcons::StandardIconRadio16, this, &SwiftGuiStd::onPttChanged }; + swift::core::CActionBindings m_menuHotkeyHandlers; BlackGui::CManagedStatusBar m_statusBar; swift::misc::CLogHistoryReplica m_logHistoryForLogButtons { this }; swift::misc::CLogHistoryReplica m_logHistoryForOverlay { this }; diff --git a/src/swiftguistandard/swiftguistdaircraft.cpp b/src/swiftguistandard/swiftguistdaircraft.cpp index f52b27f9b..d2e53b25a 100644 --- a/src/swiftguistandard/swiftguistdaircraft.cpp +++ b/src/swiftguistandard/swiftguistdaircraft.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "blackcore/context/contextownaircraft.h" +#include "core/context/contextownaircraft.h" #include "blackgui/guiapplication.h" #include "misc/mixin/mixincompare.h" #include "misc/geo/coordinategeodetic.h" @@ -14,7 +14,7 @@ #include -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace BlackGui; using namespace swift::misc::network; diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp index 6f4bd008d..647942517 100644 --- a/src/swiftguistandard/swiftguistdapplication.cpp +++ b/src/swiftguistandard/swiftguistdapplication.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 #include "swiftguistdapplication.h" -#include "blackcore/application.h" -#include "blackcore/corefacadeconfig.h" -#include "blackcore/coremodeenums.h" +#include "core/application.h" +#include "core/corefacadeconfig.h" +#include "core/coremodeenums.h" #include "misc/dbusserver.h" #include "misc/icons.h" #include using namespace swift::misc; -using namespace BlackCore; +using namespace swift::core; CSwiftGuiStdApplication::CSwiftGuiStdApplication() : CGuiApplication(CApplicationInfo::swiftPilotClientGui(), CApplicationInfo::PilotClientGui, CIcons::swift1024()) { diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp index 814c311c2..a65e5e409 100644 --- a/src/swiftguistandard/swiftguistdinit.cpp +++ b/src/swiftguistandard/swiftguistdinit.cpp @@ -22,10 +22,10 @@ #include "blackgui/managedstatusbar.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/webdataservices.h" -#include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextsimulator.h" -#include "blackcore/context/contextaudio.h" +#include "core/webdataservices.h" +#include "core/context/contextnetwork.h" +#include "core/context/contextsimulator.h" +#include "core/context/contextaudio.h" #include "sound/audioutilities.h" #include "misc/network/networkutils.h" #include "misc/sharedstate/datalinkdbus.h" @@ -48,8 +48,8 @@ #include using namespace swift::config; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::network; diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp index 85857a28e..b1734c1fd 100644 --- a/src/swiftguistandard/swiftguistdmenus.cpp +++ b/src/swiftguistandard/swiftguistdmenus.cpp @@ -27,7 +27,7 @@ using namespace swift::config; using namespace BlackGui; using namespace BlackGui::Components; -using namespace BlackCore; +using namespace swift::core; using namespace swift::misc; using namespace swift::misc::physical_quantities; using namespace swift::misc::aviation; diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp index ff6ac46e4..5cd6d7a21 100644 --- a/src/swiftlauncher/main.cpp +++ b/src/swiftlauncher/main.cpp @@ -3,10 +3,10 @@ #include "swiftlauncher.h" #include "blackgui/guiapplication.h" -#include "blackcore/db/databasereaderconfig.h" +#include "core/db/databasereaderconfig.h" #include "misc/directoryutils.h" #include "misc/icons.h" -#include "blackcore/webdataservices.h" +#include "core/webdataservices.h" #include #include @@ -15,8 +15,8 @@ using namespace BlackGui; using namespace swift::misc; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; //! Init the DB cache from local resource files if the cache has no timestamp or the cache was not updated since 2 years void initDbCacheFromResourceFileIfRequired(CGuiApplication &a) @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") }; a.addParserOption(installerOption); if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; } - a.initAndStartWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher()); + a.initAndStartWebDataServices(swift::core::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher()); const bool installMode = a.isParserOptionSet(installerOption); if (installMode) initDbCacheFromResourceFileIfRequired(a); diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index 90ca10eca..4285510ab 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -8,11 +8,11 @@ #include "blackgui/components/texteditdialog.h" #include "blackgui/guiapplication.h" #include "blackgui/stylesheetutility.h" -#include "blackcore/context/contextapplicationproxy.h" -#include "blackcore/setupreader.h" +#include "core/context/contextapplicationproxy.h" +#include "core/setupreader.h" #include "sound/audioutilities.h" #include "misc/simulation/fscommon/fsdirectories.h" -#include "blackcore/context/contextnetwork.h" +#include "core/context/contextnetwork.h" #include "misc/network/networkutils.h" #include "misc/dbusserver.h" #include "misc/swiftdirectories.h" @@ -38,10 +38,10 @@ using namespace swift::config; using namespace BlackGui; using namespace BlackGui::Components; -using namespace BlackCore; -using namespace BlackCore::Context; -using namespace BlackCore::Data; -using namespace BlackCore::Vatsim; +using namespace swift::core; +using namespace swift::core::context; +using namespace swift::core::data; +using namespace swift::core::vatsim; using namespace swift::sound; using namespace swift::misc; using namespace swift::misc::db; diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h index f629259db..bbd12b378 100644 --- a/src/swiftlauncher/swiftlauncher.h +++ b/src/swiftlauncher/swiftlauncher.h @@ -9,9 +9,9 @@ #include "blackgui/enableforframelesswindow.h" #include "blackgui/overlaymessagesframe.h" #include "blackgui/mainwindowaccess.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/data/launchersetup.h" -#include "blackcore/coremodeenums.h" +#include "core/data/globalsetup.h" +#include "core/data/launchersetup.h" +#include "core/coremodeenums.h" #include "misc/simulation/data/modelcaches.h" #include "misc/db/artifact.h" #include "misc/identifiable.h" @@ -100,7 +100,7 @@ private: QScopedPointer ui; QScopedPointer m_wizard; QScopedPointer m_textEditDialog; - swift::misc::CData m_setup { this }; //!< setup, i.e. last user selection + swift::misc::CData m_setup { this }; //!< setup, i.e. last user selection swift::misc::CLogHistoryReplica m_logHistory { this }; //!< for the overlay #ifdef Q_OS_MAC swift::misc::CMacOSMicrophoneAccess m_micAccess; @@ -114,7 +114,7 @@ private: int m_startGuiWaitCycles = 0; //! Get core mode - BlackCore::CoreModes::CoreMode getCoreMode() const; + swift::core::CoreModes::CoreMode getCoreMode() const; //! Selected window mode BlackGui::CEnableForFramelessWindow::WindowMode getWindowMode() const; diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8aef41eeb..8b1a03ac2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ add_library(tests_test INTERFACE test.h) target_link_libraries(tests_test INTERFACE Qt::Core Qt::Test) target_include_directories(tests_test INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -add_subdirectory(blackcore) +add_subdirectory(core) add_subdirectory(blackgui) add_subdirectory(misc) diff --git a/tests/blackcore/CMakeLists.txt b/tests/core/CMakeLists.txt similarity index 100% rename from tests/blackcore/CMakeLists.txt rename to tests/core/CMakeLists.txt diff --git a/tests/blackcore/blackcoretest.h b/tests/core/blackcoretest.h similarity index 62% rename from tests/blackcore/blackcoretest.h rename to tests/core/blackcoretest.h index b0b42fcd0..f3b070bdc 100644 --- a/tests/blackcore/blackcoretest.h +++ b/tests/core/blackcoretest.h @@ -7,11 +7,11 @@ //! \cond PRIVATE_TESTS /*! - * \namespace BlackCoreTest - * \defgroup testblackcore BlackCore Unit Tests + * \namespace SwiftCoreTest + * \defgroup testswiftcore Core Unit Tests * \ingroup tests - * Unit tests for BlackCore. Unit tests do have their own namespace, so - * the regular namespace BlackCore is completely free of unit tests. + * Unit tests for Core. Unit tests do have their own namespace, so + * the regular namespace swift::core is completely free of unit tests. * Add any new tests to TestMain::unitMain as shown there. */ diff --git a/tests/blackcore/context/CMakeLists.txt b/tests/core/context/CMakeLists.txt similarity index 100% rename from tests/blackcore/context/CMakeLists.txt rename to tests/core/context/CMakeLists.txt diff --git a/tests/blackcore/context/testcontext/testcontext.cpp b/tests/core/context/testcontext/testcontext.cpp similarity index 87% rename from tests/blackcore/context/testcontext/testcontext.cpp rename to tests/core/context/testcontext/testcontext.cpp index 3528a5046..85cd16493 100644 --- a/tests/blackcore/context/testcontext/testcontext.cpp +++ b/tests/core/context/testcontext/testcontext.cpp @@ -3,14 +3,14 @@ //! \cond PRIVATE_TESTS //! \file -//! \ingroup testblackcore +//! \ingroup testswiftcore -#include "blackcore/context/contextapplicationproxy.h" -#include "blackcore/context/contextaudioproxy.h" -#include "blackcore/context/contextnetworkproxy.h" -#include "blackcore/context/contextownaircraftproxy.h" -#include "blackcore/context/contextsimulatorproxy.h" -#include "blackcore/application.h" +#include "core/context/contextapplicationproxy.h" +#include "core/context/contextaudioproxy.h" +#include "core/context/contextnetworkproxy.h" +#include "core/context/contextownaircraftproxy.h" +#include "core/context/contextsimulatorproxy.h" +#include "core/application.h" #include "misc/simulation/simulatedaircraftlist.h" #include "misc/dbusutils.h" #include "test.h" @@ -23,10 +23,10 @@ using namespace swift::misc; using namespace swift::misc::aviation; using namespace swift::misc::simulation; -using namespace BlackCore; -using namespace BlackCore::Context; +using namespace swift::core; +using namespace swift::core::context; -namespace BlackCoreTest +namespace SwiftCoreTest { //! Context implementation classes tests class CTestContext : public QObject @@ -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(BlackCoreTest::CTestContext) + BLACKTEST_INIT(SwiftCoreTest::CTestContext) CApplication a(CApplicationInfo::UnitTest); a.addNetworkOptions(); const bool setup = a.parseCommandLineArgsAndLoadSetup(); diff --git a/tests/blackcore/fsd/CMakeLists.txt b/tests/core/fsd/CMakeLists.txt similarity index 100% rename from tests/blackcore/fsd/CMakeLists.txt rename to tests/core/fsd/CMakeLists.txt diff --git a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp b/tests/core/fsd/testfsdclient/testfsdclient.cpp similarity index 99% rename from tests/blackcore/fsd/testfsdclient/testfsdclient.cpp rename to tests/core/fsd/testfsdclient/testfsdclient.cpp index cafddce5d..91e449bda 100644 --- a/tests/blackcore/fsd/testfsdclient/testfsdclient.cpp +++ b/tests/core/fsd/testfsdclient/testfsdclient.cpp @@ -9,7 +9,7 @@ */ #include "config/buildconfig.h" -#include "blackcore/fsd/fsdclient.h" +#include "core/fsd/fsdclient.h" #include "misc/aviation/flightplan.h" #include "misc/network/clientprovider.h" #include "misc/network/rawfsdmessage.h" @@ -31,7 +31,7 @@ using namespace swift::misc::physical_quantities; using namespace swift::misc::network; using namespace swift::misc::simulation; using namespace swift::config; -using namespace BlackCore::Fsd; +using namespace swift::core::fsd; namespace BlackFsdTest { diff --git a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp similarity index 96% rename from tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp rename to tests/core/fsd/testfsdmessages/testfsdmessages.cpp index e8d661bc7..3e4c1d01c 100644 --- a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.cpp +++ b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp @@ -9,35 +9,35 @@ */ #include "config/buildconfig.h" -#include "blackcore/fsd/addatc.h" -#include "blackcore/fsd/addpilot.h" -#include "blackcore/fsd/atcdataupdate.h" -#include "blackcore/fsd/authchallenge.h" -#include "blackcore/fsd/authresponse.h" -#include "blackcore/fsd/clientidentification.h" -#include "blackcore/fsd/deleteatc.h" -#include "blackcore/fsd/deletepilot.h" -#include "blackcore/fsd/euroscopesimdata.h" -#include "blackcore/fsd/pbh.h" -#include "blackcore/fsd/pilotdataupdate.h" -#include "blackcore/fsd/ping.h" -#include "blackcore/fsd/pong.h" -#include "blackcore/fsd/killrequest.h" -#include "blackcore/fsd/textmessage.h" -#include "blackcore/fsd/clientquery.h" -#include "blackcore/fsd/clientresponse.h" -#include "blackcore/fsd/flightplan.h" -#include "blackcore/fsd/fsdidentification.h" -#include "blackcore/fsd/serializer.h" -#include "blackcore/fsd/servererror.h" -#include "blackcore/fsd/interimpilotdataupdate.h" -#include "blackcore/fsd/visualpilotdataupdate.h" -#include "blackcore/fsd/visualpilotdatatoggle.h" -#include "blackcore/fsd/planeinforequest.h" -#include "blackcore/fsd/planeinformation.h" -#include "blackcore/fsd/planeinforequestfsinn.h" -#include "blackcore/fsd/planeinformationfsinn.h" -#include "blackcore/fsd/enums.h" +#include "core/fsd/addatc.h" +#include "core/fsd/addpilot.h" +#include "core/fsd/atcdataupdate.h" +#include "core/fsd/authchallenge.h" +#include "core/fsd/authresponse.h" +#include "core/fsd/clientidentification.h" +#include "core/fsd/deleteatc.h" +#include "core/fsd/deletepilot.h" +#include "core/fsd/euroscopesimdata.h" +#include "core/fsd/pbh.h" +#include "core/fsd/pilotdataupdate.h" +#include "core/fsd/ping.h" +#include "core/fsd/pong.h" +#include "core/fsd/killrequest.h" +#include "core/fsd/textmessage.h" +#include "core/fsd/clientquery.h" +#include "core/fsd/clientresponse.h" +#include "core/fsd/flightplan.h" +#include "core/fsd/fsdidentification.h" +#include "core/fsd/serializer.h" +#include "core/fsd/servererror.h" +#include "core/fsd/interimpilotdataupdate.h" +#include "core/fsd/visualpilotdataupdate.h" +#include "core/fsd/visualpilotdatatoggle.h" +#include "core/fsd/planeinforequest.h" +#include "core/fsd/planeinformation.h" +#include "core/fsd/planeinforequestfsinn.h" +#include "core/fsd/planeinformationfsinn.h" +#include "core/fsd/enums.h" #include "test.h" #include @@ -46,7 +46,7 @@ using namespace swift::misc::aviation; using namespace swift::misc::network; using namespace swift::config; -using namespace BlackCore::Fsd; +using namespace swift::core::fsd; namespace MiscTest { diff --git a/tests/blackcore/scripts/perllib/BlackCore/Expect/Dict.pm b/tests/core/scripts/perllib/BlackCore/Expect/Dict.pm similarity index 98% rename from tests/blackcore/scripts/perllib/BlackCore/Expect/Dict.pm rename to tests/core/scripts/perllib/BlackCore/Expect/Dict.pm index e68cc8232..95c149984 100644 --- a/tests/blackcore/scripts/perllib/BlackCore/Expect/Dict.pm +++ b/tests/core/scripts/perllib/BlackCore/Expect/Dict.pm @@ -46,7 +46,7 @@ ## Calls $expect->expect() with the patterns of the dictionary. ## $timeout : Time to wait in seconds. -package BlackCore::Expect::Dict; +package SwiftCore::Expect::Dict; use strict; use warnings; @@ -54,7 +54,7 @@ sub new { my ($pkg, $expect) = @_; die unless $expect->isa('Expect'); - + return bless { expect => $expect, patterns => {}, @@ -65,7 +65,7 @@ sub new sub add { my ($self, $pattern, $disabled_cb, $enabled_cb) = @_; - + my $key = keys %{ $self->{patterns} }; $self->{patterns}{$key} = [ $pattern, $disabled_cb, $enabled_cb ]; return $key; @@ -74,7 +74,7 @@ sub add sub add_enabled { my ($self, @args) = @_; - + my $key = $self->add(@args); $self->enable($key); return $key; @@ -83,14 +83,14 @@ sub add_enabled sub enable { my ($self, $key) = @_; - + $self->{enabled_patterns}{$key} = 1; } sub disable { my ($self, $key) = @_; - + delete $self->{enabled_patterns}{$key} if exists $self->{enabled_patterns}{$key}; } @@ -98,21 +98,21 @@ sub disable sub save_state { my ($self) = @_; - + return \%{ $self->{enabled_patterns} }; } sub restore_state { my ($self, $state) = @_; - + %{ $self->{enabled_patterns} } = %$state; } sub expect { my ($self, $timeout) = @_; - + my @args; my $last_key = scalar(keys %{ $self->{patterns} }) - 1; foreach my $key (0..$last_key) @@ -120,7 +120,7 @@ sub expect my $pattern = $self->{patterns}{$key}[0]; push @args, [ $pattern, sub { return $self->_matched($key) } ]; } - + my @result = $self->{expect}->expect($timeout, @args); if (wantarray) { @@ -133,7 +133,7 @@ sub expect sub _matched { my ($self, $key) = @_; - + if (exists $self->{enabled_patterns}{$key}) { return $self->{patterns}{$key}[2](); } else { @@ -141,4 +141,4 @@ sub _matched } } -1; \ No newline at end of file +1; diff --git a/tests/blackcore/scripts/perllib/BlackCore/Expect/Test.pm b/tests/core/scripts/perllib/BlackCore/Expect/Test.pm similarity index 97% rename from tests/blackcore/scripts/perllib/BlackCore/Expect/Test.pm rename to tests/core/scripts/perllib/BlackCore/Expect/Test.pm index b105892fc..407e722ce 100644 --- a/tests/blackcore/scripts/perllib/BlackCore/Expect/Test.pm +++ b/tests/core/scripts/perllib/BlackCore/Expect/Test.pm @@ -47,10 +47,10 @@ ## Patterns can be simple strings, or regex objects. ## -package BlackCore::Expect::Test; +package SwiftCore::Expect::Test; use strict; use warnings; -use BlackCore::Expect::Dict; +use SwiftCore::Expect::Dict; use Expect; use IO::String; use base 'Exporter'; @@ -66,7 +66,7 @@ $expect->raw_pty(1); $expect->log_stdout(0); $expect->log_file($log); $expect->spawn(@ARGV) or die "$!"; -our $dict = BlackCore::Expect::Dict->new($expect); +our $dict = SwiftCore::Expect::Dict->new($expect); sub put { @@ -168,4 +168,4 @@ sub _usage exit; } -1; \ No newline at end of file +1; diff --git a/tests/blackcore/scripts/test_sample_cli_client.pl b/tests/core/scripts/test_sample_cli_client.pl similarity index 94% rename from tests/blackcore/scripts/test_sample_cli_client.pl rename to tests/core/scripts/test_sample_cli_client.pl index 6990d3e25..9261e3bde 100644 --- a/tests/blackcore/scripts/test_sample_cli_client.pl +++ b/tests/core/scripts/test_sample_cli_client.pl @@ -11,7 +11,7 @@ use strict; use warnings; use lib::abs 'perllib'; -use BlackCore::Expect::Test; +use SwiftCore::Expect::Test; my $callsign = 'TEST01'; set_timeout(10); @@ -33,4 +33,4 @@ add_fail('Cannot exec'); run_tests(); -put('exit'); \ No newline at end of file +put('exit'); diff --git a/tests/blackcore/testconnectivity/CMakeLists.txt b/tests/core/testconnectivity/CMakeLists.txt similarity index 100% rename from tests/blackcore/testconnectivity/CMakeLists.txt rename to tests/core/testconnectivity/CMakeLists.txt diff --git a/tests/blackcore/testconnectivity/testconnectivity.cpp b/tests/core/testconnectivity/testconnectivity.cpp similarity index 90% rename from tests/blackcore/testconnectivity/testconnectivity.cpp rename to tests/core/testconnectivity/testconnectivity.cpp index cff537e9e..121afa456 100644 --- a/tests/blackcore/testconnectivity/testconnectivity.cpp +++ b/tests/core/testconnectivity/testconnectivity.cpp @@ -3,10 +3,10 @@ //! \cond PRIVATE_TESTS //! \file -//! \ingroup testblackcore +//! \ingroup testswiftcore -#include "blackcore/application.h" -#include "blackcore/setupreader.h" +#include "core/application.h" +#include "core/setupreader.h" #include "misc/applicationinfo.h" #include "misc/network/networkutils.h" #include "misc/statusmessagelist.h" @@ -18,14 +18,14 @@ #include #include -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; using namespace swift::misc; using namespace swift::misc::network; -namespace BlackCoreTest +namespace swiftcoretest { - //! Test connectivity such as \c canConnect \c ping and BlackCore::Db::CNetworkWatchdog + //! Test connectivity such as \c canConnect \c ping and swift::core::db::CNetworkWatchdog class CTestConnectivity : public QObject { Q_OBJECT @@ -94,7 +94,7 @@ namespace BlackCoreTest int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); - BLACKTEST_INIT(BlackCoreTest::CTestConnectivity) + BLACKTEST_INIT(swiftcoretest::CTestConnectivity) CApplication a(CApplicationInfo::UnitTest); a.addNetworkOptions(); const bool setup = a.parseCommandLineArgsAndLoadSetup(); diff --git a/tests/blackcore/testconnectivity/testconnectivity.h b/tests/core/testconnectivity/testconnectivity.h similarity index 86% rename from tests/blackcore/testconnectivity/testconnectivity.h rename to tests/core/testconnectivity/testconnectivity.h index 1e798475e..4665378b1 100644 --- a/tests/blackcore/testconnectivity/testconnectivity.h +++ b/tests/core/testconnectivity/testconnectivity.h @@ -6,9 +6,9 @@ //! \cond PRIVATE_TESTS //! \file -//! \ingroup testblackcore +//! \ingroup testswiftcore -namespace BlackCoreTest +namespace swiftcoretest { } // namespace diff --git a/tests/blackcore/testreaders/CMakeLists.txt b/tests/core/testreaders/CMakeLists.txt similarity index 100% rename from tests/blackcore/testreaders/CMakeLists.txt rename to tests/core/testreaders/CMakeLists.txt diff --git a/tests/blackcore/testreaders/testreaders.cpp b/tests/core/testreaders/testreaders.cpp similarity index 92% rename from tests/blackcore/testreaders/testreaders.cpp rename to tests/core/testreaders/testreaders.cpp index deecc68ea..1fce676bb 100644 --- a/tests/blackcore/testreaders/testreaders.cpp +++ b/tests/core/testreaders/testreaders.cpp @@ -3,13 +3,13 @@ //! \cond PRIVATE_TESTS //! \file -//! \ingroup testblackcore +//! \ingroup testswiftcore -#include "blackcore/application.h" -#include "blackcore/data/globalsetup.h" -#include "blackcore/db/airportdatareader.h" -#include "blackcore/db/icaodatareader.h" -#include "blackcore/db/modeldatareader.h" +#include "core/application.h" +#include "core/data/globalsetup.h" +#include "core/db/airportdatareader.h" +#include "core/db/icaodatareader.h" +#include "core/db/modeldatareader.h" #include "misc/aviation/aircrafticaocode.h" #include "misc/aviation/aircrafticaocodelist.h" #include "misc/aviation/airlineicaocode.h" @@ -32,10 +32,10 @@ using namespace swift::misc::aviation; using namespace swift::misc::db; using namespace swift::misc::simulation; using namespace swift::misc::network; -using namespace BlackCore; -using namespace BlackCore::Db; +using namespace swift::core; +using namespace swift::core::db; -namespace BlackCoreTest +namespace swiftcoretest { //! Test data readers (for ICAOs, JSON, etc.) class CTestReaders : public QObject @@ -57,9 +57,9 @@ namespace BlackCoreTest void cleanupTestCase(); private: - BlackCore::Db::CAirportDataReader *m_airportReader = nullptr; - BlackCore::Db::CIcaoDataReader *m_icaoReader = nullptr; - BlackCore::Db::CModelDataReader *m_modelReader = nullptr; + swift::core::db::CAirportDataReader *m_airportReader = nullptr; + swift::core::db::CIcaoDataReader *m_icaoReader = nullptr; + swift::core::db::CModelDataReader *m_modelReader = nullptr; //! Test if server is available static bool connectServer(const swift::misc::network::CUrl &url); @@ -214,7 +214,7 @@ namespace BlackCoreTest } // ns //! main -BLACKTEST_APPLESS_MAIN(BlackCoreTest::CTestReaders); +BLACKTEST_APPLESS_MAIN(swiftcoretest::CTestReaders); #include "testreaders.moc"