From 8f946b77d5f624446e1ee957942fdbd32aaf5dc1 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Thu, 9 Oct 2025 22:59:25 +0200 Subject: [PATCH] refactor: Fix clang-tidy modernize-use-override --- .clang-tidy | 1 + src/core/actionbind.cpp | 5 - src/core/actionbind.h | 2 +- src/core/afv/audio/input.h | 6 +- src/core/afv/model/atcstationmodel.cpp | 2 - src/core/afv/model/atcstationmodel.h | 2 +- src/core/aircraftmatcher.h | 6 +- src/core/airspacemonitor.h | 4 +- src/core/context/contextapplicationempty.h | 33 ++- src/core/context/contextapplicationimpl.h | 33 ++- src/core/context/contextapplicationproxy.h | 35 ++- src/core/context/contextaudioproxy.h | 20 +- src/core/context/contextnetwork.h | 4 +- src/core/context/contextnetworkempty.h | 145 +++++----- src/core/context/contextnetworkimpl.h | 267 +++++++++--------- src/core/context/contextnetworkproxy.h | 150 +++++----- src/core/context/contextownaircraft.h | 4 +- src/core/context/contextownaircraftempty.h | 49 ++-- src/core/context/contextownaircraftimpl.cpp | 2 - src/core/context/contextownaircraftimpl.h | 74 +++-- src/core/context/contextownaircraftproxy.h | 54 ++-- src/core/context/contextsimulator.h | 2 +- src/core/context/contextsimulatorempty.h | 104 ++++--- src/core/context/contextsimulatorimpl.h | 110 ++++---- src/core/context/contextsimulatorproxy.h | 110 ++++---- src/core/corefacade.h | 2 +- src/core/data/launchersetup.h | 2 +- src/core/data/networksetup.cpp | 2 - src/core/data/networksetup.h | 4 +- src/core/db/airportdatareader.h | 34 ++- src/core/db/databasereader.h | 2 +- src/core/db/icaodatareader.h | 38 ++- src/core/db/infodatareader.h | 38 ++- src/core/db/modeldatareader.h | 42 ++- src/core/fsd/clientresponse.cpp | 2 - src/core/fsd/clientresponse.h | 2 +- src/core/fsd/euroscopesimdata.cpp | 2 - src/core/fsd/euroscopesimdata.h | 2 +- src/core/fsd/flightplan.cpp | 2 - src/core/fsd/flightplan.h | 2 +- src/core/fsd/messagebase.h | 2 +- src/core/fsd/revbclientparts.cpp | 2 - src/core/fsd/revbclientparts.h | 2 +- src/core/fsd/servererror.cpp | 2 - src/core/fsd/servererror.h | 2 +- src/core/pluginmanagersimulator.h | 6 +- src/core/progress.h | 2 +- src/core/vatsim/vatsimdatafilereader.h | 2 +- src/core/vatsim/vatsimmetarreader.h | 2 +- src/core/vatsim/vatsimsettings.cpp | 4 - src/core/vatsim/vatsimsettings.h | 4 +- src/core/webdataservices.h | 2 +- src/core/webdataservicesms.h | 2 +- src/gui/components/aboutdialog.cpp | 2 +- src/gui/components/aboutdialog.h | 2 +- src/gui/components/abouthtmlcomponent.cpp | 2 +- src/gui/components/abouthtmlcomponent.h | 2 +- .../aircraftcombinedtypeselector.cpp | 2 +- .../components/aircraftcombinedtypeselector.h | 2 +- src/gui/components/aircraftcomponent.cpp | 2 +- src/gui/components/aircraftcomponent.h | 4 +- .../aircraftmodelsetvalidationdialog.cpp | 2 +- .../aircraftmodelsetvalidationdialog.h | 2 +- .../aircraftmodelstringcompleter.cpp | 2 +- .../components/aircraftmodelstringcompleter.h | 2 +- .../aircraftmodelvalidationcomponent.cpp | 2 +- .../aircraftmodelvalidationcomponent.h | 2 +- src/gui/components/aircraftpartscomponent.cpp | 5 +- src/gui/components/aircraftpartscomponent.h | 2 +- src/gui/components/aircraftpartshistory.cpp | 2 +- src/gui/components/aircraftpartshistory.h | 2 +- src/gui/components/airportcompleter.cpp | 2 +- src/gui/components/airportcompleter.h | 2 +- src/gui/components/airportdialog.cpp | 2 +- src/gui/components/airportdialog.h | 2 +- src/gui/components/airportsmallcompleter.cpp | 2 +- src/gui/components/airportsmallcompleter.h | 2 +- src/gui/components/altitudedialog.cpp | 2 +- src/gui/components/altitudedialog.h | 2 +- src/gui/components/applicationclosedialog.cpp | 2 +- src/gui/components/applicationclosedialog.h | 2 +- src/gui/components/atcbuttoncomponent.cpp | 2 +- src/gui/components/atcbuttoncomponent.h | 2 +- src/gui/components/atcstationcomponent.cpp | 2 +- src/gui/components/atcstationcomponent.h | 4 +- .../audioadvanceddistributedcomponent.cpp | 2 +- .../audioadvanceddistributedcomponent.h | 2 +- .../audioadvanceddistributeddialog.cpp | 2 +- .../audioadvanceddistributeddialog.h | 2 +- .../audiodevicevolumesetupcomponent.cpp | 2 +- .../audiodevicevolumesetupcomponent.h | 2 +- .../components/audionotificationcomponent.cpp | 2 +- src/gui/components/autopublishcomponent.cpp | 2 +- src/gui/components/autopublishcomponent.h | 2 +- src/gui/components/autopublishdialog.cpp | 2 +- src/gui/components/autopublishdialog.h | 2 +- src/gui/components/callsigncompleter.cpp | 2 +- src/gui/components/callsigncompleter.h | 2 +- src/gui/components/cgsourceselector.cpp | 2 +- src/gui/components/cgsourceselector.h | 2 +- src/gui/components/cockpitcomaudiodialog.cpp | 2 +- src/gui/components/cockpitcomaudiodialog.h | 2 +- src/gui/components/cockpitcomcomponent.cpp | 2 +- src/gui/components/cockpitcomcomponent.h | 4 +- src/gui/components/cockpitcomponent.cpp | 2 +- src/gui/components/cockpitcomponent.h | 6 +- .../cockpitcomtransmissioncomponent.cpp | 5 +- .../cockpitcomtransmissioncomponent.h | 2 +- .../components/cockpitinfoareacomponent.cpp | 2 +- src/gui/components/cockpitinfoareacomponent.h | 6 +- src/gui/components/colorselector.cpp | 2 +- src/gui/components/colorselector.h | 10 +- .../components/configsimulatorcomponent.cpp | 2 +- src/gui/components/configsimulatorcomponent.h | 6 +- src/gui/components/configurationwizard.cpp | 2 +- src/gui/components/configurationwizard.h | 2 +- src/gui/components/coordinatedialog.cpp | 2 +- src/gui/components/coordinatedialog.h | 2 +- ...ymodelsfromotherswiftversionscomponent.cpp | 2 +- ...opymodelsfromotherswiftversionscomponent.h | 6 +- ...copymodelsfromotherswiftversionsdialog.cpp | 2 +- .../copymodelsfromotherswiftversionsdialog.h | 2 +- .../copysettingsandcachescomponent.cpp | 2 +- .../copysettingsandcachescomponent.h | 6 +- src/gui/components/coreinfoareacomponent.cpp | 2 +- src/gui/components/coreinfoareacomponent.h | 6 +- src/gui/components/coresettingsdialog.cpp | 2 +- src/gui/components/coresettingsdialog.h | 2 +- src/gui/components/corestatuscomponent.cpp | 2 +- src/gui/components/corestatuscomponent.h | 2 +- src/gui/components/countryselector.cpp | 2 +- src/gui/components/countryselector.h | 2 +- src/gui/components/datainfoareacomponent.cpp | 2 +- src/gui/components/datainfoareacomponent.h | 6 +- .../components/datamaininfoareacomponent.cpp | 2 +- .../components/datamaininfoareacomponent.h | 6 +- src/gui/components/datasettingscomponent.cpp | 2 +- src/gui/components/datasettingscomponent.h | 2 +- .../dbaircraftcategorycomponent.cpp | 2 +- .../components/dbaircraftcategorycomponent.h | 2 +- .../components/dbaircrafticaocomponent.cpp | 2 +- src/gui/components/dbaircrafticaocomponent.h | 2 +- .../dbaircrafticaoselectorcomponent.cpp | 2 +- .../dbaircrafticaoselectorcomponent.h | 10 +- src/gui/components/dbairlineicaocomponent.cpp | 2 +- src/gui/components/dbairlineicaocomponent.h | 2 +- .../components/dbairlineicaoselectorbase.cpp | 2 +- .../components/dbairlineicaoselectorbase.h | 10 +- .../dbairlineicaoselectorcomponent.cpp | 2 +- .../dbairlineicaoselectorcomponent.h | 10 +- .../dbairlinenameselectorcomponent.cpp | 5 +- .../dbairlinenameselectorcomponent.h | 10 +- .../dbautosimulatorstashingcomponent.cpp | 2 +- .../dbautosimulatorstashingcomponent.h | 8 +- .../components/dbautostashingcomponent.cpp | 2 +- src/gui/components/dbautostashingcomponent.h | 8 +- src/gui/components/dbcountrycomponent.cpp | 2 +- src/gui/components/dbcountrycomponent.h | 2 +- .../components/dbcountryselectorcomponent.cpp | 2 +- .../components/dbcountryselectorcomponent.h | 8 +- src/gui/components/dbdistributorcomponent.cpp | 2 +- src/gui/components/dbdistributorcomponent.h | 2 +- .../dbdistributorselectorcomponent.cpp | 5 +- .../dbdistributorselectorcomponent.h | 10 +- src/gui/components/dbliverycolorsearch.cpp | 2 +- src/gui/components/dbliverycolorsearch.h | 2 +- .../components/dbliverycolorsearchdialog.cpp | 2 +- .../components/dbliverycolorsearchdialog.h | 2 +- src/gui/components/dbliverycomponent.cpp | 2 +- src/gui/components/dbliverycomponent.h | 2 +- .../components/dbliveryselectorcomponent.cpp | 5 +- .../components/dbliveryselectorcomponent.h | 10 +- src/gui/components/dbloaddatadialog.cpp | 2 +- src/gui/components/dbloaddatadialog.h | 2 +- .../components/dbloadoverviewcomponent.cpp | 2 +- src/gui/components/dbloadoverviewcomponent.h | 4 +- src/gui/components/dblogincomponent.cpp | 2 +- src/gui/components/dblogincomponent.h | 2 +- src/gui/components/dbmappingcomponent.h | 14 +- src/gui/components/dbmappingcomponentaware.h | 2 +- src/gui/components/dbmodelcomponent.cpp | 5 +- src/gui/components/dbmodelcomponent.h | 2 +- .../components/dbmodelmappingmodifydialog.cpp | 5 +- .../components/dbmodelmappingmodifydialog.h | 2 +- .../components/dbmodelworkbenchcomponent.cpp | 5 +- .../components/dbmodelworkbenchcomponent.h | 14 +- src/gui/components/dbownmodelscomponent.cpp | 5 +- src/gui/components/dbownmodelscomponent.h | 16 +- src/gui/components/dbownmodelsdialog.cpp | 2 +- src/gui/components/dbownmodelsdialog.h | 2 +- src/gui/components/dbownmodelsetcomponent.cpp | 5 +- src/gui/components/dbownmodelsetcomponent.h | 12 +- src/gui/components/dbownmodelsetdialog.cpp | 2 +- src/gui/components/dbownmodelsetdialog.h | 2 +- .../components/dbownmodelsetformdialog.cpp | 5 +- src/gui/components/dbownmodelsetformdialog.h | 4 +- src/gui/components/dbquickmappingwizard.cpp | 2 +- .../components/dbreducemodelduplicates.cpp | 2 +- src/gui/components/dbreducemodelduplicates.h | 4 +- src/gui/components/dbstashcomponent.cpp | 2 +- src/gui/components/dbstashcomponent.h | 2 +- .../components/dbusserveraddressselector.cpp | 2 +- .../components/dbusserveraddressselector.h | 2 +- .../distributorpreferencescomponent.cpp | 2 +- .../distributorpreferencescomponent.h | 2 +- src/gui/components/downloadcomponent.cpp | 2 +- src/gui/components/downloadcomponent.h | 2 +- src/gui/components/downloaddialog.cpp | 2 +- src/gui/components/downloaddialog.h | 4 +- src/gui/components/firstmodelsetcomponent.cpp | 2 +- src/gui/components/firstmodelsetcomponent.h | 4 +- src/gui/components/firstmodelsetdialog.cpp | 2 +- src/gui/components/firstmodelsetdialog.h | 2 +- src/gui/components/flightplancomponent.cpp | 2 +- src/gui/components/flightplancomponent.h | 2 +- src/gui/components/hotkeydialog.cpp | 2 +- src/gui/components/hotkeydialog.h | 4 +- src/gui/components/infobarstatuscomponent.cpp | 2 +- src/gui/components/infobarstatuscomponent.h | 4 +- .../infobarwebreadersstatuscomponent.cpp | 2 +- .../infobarwebreadersstatuscomponent.h | 6 +- .../infobarwebreadersstatussmallcomponent.cpp | 2 +- .../infobarwebreadersstatussmallcomponent.h | 2 +- .../components/initialdataloadcomponent.cpp | 2 +- src/gui/components/initialdataloadcomponent.h | 6 +- .../installfsxterrainprobecomponent.cpp | 2 +- .../installfsxterrainprobecomponent.h | 2 +- .../installsimulatorspecificwizardpage.h | 2 +- .../components/installxswiftbuscomponent.cpp | 2 +- .../components/installxswiftbuscomponent.h | 4 +- src/gui/components/installxswiftbusdialog.cpp | 2 +- src/gui/components/installxswiftbusdialog.h | 2 +- src/gui/components/internalscomponent.cpp | 2 +- src/gui/components/internalscomponent.h | 4 +- src/gui/components/interpolationcomponent.cpp | 2 +- src/gui/components/interpolationcomponent.h | 2 +- .../components/interpolationlogdisplay.cpp | 5 +- src/gui/components/interpolationlogdisplay.h | 2 +- .../interpolationlogdisplaydialog.h | 2 +- .../interpolationsetupcomponent.cpp | 2 +- .../components/interpolationsetupcomponent.h | 2 +- src/gui/components/legalinfocomponent.cpp | 2 +- src/gui/components/legalinfocomponent.h | 4 +- src/gui/components/logcomponent.cpp | 2 +- src/gui/components/logcomponent.h | 2 +- src/gui/components/logincomponent.cpp | 2 +- src/gui/components/logincomponent.h | 2 +- src/gui/components/maininfoareacomponent.cpp | 2 +- src/gui/components/maininfoareacomponent.h | 6 +- .../components/mainkeypadareacomponent.cpp | 2 +- src/gui/components/mainkeypadareacomponent.h | 2 +- src/gui/components/mappingcomponent.cpp | 2 +- src/gui/components/mappingcomponent.h | 2 +- src/gui/components/marginsinput.cpp | 2 +- src/gui/components/marginsinput.h | 2 +- .../matchingstatisticscomponent.cpp | 2 +- .../components/matchingstatisticscomponent.h | 2 +- src/gui/components/modelbrowsercomponent.cpp | 5 +- src/gui/components/modelbrowsercomponent.h | 2 +- src/gui/components/modelbrowserdialog.cpp | 5 +- src/gui/components/modelbrowserdialog.h | 4 +- .../modelconverterxsetupcomponent.cpp | 2 +- .../modelconverterxsetupcomponent.h | 2 +- src/gui/components/modelmatchercomponent.cpp | 2 +- src/gui/components/modelmatchercomponent.h | 2 +- .../components/modelmatcherlogcomponent.cpp | 2 +- src/gui/components/modelmatcherlogcomponent.h | 2 +- src/gui/components/modelmatcherlogenable.cpp | 2 +- src/gui/components/modelmatcherlogenable.h | 2 +- src/gui/components/modelmodeselector.cpp | 5 +- src/gui/components/modelmodeselector.h | 2 +- src/gui/components/navigatordialog.cpp | 2 +- src/gui/components/navigatordialog.h | 18 +- .../networkaircraftvaluescomponent.cpp | 5 +- .../networkaircraftvaluescomponent.h | 2 +- .../components/networkdetailscomponent.cpp | 2 +- src/gui/components/networkdetailscomponent.h | 2 +- .../otherswiftversionscomponent.cpp | 2 +- .../components/otherswiftversionscomponent.h | 2 +- .../components/otherswiftversionsdialog.cpp | 2 +- src/gui/components/otherswiftversionsdialog.h | 2 +- src/gui/components/ownaircraftcomponent.cpp | 2 +- src/gui/components/ownaircraftcomponent.h | 2 +- src/gui/components/radarcomponent.cpp | 2 +- src/gui/components/radarcomponent.h | 4 +- .../components/rawfsdmessagescomponent.cpp | 2 +- src/gui/components/rawfsdmessagescomponent.h | 2 +- src/gui/components/rawfsdmessagesdialog.cpp | 2 +- src/gui/components/rawfsdmessagesdialog.h | 2 +- src/gui/components/registercomponent.cpp | 2 +- src/gui/components/registercomponent.h | 2 +- src/gui/components/remoteaircraftselector.cpp | 2 +- src/gui/components/remoteaircraftselector.h | 4 +- src/gui/components/selcalcodeselector.cpp | 2 +- src/gui/components/selcalcodeselector.h | 2 +- .../components/settingsadvancedcomponent.cpp | 2 +- .../components/settingsadvancedcomponent.h | 2 +- src/gui/components/settingsfontcomponent.cpp | 2 +- src/gui/components/settingsfontcomponent.h | 2 +- src/gui/components/settingsfontdialog.cpp | 2 +- src/gui/components/settingsfontdialog.h | 2 +- src/gui/components/settingsguicomponent.cpp | 2 +- src/gui/components/settingsguicomponent.h | 2 +- .../components/settingshotkeycomponent.cpp | 2 +- src/gui/components/settingshotkeycomponent.h | 6 +- .../components/settingsmatchingcomponent.cpp | 2 +- .../components/settingsmatchingcomponent.h | 2 +- src/gui/components/settingsmatchingdialog.cpp | 2 +- src/gui/components/settingsmatchingdialog.h | 2 +- src/gui/components/settingsmodelcomponent.cpp | 2 +- src/gui/components/settingsmodelcomponent.h | 2 +- .../components/settingsnetworkcomponent.cpp | 2 +- src/gui/components/settingsnetworkcomponent.h | 2 +- .../settingsnetworkserverscomponent.cpp | 2 +- .../settingsnetworkserverscomponent.h | 2 +- .../settingssimulatorbasicscomponent.cpp | 2 +- .../settingssimulatorbasicscomponent.h | 2 +- .../components/settingssimulatorcomponent.cpp | 2 +- .../components/settingssimulatorcomponent.h | 2 +- .../settingssimulatormessagescomponent.cpp | 2 +- .../settingssimulatormessagescomponent.h | 2 +- src/gui/components/settingsswiftplugin.cpp | 2 +- src/gui/components/settingsswiftplugin.h | 2 +- .../settingstextmessageinlinecomponent.cpp | 2 +- .../settingstextmessageinlinecomponent.h | 2 +- .../components/settingstextmessagestyle.cpp | 2 +- src/gui/components/settingstextmessagestyle.h | 2 +- .../settingsvatsimreaderscomponent.cpp | 2 +- .../settingsvatsimreaderscomponent.h | 2 +- .../components/settingsviewupdatetimes.cpp | 2 +- src/gui/components/settingsviewupdatetimes.h | 2 +- .../components/settingsxswiftbuscomponent.cpp | 2 +- .../components/settingsxswiftbuscomponent.h | 2 +- src/gui/components/setuploadingdialog.cpp | 2 +- src/gui/components/setuploadingdialog.h | 2 +- src/gui/components/simbriefdownloaddialog.cpp | 2 +- src/gui/components/simbriefdownloaddialog.h | 4 +- src/gui/components/simulatorcomponent.cpp | 2 +- src/gui/components/simulatorcomponent.h | 2 +- src/gui/components/simulatorselector.cpp | 2 +- src/gui/components/simulatorselector.h | 2 +- src/gui/components/statusmessageform.cpp | 2 +- src/gui/components/statusmessageform.h | 2 +- src/gui/components/statusmessageformsmall.cpp | 2 +- src/gui/components/statusmessageformsmall.h | 2 +- src/gui/components/statusmessagesdetail.cpp | 2 +- src/gui/components/statusmessagesdetail.h | 4 +- src/gui/components/stringlistdialog.cpp | 2 +- src/gui/components/stringlistdialog.h | 2 +- src/gui/components/texteditdialog.cpp | 2 +- src/gui/components/texteditdialog.h | 2 +- src/gui/components/textmessagecomponent.cpp | 2 +- src/gui/components/textmessagecomponent.h | 4 +- src/gui/components/transpondercodespinbox.h | 2 +- .../components/transpondermodecomponent.cpp | 2 +- src/gui/components/transpondermodecomponent.h | 2 +- src/gui/components/updateinfocomponent.cpp | 2 +- src/gui/components/updateinfocomponent.h | 2 +- src/gui/components/updateinfodialog.cpp | 2 +- src/gui/components/updateinfodialog.h | 4 +- src/gui/components/usercomponent.cpp | 2 +- src/gui/components/usercomponent.h | 2 +- src/gui/dockwidget.h | 12 +- src/gui/dockwidgetinfoarea.h | 4 +- src/gui/dockwidgetinfobar.h | 6 +- src/gui/dropbase.cpp | 4 - src/gui/dropbase.h | 4 +- src/gui/dropsite.h | 8 +- src/gui/ecosystemcombobox.h | 2 +- src/gui/editors/aircrafticaoform.cpp | 2 +- src/gui/editors/aircrafticaoform.h | 10 +- src/gui/editors/aircraftmodelform.cpp | 2 +- src/gui/editors/aircraftmodelform.h | 8 +- src/gui/editors/aircraftpartsform.cpp | 2 +- src/gui/editors/aircraftpartsform.h | 8 +- src/gui/editors/airlineicaoform.cpp | 2 +- src/gui/editors/airlineicaoform.h | 10 +- src/gui/editors/cockpitcomform.cpp | 2 +- src/gui/editors/cockpitcomform.h | 8 +- src/gui/editors/coordinateform.cpp | 2 +- src/gui/editors/coordinateform.h | 6 +- src/gui/editors/distributorform.cpp | 2 +- src/gui/editors/distributorform.h | 10 +- src/gui/editors/form.cpp | 4 +- src/gui/editors/form.h | 4 +- src/gui/editors/fsdsetupform.h | 6 +- src/gui/editors/interpolationsetupform.cpp | 2 +- src/gui/editors/interpolationsetupform.h | 6 +- src/gui/editors/liveryform.cpp | 2 +- src/gui/editors/liveryform.h | 10 +- src/gui/editors/matchingform.cpp | 2 +- src/gui/editors/matchingform.h | 6 +- src/gui/editors/modelmappingform.cpp | 2 +- src/gui/editors/modelmappingform.h | 10 +- src/gui/editors/modelmappingmodifyform.cpp | 5 +- src/gui/editors/modelmappingmodifyform.h | 6 +- src/gui/editors/ownmodelsetform.cpp | 5 +- src/gui/editors/ownmodelsetform.h | 4 +- src/gui/editors/pbhsform.cpp | 2 +- src/gui/editors/pbhsform.h | 4 +- src/gui/editors/pilotform.cpp | 2 +- src/gui/editors/pilotform.h | 6 +- src/gui/editors/relativeaircraftposition.cpp | 2 +- src/gui/editors/relativeaircraftposition.h | 4 +- src/gui/editors/serverform.cpp | 2 +- src/gui/editors/serverform.h | 6 +- src/gui/editors/situationform.cpp | 2 +- src/gui/editors/situationform.h | 8 +- src/gui/editors/validationindicator.cpp | 2 +- src/gui/editors/validationindicator.h | 2 +- src/gui/enablefordockwidgetinfoarea.h | 2 +- src/gui/enableforframelesswindow.h | 2 +- src/gui/filters/aircrafticaofilterbar.cpp | 2 +- src/gui/filters/aircrafticaofilterbar.h | 4 +- src/gui/filters/aircraftmodelfilterbar.cpp | 2 +- src/gui/filters/aircraftmodelfilterbar.h | 8 +- src/gui/filters/aircraftmodelfilterdialog.cpp | 2 +- src/gui/filters/aircraftmodelfilterdialog.h | 4 +- src/gui/filters/airlineicaofilterbar.cpp | 2 +- src/gui/filters/airlineicaofilterbar.h | 8 +- src/gui/filters/countryfilterbar.cpp | 2 +- src/gui/filters/countryfilterbar.h | 9 +- src/gui/filters/distributorfilterbar.cpp | 2 +- src/gui/filters/distributorfilterbar.h | 8 +- src/gui/filters/filterbarbuttons.cpp | 2 +- src/gui/filters/filterbarbuttons.h | 2 +- src/gui/filters/filterdialog.cpp | 2 - src/gui/filters/filterdialog.h | 2 +- src/gui/filters/filterwidget.cpp | 2 +- src/gui/filters/filterwidget.h | 2 +- src/gui/filters/liveryfilterbar.cpp | 2 +- src/gui/filters/liveryfilterbar.h | 8 +- src/gui/filters/statusmessagefilterbar.cpp | 4 +- src/gui/filters/statusmessagefilterbar.h | 8 +- src/gui/filters/statusmessagefilterdialog.cpp | 2 +- src/gui/filters/statusmessagefilterdialog.h | 4 +- src/gui/guiactionbind.cpp | 2 - src/gui/guiactionbind.h | 2 +- src/gui/infoarea.cpp | 2 - src/gui/infoarea.h | 8 +- src/gui/labelandicon.cpp | 2 +- src/gui/labelandicon.h | 2 +- src/gui/led.h | 6 +- src/gui/levelmeter.cpp | 2 +- src/gui/levelmeter.h | 2 +- src/gui/lineedithistory.h | 4 +- src/gui/loadindicator.h | 10 +- src/gui/mainwindowaccess.cpp | 5 +- src/gui/mainwindowaccess.h | 2 +- src/gui/managedstatusbar.h | 2 +- src/gui/menus/aircraftmodelmenus.h | 6 +- src/gui/menus/fontmenus.h | 2 +- src/gui/menus/menuaction.h | 2 +- src/gui/menus/menudelegate.h | 2 +- src/gui/models/actionhotkeylistmodel.h | 2 +- src/gui/models/actionmodel.cpp | 2 +- src/gui/models/actionmodel.h | 2 +- src/gui/models/aircraftcategorylistmodel.h | 2 +- src/gui/models/aircraftcategorytreemodel.h | 2 +- src/gui/models/aircrafticaofilter.h | 2 +- src/gui/models/aircrafticaolistmodel.h | 2 +- src/gui/models/aircraftmodelfilter.h | 2 +- src/gui/models/aircraftmodellistmodel.h | 10 +- src/gui/models/aircraftpartslistmodel.h | 2 +- .../models/aircraftsituationchangelistmodel.h | 2 +- src/gui/models/aircraftsituationlistmodel.h | 2 +- src/gui/models/airlineicaofilter.h | 2 +- src/gui/models/airlineicaolistmodel.h | 4 +- src/gui/models/applicationinfolistmodel.h | 2 +- src/gui/models/atcstationlistmodel.h | 2 +- src/gui/models/atcstationtreemodel.h | 2 +- src/gui/models/audiodeviceinfolistmodel.h | 2 +- src/gui/models/clientlistmodel.h | 4 +- src/gui/models/columnformatters.h | 56 ++-- src/gui/models/countryfilter.h | 2 +- src/gui/models/countrylistmodel.h | 2 +- src/gui/models/distributorfilter.h | 2 +- src/gui/models/distributorlistmodel.h | 4 +- src/gui/models/identifierlistmodel.h | 2 +- src/gui/models/interpolationsetupmodel.h | 2 +- src/gui/models/listmodelcallsignobjects.h | 6 +- src/gui/models/listmodeldbobjects.h | 14 +- src/gui/models/listmodeltimestampobjects.h | 2 +- src/gui/models/liveryfilter.h | 3 +- src/gui/models/liverylistmodel.h | 2 +- src/gui/models/matchingstatisticsmodel.h | 2 +- src/gui/models/modelfilter.h | 2 +- src/gui/models/namevariantpairlistmodel.h | 2 +- src/gui/models/selectionmodel.h | 2 +- src/gui/models/serverlistmodel.h | 2 +- src/gui/models/simulatedaircraftlistmodel.h | 2 +- src/gui/models/statusmessagefilter.h | 5 +- src/gui/models/statusmessagelistmodel.h | 4 +- src/gui/models/textmessagelistmodel.h | 4 +- src/gui/models/userlistmodel.h | 2 +- src/gui/overlaymessages.cpp | 2 +- src/gui/overlaymessages.h | 4 +- src/gui/overlaymessagesframe.h | 6 +- src/gui/pluginconfig.h | 2 +- src/gui/plugindetailswindow.cpp | 2 +- src/gui/plugindetailswindow.h | 2 +- src/gui/settings/dockwidgetsettings.cpp | 2 - src/gui/settings/dockwidgetsettings.h | 2 +- src/gui/settings/guisettings.cpp | 2 - src/gui/settings/guisettings.h | 2 +- src/gui/settings/navigatorsettings.cpp | 2 - src/gui/settings/navigatorsettings.h | 4 +- src/gui/settings/textmessagesettings.cpp | 2 - src/gui/settings/textmessagesettings.h | 2 +- src/gui/settings/viewupdatesettings.cpp | 2 - src/gui/settings/viewupdatesettings.h | 2 +- src/gui/sharedstringlistcompleter.h | 2 +- src/gui/showhidebar.cpp | 2 +- src/gui/showhidebar.h | 2 +- src/gui/systemtraywindow.h | 4 +- src/gui/textmessagetextedit.cpp | 2 +- src/gui/textmessagetextedit.h | 2 +- src/gui/uppercasevalidator.h | 4 +- .../views/aircraftmodelstatisticsdialog.cpp | 2 +- src/gui/views/aircraftmodelstatisticsdialog.h | 2 +- .../views/aircraftmodelvalidationdialog.cpp | 2 +- src/gui/views/aircraftmodelvalidationdialog.h | 2 +- src/gui/views/aircraftmodelview.h | 10 +- src/gui/views/aircraftsituationview.h | 2 +- src/gui/views/applicationinfoview.h | 2 +- src/gui/views/atcstationview.h | 2 +- src/gui/views/checkboxdelegate.cpp | 2 - src/gui/views/checkboxdelegate.h | 14 +- src/gui/views/flightplandialog.cpp | 2 +- src/gui/views/flightplandialog.h | 2 +- src/gui/views/radarview.h | 4 +- src/gui/views/simulatedaircraftview.h | 2 +- src/gui/views/userview.h | 2 +- src/gui/views/viewbase.h | 111 ++++---- src/gui/views/viewbaseitemdelegate.h | 5 +- src/gui/views/viewbasenontemplate.cpp | 5 +- src/gui/views/viewbaseproxystyle.h | 4 +- src/gui/views/viewcallsignobjects.h | 2 +- src/gui/views/viewdbobjects.h | 8 +- src/input/joystick.h | 2 +- src/input/keyboard.h | 2 +- src/input/linux/joysticklinux.h | 6 +- src/input/linux/keyboardlinux.h | 4 +- src/misc/CMakeLists.txt | 1 - src/misc/applicationinfolist.cpp | 2 - src/misc/applicationinfolist.h | 2 +- src/misc/atomicfile.h | 6 +- src/misc/aviation/aircraftcategorylist.cpp | 2 - src/misc/aviation/aircraftcategorylist.h | 2 +- src/misc/aviation/aircraftengine.h | 2 +- src/misc/aviation/aircrafticaocode.h | 2 +- src/misc/aviation/aircrafticaocodelist.cpp | 2 - src/misc/aviation/aircrafticaocodelist.h | 2 +- src/misc/aviation/aircraftparts.h | 2 +- src/misc/aviation/aircraftpartslist.cpp | 2 - src/misc/aviation/aircraftpartslist.h | 2 +- src/misc/aviation/aircraftsituation.cpp | 2 - src/misc/aviation/aircraftsituation.h | 15 +- .../aviation/aircraftsituationchangelist.cpp | 2 - .../aviation/aircraftsituationchangelist.h | 2 +- src/misc/aviation/aircraftvelocity.cpp | 2 - src/misc/aviation/aircraftvelocity.h | 2 +- src/misc/aviation/airlineicaocodelist.cpp | 2 - src/misc/aviation/airlineicaocodelist.h | 2 +- src/misc/aviation/airport.h | 14 +- src/misc/aviation/airporticaocode.h | 2 +- src/misc/aviation/atcstation.cpp | 2 - src/misc/aviation/atcstation.h | 10 +- src/misc/aviation/atcstationlist.cpp | 2 - src/misc/aviation/atcstationlist.h | 2 +- src/misc/aviation/callsign.h | 2 +- src/misc/aviation/callsignset.cpp | 2 - src/misc/aviation/callsignset.h | 2 +- src/misc/aviation/comsystem.h | 2 +- src/misc/aviation/flightplan.cpp | 2 - src/misc/aviation/flightplan.h | 2 +- src/misc/aviation/flightplanlist.cpp | 2 - src/misc/aviation/flightplanlist.h | 2 +- src/misc/aviation/livery.cpp | 2 - src/misc/aviation/livery.h | 2 +- src/misc/aviation/liverylist.cpp | 2 - src/misc/aviation/liverylist.h | 2 +- src/misc/countrylist.cpp | 2 - src/misc/countrylist.h | 2 +- src/misc/crashhandler.h | 2 +- src/misc/datacache.cpp | 2 - src/misc/datacache.h | 6 +- src/misc/db/artifact.cpp | 2 - src/misc/db/artifact.h | 2 +- src/misc/db/artifactlist.cpp | 2 - src/misc/db/artifactlist.h | 2 +- src/misc/db/dbinfolist.cpp | 2 - src/misc/db/dbinfolist.h | 2 +- src/misc/db/distribution.cpp | 2 - src/misc/db/distribution.h | 2 +- src/misc/db/distributionlist.cpp | 2 - src/misc/db/distributionlist.h | 2 +- src/misc/db/updateinfo.h | 4 +- src/misc/dbusserver.h | 2 +- src/misc/dictionary.h | 2 +- src/misc/geo/coordinategeodetic.cpp | 4 - src/misc/geo/coordinategeodetic.h | 18 +- src/misc/geo/coordinategeodeticlist.cpp | 2 - src/misc/geo/coordinategeodeticlist.h | 2 +- src/misc/geo/elevationplane.h | 4 +- src/misc/icon.h | 2 +- src/misc/iconlist.h | 2 +- src/misc/identifierlist.cpp | 2 - src/misc/identifierlist.h | 2 +- src/misc/input/keyboardkeylist.cpp | 2 - src/misc/input/keyboardkeylist.h | 2 +- src/misc/logmessage.cpp | 2 - src/misc/logmessage.h | 2 +- src/misc/namevariantpairlist.cpp | 2 - src/misc/namevariantpairlist.h | 2 +- src/misc/network/authenticateduser.cpp | 2 - src/misc/network/authenticateduser.h | 2 +- src/misc/network/clientlist.cpp | 2 - src/misc/network/clientlist.h | 2 +- src/misc/network/clientprovider.h | 30 +- src/misc/network/ecosystem.h | 2 +- src/misc/network/ecosystemlist.cpp | 2 - src/misc/network/ecosystemlist.h | 2 +- src/misc/network/fsdsetup.h | 2 +- src/misc/network/rawfsdmessagelist.cpp | 2 - src/misc/network/rawfsdmessagelist.h | 2 +- src/misc/network/remotefilelist.cpp | 2 - src/misc/network/remotefilelist.h | 2 +- src/misc/network/rolelist.cpp | 2 - src/misc/network/rolelist.h | 2 +- src/misc/network/server.h | 2 +- src/misc/network/serverlist.cpp | 2 - src/misc/network/serverlist.h | 2 +- src/misc/network/textmessage.h | 2 +- src/misc/network/textmessagelist.cpp | 2 - src/misc/network/textmessagelist.h | 2 +- src/misc/network/urlloglist.cpp | 2 - src/misc/network/urlloglist.h | 2 +- src/misc/network/userlist.cpp | 2 - src/misc/network/userlist.h | 2 +- src/misc/orderable.cpp | 2 - src/misc/orderable.h | 2 +- src/misc/platform.h | 2 +- src/misc/platformset.cpp | 2 - src/misc/platformset.h | 2 +- src/misc/pq/units.h | 8 +- src/misc/processinfo.h | 2 +- src/misc/promise.h | 2 +- src/misc/propertyindexlist.cpp | 2 - src/misc/propertyindexlist.h | 2 +- src/misc/provider.cpp | 9 - src/misc/provider.h | 4 +- src/misc/sharedstate/datalinkdbus.h | 10 +- src/misc/sharedstate/datalinklocal.h | 10 +- src/misc/sharedstate/dbus/dupleximpl.h | 15 +- src/misc/sharedstate/dbus/duplexproxy.h | 15 +- src/misc/sharedstate/dbus/hubimpl.h | 12 +- src/misc/sharedstate/dbus/hubproxy.h | 12 +- src/misc/sharedstate/listobserver.h | 12 +- src/misc/sharedstate/scalarobserver.h | 2 +- src/misc/simulation/aircraftmodel.h | 2 +- src/misc/simulation/aircraftmodelinterfaces.h | 20 +- src/misc/simulation/aircraftmodellist.cpp | 2 - src/misc/simulation/aircraftmodellist.h | 2 +- src/misc/simulation/aircraftmodelloader.cpp | 2 - src/misc/simulation/aircraftmodelloader.h | 12 +- .../simulation/airspaceaircraftsnapshot.cpp | 2 - .../simulation/airspaceaircraftsnapshot.h | 2 +- src/misc/simulation/backgroundvalidation.h | 2 +- src/misc/simulation/categorymatcher.h | 2 +- src/misc/simulation/distributor.cpp | 2 - src/misc/simulation/distributor.h | 2 +- src/misc/simulation/distributorlist.cpp | 2 - src/misc/simulation/distributorlist.h | 2 +- .../simulation/distributorlistpreferences.cpp | 2 - .../simulation/distributorlistpreferences.h | 2 +- .../fscommon/aircraftcfgentrieslist.cpp | 2 - .../fscommon/aircraftcfgentrieslist.h | 2 +- .../simulation/fscommon/aircraftcfgparser.h | 8 +- .../simulation/fscommon/vpilotmodelrule.cpp | 2 - .../simulation/fscommon/vpilotmodelrule.h | 2 +- .../simulation/fsx/simconnectutilities.cpp | 2 - src/misc/simulation/fsx/simconnectutilities.h | 2 +- .../interpolationrenderingsetup.cpp | 10 - .../interpolationrenderingsetup.h | 6 +- .../interpolation/interpolationsetuplist.cpp | 2 - .../interpolation/interpolationsetuplist.h | 2 +- .../interpolation/interpolatorlinear.h | 2 +- .../interpolation/interpolatormulti.cpp | 2 - .../interpolation/interpolatormulti.h | 2 +- .../interpolation/interpolatorspline.h | 2 +- src/misc/simulation/matchingscript.h | 4 +- src/misc/simulation/matchingstatistics.cpp | 2 - src/misc/simulation/matchingstatistics.h | 2 +- .../simulation/matchingstatisticsentry.cpp | 2 - src/misc/simulation/matchingstatisticsentry.h | 2 +- .../simulation/ownaircraftproviderdummy.h | 50 ++-- .../simulation/remoteaircraftprovider.cpp | 6 - src/misc/simulation/remoteaircraftprovider.h | 135 +++++---- .../simulation/remoteaircraftproviderdummy.h | 4 +- .../simulation/settings/modelsettings.cpp | 2 - src/misc/simulation/settings/modelsettings.h | 2 +- .../simulation/settings/simulatorsettings.cpp | 2 - .../simulation/settings/simulatorsettings.h | 6 +- .../settings/swiftpluginsettings.cpp | 2 - .../simulation/settings/swiftpluginsettings.h | 2 +- .../simulation/settings/xswiftbussettings.cpp | 2 - .../simulation/settings/xswiftbussettings.h | 6 +- .../settings/xswiftbussettingsqtfree.h | 4 +- src/misc/simulation/simulatedaircraft.h | 11 +- src/misc/simulation/simulatedaircraftlist.cpp | 2 - src/misc/simulation/simulatedaircraftlist.h | 2 +- src/misc/simulation/simulatorinfo.cpp | 2 - src/misc/simulation/simulatorinfo.h | 2 +- src/misc/simulation/simulatorinfolist.cpp | 2 - src/misc/simulation/simulatorinfolist.h | 2 +- src/misc/simulation/simulatorinternals.h | 2 +- .../simulation/simulatorplugininfolist.cpp | 2 - src/misc/simulation/simulatorplugininfolist.h | 2 +- .../xplane/aircraftmodelloaderxplane.h | 8 +- .../simulation/xplane/navdatareference.cpp | 4 - src/misc/simulation/xplane/navdatareference.h | 17 +- src/misc/slot.h | 2 +- src/misc/statusexception.h | 4 +- src/misc/statusmessage.h | 2 +- src/misc/test/testserviceinterface.cpp | 2 - src/misc/test/testserviceinterface.h | 2 +- src/misc/timestampbased.cpp | 2 - src/misc/timestampbased.h | 2 +- src/misc/variant.h | 2 +- src/misc/variantlist.h | 2 +- src/misc/variantmap.h | 2 +- src/misc/variantprivate.h | 47 ++- src/misc/weather/metardecoder.cpp | 2 +- .../simulator/emulated/simulatoremulated.h | 71 +++-- .../emulated/simulatoremulatedfactory.h | 11 +- .../simulatoremulatedmonitordialog.cpp | 2 +- .../emulated/simulatoremulatedmonitordialog.h | 2 +- .../emulatedconfig/simulatoremulatedconfig.h | 2 +- .../simulatoremulatedconfigwidget.cpp | 2 +- .../simulatoremulatedconfigwidget.h | 2 +- .../flightgear/flightgearmpaircraft.cpp | 2 - .../flightgear/flightgearmpaircraft.h | 2 +- .../flightgear/simulatorflightgear.h | 70 +++-- .../simulatorflightgearconfig.h | 2 +- .../simulatorflightgearconfigwindow.cpp | 2 +- .../simulatorflightgearconfigwindow.h | 2 +- .../plugincommon/simulatorplugincommon.h | 8 +- .../simulator/xplane/simulatorxplane.h | 80 +++--- .../simulator/xplane/xplanempaircraft.cpp | 2 - .../simulator/xplane/xplanempaircraft.h | 4 +- .../xplaneconfig/simulatorxplaneconfig.h | 2 +- .../simulatorxplaneconfigwindow.cpp | 2 +- .../simulatorxplaneconfigwindow.h | 2 +- src/sound/notificationplayer.h | 2 +- .../sampleprovider/bufferedwaveprovider.h | 2 +- .../sampleprovider/equalizersampleprovider.h | 2 +- .../sampleprovider/mixingsampleprovider.h | 2 +- src/sound/sampleprovider/pinknoisegenerator.h | 2 +- .../resourcesoundsampleprovider.h | 4 +- src/sound/sampleprovider/sampleprovider.h | 2 +- src/sound/sampleprovider/sawtoothgenerator.h | 2 +- .../sampleprovider/simplecompressoreffect.h | 2 +- src/sound/sampleprovider/sinusgenerator.h | 2 +- .../sampleprovider/volumesampleprovider.h | 2 +- src/sound/selcalplayer.h | 2 +- src/sound/threadedtonepairplayer.h | 6 +- src/swiftcore/swiftcore.cpp | 2 +- src/swiftcore/swiftcore.h | 2 +- src/swiftdata/swiftdata.cpp | 2 +- src/swiftdata/swiftdata.h | 4 +- src/swiftguistandard/swiftguistd.cpp | 2 +- src/swiftguistandard/swiftguistd.h | 12 +- src/swiftguistandard/swiftguistdapplication.h | 4 +- src/swiftlauncher/swiftlauncher.h | 6 +- src/xswiftbus/service.cpp | 1 + .../core/fsd/testfsdclient/testfsdclient.cpp | 2 +- .../fsd/testfsdmessages/testfsdmessages.cpp | 2 +- tests/misc/testcompress/testcompress.cpp | 2 +- tests/misc/testsharedstate/testsharedstate.h | 6 +- tests/misc/testvalueobject.h | 2 +- 781 files changed, 2015 insertions(+), 2370 deletions(-) delete mode 100644 src/misc/provider.cpp diff --git a/.clang-tidy b/.clang-tidy index 244e8cba0..73f03d9b2 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -4,6 +4,7 @@ Checks: > -*, modernize-use-auto, + modernize-use-override, CheckOptions: diff --git a/src/core/actionbind.cpp b/src/core/actionbind.cpp index b390e6ed2..dc37ffde5 100644 --- a/src/core/actionbind.cpp +++ b/src/core/actionbind.cpp @@ -22,11 +22,6 @@ namespace swift::core return a; } - CActionBind::~CActionBind() - { - // void - } - void CActionBind::unbind() { if (m_index < 0) { return; } diff --git a/src/core/actionbind.h b/src/core/actionbind.h index 3ec7875ae..3f16a6524 100644 --- a/src/core/actionbind.h +++ b/src/core/actionbind.h @@ -50,7 +50,7 @@ namespace swift::core //! @} //! Destructor - ~CActionBind() override; + ~CActionBind() override = default; //! Unbind from swift::core::CInputManager void unbind(); diff --git a/src/core/afv/audio/input.h b/src/core/afv/audio/input.h index e32085398..76d5af2a6 100644 --- a/src/core/afv/audio/input.h +++ b/src/core/afv/audio/input.h @@ -35,10 +35,10 @@ namespace swift::core::afv::audio void stop(); //! \copydoc QIODevice::readData - virtual qint64 readData(char *data, qint64 maxlen) override; + qint64 readData(char *data, qint64 maxlen) override; //! \copydoc QIODevice::writeData - virtual qint64 writeData(const char *data, qint64 len) override; + qint64 writeData(const char *data, qint64 len) override; signals: //! Frame is available @@ -80,7 +80,7 @@ namespace swift::core::afv::audio CInput(int sampleRate, QObject *parent = nullptr); //! Dtor - virtual ~CInput() override { this->stop(); } + ~CInput() override { this->stop(); } //! @{ //! Number of encoded bytes diff --git a/src/core/afv/model/atcstationmodel.cpp b/src/core/afv/model/atcstationmodel.cpp index 5e9e5af69..bb77a703f 100644 --- a/src/core/afv/model/atcstationmodel.cpp +++ b/src/core/afv/model/atcstationmodel.cpp @@ -33,8 +33,6 @@ namespace swift::core::afv::model CSampleAtcStationModel::CSampleAtcStationModel(QObject *parent) : QAbstractListModel(parent) {} - CSampleAtcStationModel::~CSampleAtcStationModel() {} - void CSampleAtcStationModel::updateAtcStations(const QVector &atcStations) { // Add stations which didn't exist yet diff --git a/src/core/afv/model/atcstationmodel.h b/src/core/afv/model/atcstationmodel.h index f41b79b55..73bbe86d2 100644 --- a/src/core/afv/model/atcstationmodel.h +++ b/src/core/afv/model/atcstationmodel.h @@ -65,7 +65,7 @@ namespace swift::core::afv::model CSampleAtcStationModel(QObject *parent = nullptr); //! Dtor - ~CSampleAtcStationModel() override; + ~CSampleAtcStationModel() override = default; //! Update the stations void updateAtcStations(const QVector &atcStations); diff --git a/src/core/aircraftmatcher.h b/src/core/aircraftmatcher.h index 53e3f3064..3bc8972fc 100644 --- a/src/core/aircraftmatcher.h +++ b/src/core/aircraftmatcher.h @@ -54,7 +54,7 @@ namespace swift::core //! Destructor //! \remark saves a log of removed models if any - virtual ~CAircraftMatcher() override; + ~CAircraftMatcher() override; //! Copy constructor CAircraftMatcher(const CAircraftMatcher &) = delete; @@ -268,13 +268,13 @@ namespace swift::core swift::misc::CStatusMessageList *log = nullptr); //! \copydoc swift::misc::simulation::IAircraftModelSetProvider::getModelSet - virtual swift::misc::simulation::CAircraftModelList getModelSet() const override { return m_modelSet; } + swift::misc::simulation::CAircraftModelList getModelSet() const override { return m_modelSet; } //! Model set as reference virtual const swift::misc::simulation::CAircraftModelList &getModelSetRef() const { return m_modelSet; } //! Model set count - virtual int getModelSetCount() const override { return m_modelSet.sizeInt(); } + int getModelSetCount() const override { return m_modelSet.sizeInt(); } //! Models bool hasModels() const { return !m_modelSet.isEmpty(); } diff --git a/src/core/airspacemonitor.h b/src/core/airspacemonitor.h index 94b2e558e..7e5db2a36 100644 --- a/src/core/airspacemonitor.h +++ b/src/core/airspacemonitor.h @@ -195,7 +195,7 @@ namespace swift::core struct FsInnPacket { //! Default ctor - FsInnPacket() {} + FsInnPacket() = default; //! Constructor FsInnPacket(const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, @@ -358,7 +358,7 @@ namespace swift::core //! \threadsafe //! \remark sets gnd.flag from parts if parts are available //! \remark uses gnd.elevation if found - virtual swift::misc::aviation::CAircraftSituation + swift::misc::aviation::CAircraftSituation storeAircraftSituation(const swift::misc::aviation::CAircraftSituation &situation, bool allowTestOffset = true) override; diff --git a/src/core/context/contextapplicationempty.h b/src/core/context/contextapplicationempty.h index 68f6c4639..03d4cca7b 100644 --- a/src/core/context/contextapplicationempty.h +++ b/src/core/context/contextapplicationempty.h @@ -29,8 +29,8 @@ namespace swift::core public slots: //! \copydoc IContextApplication::changeSettings - virtual void changeSettings(const swift::misc::CValueCachePacket &settings, - const swift::misc::CIdentifier &origin) override + void changeSettings(const swift::misc::CValueCachePacket &settings, + const swift::misc::CIdentifier &origin) override { Q_UNUSED(settings); Q_UNUSED(origin); @@ -38,31 +38,31 @@ namespace swift::core } //! \copydoc IContextApplication::getAllSettings - virtual swift::misc::CValueCachePacket getAllSettings() const override + swift::misc::CValueCachePacket getAllSettings() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::CValueCachePacket(); } //! \copydoc IContextApplication::getUnsavedSettingsKeys - virtual QStringList getUnsavedSettingsKeys() const override + QStringList getUnsavedSettingsKeys() const override { logEmptyContextWarning(Q_FUNC_INFO); return QStringList(); } //! \copydoc IContextApplication::getUnsavedSettingsKeys - virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override + swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override { logEmptyContextWarning(Q_FUNC_INFO); return CSettingsDictionary(); } //! \copydoc IContextApplication::synchronizeLocalSettings - virtual void synchronizeLocalSettings() override { logEmptyContextWarning(Q_FUNC_INFO); } + void synchronizeLocalSettings() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextApplication::saveSettings - virtual swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override + swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override { Q_UNUSED(keyPrefix); logEmptyContextWarning(Q_FUNC_INFO); @@ -70,7 +70,7 @@ namespace swift::core } //! \copydoc IContextApplication::saveSettingsByKey - virtual swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override + swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override { Q_UNUSED(keys); logEmptyContextWarning(Q_FUNC_INFO); @@ -78,15 +78,14 @@ namespace swift::core } //! \copydoc IContextApplication::loadSettings - virtual swift::misc::CStatusMessage loadSettings() override + swift::misc::CStatusMessage loadSettings() override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::CStatusMessage(); } //! \copydoc IContextApplication::registerHotkeyActions - virtual void registerHotkeyActions(const QStringList &actions, - const swift::misc::CIdentifier &origin) override + void registerHotkeyActions(const QStringList &actions, const swift::misc::CIdentifier &origin) override { Q_UNUSED(actions); Q_UNUSED(origin); @@ -94,8 +93,8 @@ namespace swift::core } //! \copydoc IContextApplication::callHotkeyActionRemotely - virtual void callHotkeyActionRemotely(const QString &action, bool argument, - const swift::misc::CIdentifier &origin) override + void callHotkeyActionRemotely(const QString &action, bool argument, + const swift::misc::CIdentifier &origin) override { Q_UNUSED(action); Q_UNUSED(argument); @@ -104,7 +103,7 @@ namespace swift::core } //! \copydoc IContextApplication::registerApplication - virtual swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override + swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override { Q_UNUSED(application); logEmptyContextWarning(Q_FUNC_INFO); @@ -112,21 +111,21 @@ namespace swift::core } //! \copydoc IContextApplication::unregisterApplication - virtual void unregisterApplication(const swift::misc::CIdentifier &application) override + void unregisterApplication(const swift::misc::CIdentifier &application) override { Q_UNUSED(application); logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextApplication::getRegisteredApplications - virtual swift::misc::CIdentifierList getRegisteredApplications() const override + swift::misc::CIdentifierList getRegisteredApplications() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::CIdentifierList(); } //! \copydoc IContextApplication::getApplicationIdentifier - virtual swift::misc::CIdentifier getApplicationIdentifier() const override + swift::misc::CIdentifier getApplicationIdentifier() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::CIdentifier(); diff --git a/src/core/context/contextapplicationimpl.h b/src/core/context/contextapplicationimpl.h index 15daa2fc4..4b3b7d381 100644 --- a/src/core/context/contextapplicationimpl.h +++ b/src/core/context/contextapplicationimpl.h @@ -40,49 +40,48 @@ namespace swift::core public slots: //! \copydoc swift::core::context::IContextApplication::changeSettings - virtual void changeSettings(const swift::misc::CValueCachePacket &settings, - const swift::misc::CIdentifier &origin) override; + void changeSettings(const swift::misc::CValueCachePacket &settings, + const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::getAllSettings - virtual swift::misc::CValueCachePacket getAllSettings() const override; + swift::misc::CValueCachePacket getAllSettings() const override; //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeys - virtual QStringList getUnsavedSettingsKeys() const override; + QStringList getUnsavedSettingsKeys() const override; //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeysDescribed - virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; + swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; //! \copydoc swift::core::context::IContextApplication::synchronizeLocalSettings - virtual void synchronizeLocalSettings() override; + void synchronizeLocalSettings() override; //! \copydoc swift::core::context::IContextApplication::saveSettings - virtual swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; + swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; //! \copydoc swift::core::context::IContextApplication::saveSettingsByKey - virtual swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; + swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; //! \copydoc swift::core::context::IContextApplication::loadSettings - virtual swift::misc::CStatusMessage loadSettings() override; + swift::misc::CStatusMessage loadSettings() override; //! \copydoc swift::core::context::IContextApplication::registerHotkeyActions - virtual void registerHotkeyActions(const QStringList &actions, - const swift::misc::CIdentifier &origin) override; + void registerHotkeyActions(const QStringList &actions, const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::callHotkeyActionRemotely - virtual void callHotkeyActionRemotely(const QString &action, bool argument, - const swift::misc::CIdentifier &origin) override; + void callHotkeyActionRemotely(const QString &action, bool argument, + const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::registerApplication - virtual swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; + swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; //! \copydoc swift::core::context::IContextApplication::unregisterApplication - virtual void unregisterApplication(const swift::misc::CIdentifier &application) override; + void unregisterApplication(const swift::misc::CIdentifier &application) override; //! \copydoc swift::core::context::IContextApplication::getRegisteredApplications - virtual swift::misc::CIdentifierList getRegisteredApplications() const override; + swift::misc::CIdentifierList getRegisteredApplications() const override; //! \copydoc swift::core::context::IContextApplication::getApplicationIdentifier - virtual swift::misc::CIdentifier getApplicationIdentifier() const override; + swift::misc::CIdentifier getApplicationIdentifier() const override; protected: //! Constructor diff --git a/src/core/context/contextapplicationproxy.h b/src/core/context/contextapplicationproxy.h index a0ecba43e..71773e6e6 100644 --- a/src/core/context/contextapplicationproxy.h +++ b/src/core/context/contextapplicationproxy.h @@ -41,53 +41,52 @@ namespace swift::core public: //! Destructor - virtual ~CContextApplicationProxy() override {} + ~CContextApplicationProxy() override = default; public slots: //! \copydoc swift::core::context::IContextApplication::changeSettings - virtual void changeSettings(const swift::misc::CValueCachePacket &settings, - const swift::misc::CIdentifier &origin) override; + void changeSettings(const swift::misc::CValueCachePacket &settings, + const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::getAllSettings - virtual swift::misc::CValueCachePacket getAllSettings() const override; + swift::misc::CValueCachePacket getAllSettings() const override; //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeys - virtual QStringList getUnsavedSettingsKeys() const override; + QStringList getUnsavedSettingsKeys() const override; //! \copydoc swift::core::context::IContextApplication::getUnsavedSettingsKeysDescribed - virtual swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; + swift::core::context::CSettingsDictionary getUnsavedSettingsKeysDescribed() const override; //! \copydoc swift::core::context::IContextApplication::synchronizeLocalSettings - virtual void synchronizeLocalSettings() override; + void synchronizeLocalSettings() override; //! \copydoc swift::core::context::IContextApplication::saveSettings - virtual swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; + swift::misc::CStatusMessage saveSettings(const QString &keyPrefix = {}) override; //! \copydoc swift::core::context::IContextApplication::saveSettingsByKey - virtual swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; + swift::misc::CStatusMessage saveSettingsByKey(const QStringList &keys) override; //! \copydoc swift::core::context::IContextApplication::loadSettings - virtual swift::misc::CStatusMessage loadSettings() override; + swift::misc::CStatusMessage loadSettings() override; //! \copydoc swift::core::context::IContextApplication::registerHotkeyActions - virtual void registerHotkeyActions(const QStringList &actions, - const swift::misc::CIdentifier &origin) override; + void registerHotkeyActions(const QStringList &actions, const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::callHotkeyActionRemotely - virtual void callHotkeyActionRemotely(const QString &action, bool argument, - const swift::misc::CIdentifier &origin) override; + void callHotkeyActionRemotely(const QString &action, bool argument, + const swift::misc::CIdentifier &origin) override; //! \copydoc swift::core::context::IContextApplication::registerApplication - virtual swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; + swift::misc::CIdentifier registerApplication(const swift::misc::CIdentifier &application) override; //! \copydoc swift::core::context::IContextApplication::unregisterApplication - virtual void unregisterApplication(const swift::misc::CIdentifier &application) override; + void unregisterApplication(const swift::misc::CIdentifier &application) override; //! \copydoc swift::core::context::IContextApplication::getRegisteredApplications - virtual swift::misc::CIdentifierList getRegisteredApplications() const override; + swift::misc::CIdentifierList getRegisteredApplications() const override; //! \copydoc swift::core::context::IContextApplication::getApplicationIdentifier - virtual swift::misc::CIdentifier getApplicationIdentifier() const override; + swift::misc::CIdentifier getApplicationIdentifier() const override; //! Used to test if there is a core running? //! \note creates and connects via proxy object, so not meant for very frequent tests diff --git a/src/core/context/contextaudioproxy.h b/src/core/context/contextaudioproxy.h index 3d35e99af..d3db3b553 100644 --- a/src/core/context/contextaudioproxy.h +++ b/src/core/context/contextaudioproxy.h @@ -50,7 +50,7 @@ namespace swift::core public: //! Destructor - virtual ~CContextAudioProxy() override {} + ~CContextAudioProxy() override = default; //! Unit test relay signals //! \private @@ -58,27 +58,27 @@ namespace swift::core public slots: //! \copydoc swift::core::context::CContextAudioBase::getRegisteredDevices - virtual swift::misc::audio::CAudioDeviceInfoList getRegisteredDevices() const override; + swift::misc::audio::CAudioDeviceInfoList getRegisteredDevices() const override; //! \copydoc swift::core::context::CContextAudioBase::registerDevices - virtual void registerDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; + void registerDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevices - virtual void unRegisterDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; + void unRegisterDevices(const swift::misc::audio::CAudioDeviceInfoList &devices) override; //! \copydoc swift::core::context::CContextAudioBase::unRegisterDevicesFor - virtual void unRegisterDevicesFor(const swift::misc::CIdentifier &identifier) override; + void unRegisterDevicesFor(const swift::misc::CIdentifier &identifier) override; //! \copydoc swift::core::context::CContextAudioBase::registerAudioCallsign - virtual void registerAudioCallsign(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::CIdentifier &identifier) override; + void registerAudioCallsign(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::CIdentifier &identifier) override; //! \copydoc swift::core::context::CContextAudioBase::unRegisterAudioCallsign - virtual void unRegisterAudioCallsign(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::CIdentifier &identifier) override; + void unRegisterAudioCallsign(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::CIdentifier &identifier) override; //! \copydoc swift::core::context::CContextAudioBase::hasRegisteredAudioCallsign - virtual bool hasRegisteredAudioCallsign(const swift::misc::aviation::CCallsign &callsign) const override; + bool hasRegisteredAudioCallsign(const swift::misc::aviation::CCallsign &callsign) const override; private: swift::misc::CGenericDBusInterface *m_dBusInterface; diff --git a/src/core/context/contextnetwork.h b/src/core/context/contextnetwork.h index 96245152e..b29a4067a 100644 --- a/src/core/context/contextnetwork.h +++ b/src/core/context/contextnetwork.h @@ -91,14 +91,14 @@ namespace swift::core::context } //! \copydoc IContext::getPathAndContextId() - virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } + QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method static IContextNetwork *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, swift::misc::CDBusServer *server, QDBusConnection &connection); //! Destructor - virtual ~IContextNetwork() override {} + ~IContextNetwork() override = default; signals: //! An aircraft disappeared diff --git a/src/core/context/contextnetworkempty.h b/src/core/context/contextnetworkempty.h index 9bd95867c..a41a9d872 100644 --- a/src/core/context/contextnetworkempty.h +++ b/src/core/context/contextnetworkempty.h @@ -25,7 +25,7 @@ namespace swift::core::context public slots: //! \copydoc IContextNetwork::getAtcStationsOnline() - virtual swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override + swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override { Q_UNUSED(recalculateDistance) logEmptyContextWarning(Q_FUNC_INFO); @@ -33,7 +33,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getClosestAtcStationsOnline() - virtual swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override + swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override { Q_UNUSED(number) logEmptyContextWarning(Q_FUNC_INFO); @@ -41,14 +41,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getAircraftInRange() - virtual swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override + swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatedAircraftList(); } //! \copydoc IContextNetwork::getAircraftInRangeForCallsign - virtual swift::misc::simulation::CSimulatedAircraft + swift::misc::simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) @@ -57,7 +57,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getOnlineStationsForFrequency - virtual swift::misc::aviation::CAtcStationList + swift::misc::aviation::CAtcStationList getOnlineStationsForFrequency(const swift::misc::physical_quantities::CFrequency &frequency) const override { Q_UNUSED(frequency) @@ -66,21 +66,21 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getAircraftInRangeCallsigns() - virtual swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override + swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::aviation::CCallsignSet(); } //! \copydoc IContextNetwork::getAircraftInRangeCount - virtual int getAircraftInRangeCount() const override + int getAircraftInRangeCount() const override { logEmptyContextWarning(Q_FUNC_INFO); return 0; } //! \copydoc IContextNetwork::isAircraftInRange - virtual bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override + bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) logEmptyContextWarning(Q_FUNC_INFO); @@ -88,7 +88,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getOnlineStationForCallsign - virtual swift::misc::aviation::CAtcStation + swift::misc::aviation::CAtcStation getOnlineStationForCallsign(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) @@ -97,7 +97,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::isOnlineStation - virtual bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override + bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) logEmptyContextWarning(Q_FUNC_INFO); @@ -105,11 +105,11 @@ namespace swift::core::context } //! \copydoc 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 + 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 { Q_UNUSED(mode) Q_UNUSED(server) @@ -123,63 +123,63 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getNetworkPresetValues - virtual QStringList getNetworkPresetValues() const override + QStringList getNetworkPresetValues() const override { logEmptyContextWarning(Q_FUNC_INFO); return {}; } //! \copydoc IContextNetwork::getPartnerCallsign - virtual swift::misc::aviation::CCallsign getPartnerCallsign() const override + swift::misc::aviation::CCallsign getPartnerCallsign() const override { logEmptyContextWarning(Q_FUNC_INFO); return {}; } //! \copydoc IContextNetwork::disconnectFromNetwork() - virtual swift::misc::CStatusMessage disconnectFromNetwork() override + swift::misc::CStatusMessage disconnectFromNetwork() override { logEmptyContextWarning(Q_FUNC_INFO); return statusMessageEmptyContext(); } //! \copydoc IContextNetwork::isConnected() - virtual bool isConnected() const override + bool isConnected() const override { logEmptyContextWarning(Q_FUNC_INFO); return false; } //! \copydoc IContextNetwork::getConnectedServer - virtual swift::misc::network::CServer getConnectedServer() const override + swift::misc::network::CServer getConnectedServer() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::network::CServer(); } //! \copydoc IContextNetwork::getLoginMode - virtual swift::misc::network::CLoginMode getLoginMode() const override + swift::misc::network::CLoginMode getLoginMode() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::network::CLoginMode::Pilot; } //! \copydoc IContextNetwork::sendTextMessages() - virtual void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override + void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override { Q_UNUSED(textMessages) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::sendFlightPlan() - virtual void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override + void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override { Q_UNUSED(flightPlan) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::loadFlightPlanFromNetwork() - virtual swift::misc::aviation::CFlightPlan + swift::misc::aviation::CFlightPlan loadFlightPlanFromNetwork(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) @@ -197,14 +197,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getUsers() - virtual swift::misc::network::CUserList getUsers() const override + swift::misc::network::CUserList getUsers() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::network::CUserList(); } //! \copydoc IContextNetwork::getUsersForCallsigns - virtual swift::misc::network::CUserList + swift::misc::network::CUserList getUsersForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override { Q_UNUSED(callsigns) @@ -213,8 +213,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getUserForCallsign - virtual swift::misc::network::CUser - getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override + swift::misc::network::CUser getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) logEmptyContextWarning(Q_FUNC_INFO); @@ -222,14 +221,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getClients - virtual swift::misc::network::CClientList getClients() const override + swift::misc::network::CClientList getClients() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::network::CClientList(); } //! \copydoc IContextNetwork::getClientsForCallsigns - virtual swift::misc::network::CClientList + swift::misc::network::CClientList getClientsForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override { Q_UNUSED(callsigns) @@ -238,7 +237,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::setOtherClient - virtual bool setOtherClient(const swift::misc::network::CClient &client) override + bool setOtherClient(const swift::misc::network::CClient &client) override { Q_UNUSED(client) logEmptyContextWarning(Q_FUNC_INFO); @@ -246,21 +245,21 @@ namespace swift::core::context } //! \copydoc IContextNetwork::requestAircraftDataUpdates - virtual void requestAircraftDataUpdates() override { logEmptyContextWarning(Q_FUNC_INFO); } + void requestAircraftDataUpdates() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::requestAtisUpdates - virtual void requestAtisUpdates() override { logEmptyContextWarning(Q_FUNC_INFO); } + void requestAtisUpdates() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::testCreateDummyOnlineAtcStations - virtual void testCreateDummyOnlineAtcStations(int number) override + void testCreateDummyOnlineAtcStations(int number) override { Q_UNUSED(number) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::testAddAircraftParts - virtual void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftParts &parts, bool incremental) override + void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftParts &parts, bool incremental) override { Q_UNUSED(callsign) Q_UNUSED(parts) @@ -269,23 +268,23 @@ namespace swift::core::context } //! \copydoc IContextNetwork::testReceivedTextMessages - virtual void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override + void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override { Q_UNUSED(textMessages) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::testRequestAircraftConfig - virtual void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override + void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override { Q_UNUSED(callsign) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc 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 + bool testAddAltitudeOffset(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::physical_quantities::CLength &offset = + swift::misc::physical_quantities::CLength::null()) override { Q_UNUSED(callsign) Q_UNUSED(offset) @@ -294,8 +293,8 @@ namespace swift::core::context } //! \copydoc IContextNetwork::testReceivedAtisMessage - virtual void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CInformationMessage &msg) override + void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CInformationMessage &msg) override { Q_UNUSED(callsign) Q_UNUSED(msg) @@ -303,7 +302,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override { Q_UNUSED(commandLine) Q_UNUSED(originator) @@ -312,15 +311,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getVatsimFsdServers - virtual swift::misc::network::CServerList getVatsimFsdServers() const override + swift::misc::network::CServerList getVatsimFsdServers() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::network::CServerList(); } //! \copydoc IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const swift::misc::aviation::CCallsign &callsign, - bool enabledForRendering) override + bool updateAircraftEnabled(const swift::misc::aviation::CCallsign &callsign, bool enabledForRendering) override { Q_UNUSED(callsign) Q_UNUSED(enabledForRendering) @@ -329,8 +327,8 @@ namespace swift::core::context } //! \copydoc IContextNetwork::updateAircraftSupportingGndFLag - virtual bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, - bool supportGndFlag) override + bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, + bool supportGndFlag) override { Q_UNUSED(callsign) Q_UNUSED(supportGndFlag) @@ -339,9 +337,9 @@ namespace swift::core::context } //! \copydoc IContextNetwork::updateAircraftModel - virtual bool updateAircraftModel(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::simulation::CAircraftModel &model, - const swift::misc::CIdentifier &originator) override + bool updateAircraftModel(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::simulation::CAircraftModel &model, + const swift::misc::CIdentifier &originator) override { Q_UNUSED(callsign) Q_UNUSED(model) @@ -351,9 +349,9 @@ namespace swift::core::context } //! \copydoc IContextNetwork::updateAircraftNetworkModel - virtual bool updateAircraftNetworkModel(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::simulation::CAircraftModel &model, - const swift::misc::CIdentifier &originator) override + bool updateAircraftNetworkModel(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::simulation::CAircraftModel &model, + const swift::misc::CIdentifier &originator) override { Q_UNUSED(callsign) Q_UNUSED(model) @@ -363,8 +361,8 @@ namespace swift::core::context } //! \copydoc IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, - bool enableFastPositionSending) override + bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, + bool enableFastPositionSending) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign) @@ -373,8 +371,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::setAircraftEnabledFlag - virtual bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, - bool enabledForRendering) override + bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, bool enabledForRendering) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign) @@ -383,24 +380,24 @@ namespace swift::core::context } //! \copydoc IContextNetwork::reInitializeAllAircraft - virtual int reInitializeAllAircraft() override { return 0; } + int reInitializeAllAircraft() override { return 0; } //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override + void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override { Q_UNUSED(callsigns) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns - virtual swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override + swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::aviation::CCallsignSet(); } //! \copydoc IContextNetwork::getReverseLookupMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getReverseLookupMessages(const swift::misc::aviation::CCallsign &callsign) const override { logEmptyContextWarning(Q_FUNC_INFO); @@ -409,21 +406,21 @@ namespace swift::core::context } //! \copydoc IContextNetwork::isReverseLookupMessagesEnabled - virtual swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override + swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::RevLogDisabled; } //! \copydoc IContextNetwork::enableReverseLookupMessages - virtual void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override + void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(enable) } //! \copydoc IContextNetwork::getAircraftPartsHistory - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getAircraftPartsHistory(const swift::misc::aviation::CCallsign &callsign) const override { logEmptyContextWarning(Q_FUNC_INFO); @@ -432,7 +429,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::getRemoteAircraftParts - virtual swift::misc::aviation::CAircraftPartsList + swift::misc::aviation::CAircraftPartsList getRemoteAircraftParts(const swift::misc::aviation::CCallsign &callsign) const override { logEmptyContextWarning(Q_FUNC_INFO); @@ -441,14 +438,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::isAircraftPartsHistoryEnabled - virtual bool isAircraftPartsHistoryEnabled() const override + bool isAircraftPartsHistoryEnabled() const override { logEmptyContextWarning(Q_FUNC_INFO); return false; } //! \copydoc IContextNetwork::isRemoteAircraftSupportingParts - virtual bool isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override + bool isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(callsign) @@ -456,14 +453,14 @@ namespace swift::core::context } //! \copydoc IContextNetwork::enableAircraftPartsHistory - virtual void enableAircraftPartsHistory(bool enabled) override + void enableAircraftPartsHistory(bool enabled) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(enabled) } //! \copydoc IContextNetwork::getNetworkStatistics - virtual QString getNetworkStatistics(bool reset, const QString &separator) override + QString getNetworkStatistics(bool reset, const QString &separator) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(reset) @@ -472,7 +469,7 @@ namespace swift::core::context } //! \copydoc IContextNetwork::setNetworkStatisticsEnable - virtual bool setNetworkStatisticsEnable(bool enabled) override + bool setNetworkStatisticsEnable(bool enabled) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(enabled;) @@ -481,8 +478,8 @@ namespace swift::core::context public: //! \copydoc IContextNetwork::connectRawFsdMessageSignal - virtual QMetaObject::Connection - connectRawFsdMessageSignal(QObject *receiver, RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot) override + QMetaObject::Connection connectRawFsdMessageSignal(QObject *receiver, + RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(receiver) diff --git a/src/core/context/contextnetworkimpl.h b/src/core/context/contextnetworkimpl.h index 7e7d72081..e0e34fda0 100644 --- a/src/core/context/contextnetworkimpl.h +++ b/src/core/context/contextnetworkimpl.h @@ -89,53 +89,50 @@ namespace swift::core public: //! Destructor - virtual ~CContextNetwork() override; + ~CContextNetwork() override; // remoteaircraftprovider - virtual swift::misc::aviation::CAircraftSituationList + swift::misc::aviation::CAircraftSituationList remoteAircraftSituations(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CAircraftSituation + swift::misc::aviation::CAircraftSituation remoteAircraftSituation(const swift::misc::aviation::CCallsign &callsign, int index) const override; - virtual swift::misc::MillisecondsMinMaxMean remoteAircraftSituationsTimestampDifferenceMinMaxMean( + swift::misc::MillisecondsMinMaxMean remoteAircraftSituationsTimestampDifferenceMinMaxMean( const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CAircraftSituationList latestRemoteAircraftSituations() const override; - virtual swift::misc::aviation::CAircraftSituationList latestOnGroundProviderElevations() const override; - virtual int remoteAircraftSituationsCount(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CAircraftPartsList + swift::misc::aviation::CAircraftSituationList latestRemoteAircraftSituations() const override; + swift::misc::aviation::CAircraftSituationList latestOnGroundProviderElevations() const override; + int remoteAircraftSituationsCount(const swift::misc::aviation::CCallsign &callsign) const override; + swift::misc::aviation::CAircraftPartsList remoteAircraftParts(const swift::misc::aviation::CCallsign &callsign) const override; - virtual int remoteAircraftPartsCount(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CCallsignSet remoteAircraftSupportingParts() const override; - virtual swift::misc::aviation::CAircraftSituationChangeList + int remoteAircraftPartsCount(const swift::misc::aviation::CCallsign &callsign) const override; + swift::misc::aviation::CCallsignSet remoteAircraftSupportingParts() const override; + swift::misc::aviation::CAircraftSituationChangeList remoteAircraftSituationChanges(const swift::misc::aviation::CCallsign &callsign) const override; - virtual int - remoteAircraftSituationChangesCount(const swift::misc::aviation::CCallsign &callsign) const override; - virtual bool updateAircraftRendered(const swift::misc::aviation::CCallsign &callsign, - bool rendered) override; - virtual int updateMultipleAircraftRendered(const swift::misc::aviation::CCallsignSet &callsigns, - bool rendered) override; - virtual int updateMultipleAircraftEnabled(const swift::misc::aviation::CCallsignSet &callsigns, - bool enabled) override; - virtual int updateAircraftGroundElevation(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::geo::CElevationPlane &elevation, - swift::misc::aviation::CAircraftSituation::GndElevationInfo info, - bool *setForOnGroundPosition) override; - virtual void updateMarkAllAsNotRendered() override; - virtual swift::misc::physical_quantities::CLength + int remoteAircraftSituationChangesCount(const swift::misc::aviation::CCallsign &callsign) const override; + bool updateAircraftRendered(const swift::misc::aviation::CCallsign &callsign, bool rendered) override; + int updateMultipleAircraftRendered(const swift::misc::aviation::CCallsignSet &callsigns, + bool rendered) override; + int updateMultipleAircraftEnabled(const swift::misc::aviation::CCallsignSet &callsigns, + bool enabled) override; + int updateAircraftGroundElevation(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::geo::CElevationPlane &elevation, + swift::misc::aviation::CAircraftSituation::GndElevationInfo info, + bool *setForOnGroundPosition) override; + void updateMarkAllAsNotRendered() override; + swift::misc::physical_quantities::CLength getCGFromDB(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::physical_quantities::CLength getCGFromDB(const QString &modelString) const override; - virtual void rememberCGFromDB(const swift::misc::physical_quantities::CLength &cgFromDB, - const swift::misc::aviation::CCallsign &callsign) override; - virtual void rememberCGFromDB(const swift::misc::physical_quantities::CLength &cgFromDB, - const QString &modelString) override; - virtual swift::misc::simulation::CAirspaceAircraftSnapshot - getLatestAirspaceAircraftSnapshot() const override; - virtual swift::misc::geo::CElevationPlane + swift::misc::physical_quantities::CLength getCGFromDB(const QString &modelString) const override; + void rememberCGFromDB(const swift::misc::physical_quantities::CLength &cgFromDB, + const swift::misc::aviation::CCallsign &callsign) override; + void rememberCGFromDB(const swift::misc::physical_quantities::CLength &cgFromDB, + const QString &modelString) override; + swift::misc::simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override; + swift::misc::geo::CElevationPlane averageElevationOfNonMovingAircraft(const swift::misc::aviation::CAircraftSituation &reference, const swift::misc::physical_quantities::CLength &range, int minValues = 1, int sufficientValues = 2) const override; //! \copydoc swift::misc::simulation::IRemoteAircraftProvider::connectRemoteAircraftProviderSignals - virtual QList connectRemoteAircraftProviderSignals( + QList connectRemoteAircraftProviderSignals( QObject *receiver, std::function addedSituationSlot, std::function //! \copydoc IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! Register help static void registerHelp() @@ -363,50 +356,49 @@ namespace swift::core } //! \copydoc swift::core::context::IContextNetwork::getAtcStationsOnline - virtual swift::misc::aviation::CAtcStationList - getAtcStationsOnline(bool recalculateDistance) const override; + swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override; //! \copydoc swift::core::context::IContextNetwork::getClosestAtcStationsOnline - virtual swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; + swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; //! \copydoc swift::core::context::IContextNetwork::getOnlineStationForCallsign - virtual swift::misc::aviation::CAtcStation + swift::misc::aviation::CAtcStation getOnlineStationForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getOnlineStationsForFrequency - virtual swift::misc::aviation::CAtcStationList + swift::misc::aviation::CAtcStationList getOnlineStationsForFrequency(const swift::misc::physical_quantities::CFrequency &frequency) const override; //! \copydoc swift::core::context::IContextNetwork::isOnlineStation - virtual bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; + bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; //! \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; + 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 swift::core::context::IContextNetwork::getConnectedServer - virtual swift::misc::network::CServer getConnectedServer() const override; + swift::misc::network::CServer getConnectedServer() const override; //! \copydoc swift::core::context::IContextNetwork::getLoginMode - virtual swift::misc::network::CLoginMode getLoginMode() const override; + swift::misc::network::CLoginMode getLoginMode() const override; //! \copydoc swift::core::context::IContextNetwork::disconnectFromNetwork - virtual swift::misc::CStatusMessage disconnectFromNetwork() override; + swift::misc::CStatusMessage disconnectFromNetwork() override; //! \copydoc swift::core::context::IContextNetwork::isConnected - virtual bool isConnected() const override; + bool isConnected() const override; //! \copydoc swift::core::context::IContextNetwork::sendTextMessages - virtual void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; + void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; //! \copydoc swift::core::context::IContextNetwork::sendFlightPlan - virtual void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; + void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; //! \copydoc swift::core::context::IContextNetwork::loadFlightPlanFromNetwork - virtual swift::misc::aviation::CFlightPlan + swift::misc::aviation::CFlightPlan loadFlightPlanFromNetwork(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getMetarForAirport @@ -414,48 +406,47 @@ namespace swift::core getMetarForAirport(const swift::misc::aviation::CAirportIcaoCode &airportIcaoCode) const override; //! \copydoc swift::core::context::IContextNetwork::getUsers - virtual swift::misc::network::CUserList getUsers() const override; + swift::misc::network::CUserList getUsers() const override; //! \copydoc swift::core::context::IContextNetwork::getUsersForCallsigns - virtual swift::misc::network::CUserList + swift::misc::network::CUserList getUsersForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; //! \copydoc swift::core::context::IContextNetwork::getUserForCallsign - virtual swift::misc::network::CUser + swift::misc::network::CUser getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getVatsimFsdServers - virtual swift::misc::network::CServerList getVatsimFsdServers() const override; + swift::misc::network::CServerList getVatsimFsdServers() const override; //! \copydoc swift::core::context::IContextNetwork::requestAircraftDataUpdates - virtual void requestAircraftDataUpdates() override; + void requestAircraftDataUpdates() override; //! \copydoc swift::core::context::IContextNetwork::requestAtisUpdates - virtual void requestAtisUpdates() override; + void requestAtisUpdates() override; //! \copydoc swift::core::context::IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; + void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; //! \copydoc swift::core::context::IContextNetwork::getFastPositionEnabledCallsigns - virtual swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; + swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; //! \copydoc swift::core::context::IContextNetwork::testCreateDummyOnlineAtcStations - virtual void testCreateDummyOnlineAtcStations(int number) override; + void testCreateDummyOnlineAtcStations(int number) override; //! \copydoc swift::core::context::IContextNetwork::testAddAircraftParts - virtual void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftParts &parts, - bool incremental) override; + void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftParts &parts, bool incremental) override; //! \copydoc swift::core::context::IContextNetwork::testReceivedAtisMessage - virtual void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CInformationMessage &msg) override; + void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CInformationMessage &msg) override; //! \copydoc swift::core::context::IContextNetwork::testReceivedTextMessages - virtual void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; + void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; //! \copydoc swift::core::context::IContextNetwork::testRequestAircraftConfig - virtual void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; + void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; protected: //! Constructor, with link to runtime diff --git a/src/core/context/contextnetworkproxy.h b/src/core/context/contextnetworkproxy.h index 14a377d94..c2f5b9473 100644 --- a/src/core/context/contextnetworkproxy.h +++ b/src/core/context/contextnetworkproxy.h @@ -62,7 +62,7 @@ namespace swift::core public: //! Destructor - virtual ~CContextNetworkProxy() override {} + ~CContextNetworkProxy() override = default; //! Unit test relay signals //! \private @@ -73,70 +73,68 @@ namespace swift::core //! @{ //! \copydoc swift::core::context::IContextNetwork::getAtcStationsOnline - virtual swift::misc::aviation::CAtcStationList - getAtcStationsOnline(bool recalculateDistance) const override; + swift::misc::aviation::CAtcStationList getAtcStationsOnline(bool recalculateDistance) const override; //! \copydoc swift::core::context::IContextNetwork::getClosestAtcStationsOnline - virtual swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; + swift::misc::aviation::CAtcStationList getClosestAtcStationsOnline(int number) const override; //! \copydoc swift::core::context::IContextNetwork::getAircraftInRange - virtual swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override; + swift::misc::simulation::CSimulatedAircraftList getAircraftInRange() const override; //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCallsigns - virtual swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override; + swift::misc::aviation::CCallsignSet getAircraftInRangeCallsigns() const override; //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeCount - virtual int getAircraftInRangeCount() const override; + int getAircraftInRangeCount() const override; //! \copydoc swift::core::context::IContextNetwork::isAircraftInRange - virtual bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override; + bool isAircraftInRange(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getAircraftInRangeForCallsign - virtual swift::misc::simulation::CSimulatedAircraft + swift::misc::simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getOnlineStationsForFrequency - virtual swift::misc::aviation::CAtcStationList + swift::misc::aviation::CAtcStationList getOnlineStationsForFrequency(const swift::misc::physical_quantities::CFrequency &frequency) const override; //! \copydoc swift::core::context::IContextNetwork::getOnlineStationForCallsign - virtual swift::misc::aviation::CAtcStation + swift::misc::aviation::CAtcStation getOnlineStationForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::isOnlineStation - virtual bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; + bool isOnlineStation(const swift::misc::aviation::CCallsign &callsign) const override; //! \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; + 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 swift::core::context::IContextNetwork::disconnectFromNetwork - virtual swift::misc::CStatusMessage disconnectFromNetwork() override; + swift::misc::CStatusMessage disconnectFromNetwork() override; //! \copydoc swift::core::context::IContextNetwork::isConnected - virtual bool isConnected() const override; + bool isConnected() const override; //! \copydoc swift::core::context::IContextNetwork::getConnectedServer - virtual swift::misc::network::CServer getConnectedServer() const override; + swift::misc::network::CServer getConnectedServer() const override; //! \copydoc swift::core::context::IContextNetwork::getLoginMode - virtual swift::misc::network::CLoginMode getLoginMode() const override; + swift::misc::network::CLoginMode getLoginMode() const override; //! \copydoc swift::core::context::IContextNetwork::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! \copydoc swift::core::context::IContextNetwork::sendTextMessages - virtual void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; + void sendTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; //! \copydoc swift::core::context::IContextNetwork::sendFlightPlan - virtual void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; + void sendFlightPlan(const swift::misc::aviation::CFlightPlan &flightPlan) override; //! \copydoc swift::core::context::IContextNetwork::loadFlightPlanFromNetwork - virtual swift::misc::aviation::CFlightPlan + swift::misc::aviation::CFlightPlan loadFlightPlanFromNetwork(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getMetarForAirport @@ -144,137 +142,135 @@ namespace swift::core getMetarForAirport(const swift::misc::aviation::CAirportIcaoCode &airportIcaoCode) const override; //! \copydoc swift::core::context::IContextNetwork::getUsers - virtual swift::misc::network::CUserList getUsers() const override; + swift::misc::network::CUserList getUsers() const override; //! \copydoc swift::core::context::IContextNetwork::getUsersForCallsigns - virtual swift::misc::network::CUserList + swift::misc::network::CUserList getUsersForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; //! \copydoc swift::core::context::IContextNetwork::getUserForCallsign - virtual swift::misc::network::CUser + swift::misc::network::CUser getUserForCallsign(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getClients - virtual swift::misc::network::CClientList getClients() const override; + swift::misc::network::CClientList getClients() const override; //! \copydoc swift::core::context::IContextNetwork::getVatsimFsdServers - virtual swift::misc::network::CServerList getVatsimFsdServers() const override; + swift::misc::network::CServerList getVatsimFsdServers() const override; //! \copydoc swift::core::context::IContextNetwork::getClientsForCallsigns - virtual swift::misc::network::CClientList + swift::misc::network::CClientList getClientsForCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) const override; //! \copydoc swift::core::context::IContextNetwork::setOtherClient - virtual bool setOtherClient(const swift::misc::network::CClient &client) override; + bool setOtherClient(const swift::misc::network::CClient &client) override; //! \copydoc swift::core::context::IContextNetwork::requestAircraftDataUpdates - virtual void requestAircraftDataUpdates() override; + void requestAircraftDataUpdates() override; //! \copydoc swift::core::context::IContextNetwork::requestAtisUpdates - virtual void requestAtisUpdates() override; + void requestAtisUpdates() override; //! \copydoc swift::core::context::IContextNetwork::updateAircraftEnabled - virtual bool updateAircraftEnabled(const swift::misc::aviation::CCallsign &callsign, - bool enabledForRendering) override; + bool updateAircraftEnabled(const swift::misc::aviation::CCallsign &callsign, + bool enabledForRendering) override; //! \copydoc swift::core::context::IContextNetwork::setAircraftEnabledFlag - virtual bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, - bool enabledForRendering) override; + bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, + bool enabledForRendering) override; //! \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; + bool updateAircraftModel(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::simulation::CAircraftModel &model, + const swift::misc::CIdentifier &originator) override; //! \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; + bool updateAircraftNetworkModel(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::simulation::CAircraftModel &model, + const swift::misc::CIdentifier &originator) override; //! \copydoc swift::core::context::IContextNetwork::updateFastPositionEnabled - virtual bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, - bool enableFastPositionSending) override; + bool updateFastPositionEnabled(const swift::misc::aviation::CCallsign &callsign, + bool enableFastPositionSending) override; //! \copydoc swift::core::context::IContextNetwork::updateAircraftSupportingGndFLag - virtual bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, - bool supportGndFlag) override; + bool updateAircraftSupportingGndFLag(const swift::misc::aviation::CCallsign &callsign, + bool supportGndFlag) override; //! \copydoc swift::core::context::IContextNetwork::reInitializeAllAircraft - virtual int reInitializeAllAircraft() override; + int reInitializeAllAircraft() override; //! \copydoc swift::core::context::IContextNetwork::setFastPositionEnabledCallsigns - virtual void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; + void setFastPositionEnabledCallsigns(swift::misc::aviation::CCallsignSet &callsigns) override; //! \copydoc swift::core::context::IContextNetwork::getFastPositionEnabledCallsigns - virtual swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; + swift::misc::aviation::CCallsignSet getFastPositionEnabledCallsigns() const override; //! \copydoc swift::core::context::IContextNetwork::getReverseLookupMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getReverseLookupMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::isReverseLookupMessagesEnabled - virtual swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override; + swift::misc::simulation::ReverseLookupLogging isReverseLookupMessagesEnabled() const override; //! \copydoc swift::core::context::IContextNetwork::enableReverseLookupMessages - virtual void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override; + void enableReverseLookupMessages(swift::misc::simulation::ReverseLookupLogging enable) override; //! \copydoc swift::core::context::IContextNetwork::getAircraftPartsHistory - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getAircraftPartsHistory(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::getRemoteAircraftParts - virtual swift::misc::aviation::CAircraftPartsList + swift::misc::aviation::CAircraftPartsList getRemoteAircraftParts(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::isAircraftPartsHistoryEnabled - virtual bool isAircraftPartsHistoryEnabled() const override; + bool isAircraftPartsHistoryEnabled() const override; //! \copydoc swift::core::context::IContextNetwork::isRemoteAircraftSupportingParts - virtual bool - isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override; + bool isRemoteAircraftSupportingParts(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextNetwork::enableAircraftPartsHistory - virtual void enableAircraftPartsHistory(bool enabled) override; + void enableAircraftPartsHistory(bool enabled) override; //! \copydoc swift::core::context::IContextNetwork::getNetworkStatistics - virtual QString getNetworkStatistics(bool reset, const QString &separator) override; + QString getNetworkStatistics(bool reset, const QString &separator) override; //! \copydoc swift::core::context::IContextNetwork::setNetworkStatisticsEnable - virtual bool setNetworkStatisticsEnable(bool enabled) override; + bool setNetworkStatisticsEnable(bool enabled) override; //! \copydoc swift::core::context::IContextNetwork::getNetworkPresetValues - virtual QStringList getNetworkPresetValues() const override; + QStringList getNetworkPresetValues() const override; //! \copydoc swift::core::context::IContextNetwork::getPartnerCallsign - virtual swift::misc::aviation::CCallsign getPartnerCallsign() const override; + swift::misc::aviation::CCallsign getPartnerCallsign() const override; //! \copydoc swift::core::context::IContextNetwork::testCreateDummyOnlineAtcStations - virtual void testCreateDummyOnlineAtcStations(int number) override; + void testCreateDummyOnlineAtcStations(int number) override; //! \copydoc swift::core::context::IContextNetwork::testAddAircraftParts - virtual void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftParts &parts, - bool incremental) override; + void testAddAircraftParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftParts &parts, bool incremental) override; //! \copydoc swift::core::context::IContextNetwork::testReceivedTextMessages - virtual void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; + void testReceivedTextMessages(const swift::misc::network::CTextMessageList &textMessages) override; //! \copydoc swift::core::context::IContextNetwork::testReceivedAtisMessage - virtual void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CInformationMessage &msg) override; + void testReceivedAtisMessage(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CInformationMessage &msg) override; //! \copydoc swift::core::context::IContextNetwork::testRequestAircraftConfig - virtual void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; + void testRequestAircraftConfig(const swift::misc::aviation::CCallsign &callsign) override; //! \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; + bool testAddAltitudeOffset(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::physical_quantities::CLength &offset = + swift::misc::physical_quantities::CLength::null()) override; //! @} public: //! \copydoc IContextNetwork::connectRawFsdMessageSignal - virtual QMetaObject::Connection + QMetaObject::Connection connectRawFsdMessageSignal(QObject *receiver, RawFsdMessageReceivedSlot rawFsdMessageReceivedSlot) override; private: diff --git a/src/core/context/contextownaircraft.h b/src/core/context/contextownaircraft.h index f683ce202..121a94c14 100644 --- a/src/core/context/contextownaircraft.h +++ b/src/core/context/contextownaircraft.h @@ -69,14 +69,14 @@ namespace swift::core::context } //! \copydoc IContext::getPathAndContextId() - virtual QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } + QString getPathAndContextId() const override { return this->buildPathAndContextId(ObjectPath()); } //! Factory method static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, swift::misc::CDBusServer *server, QDBusConnection &connection); //! Destructor - virtual ~IContextOwnAircraft() override {} + ~IContextOwnAircraft() override = default; signals: //! Aircraft cockpit update diff --git a/src/core/context/contextownaircraftempty.h b/src/core/context/contextownaircraftempty.h index e1804a464..8b0bc4311 100644 --- a/src/core/context/contextownaircraftempty.h +++ b/src/core/context/contextownaircraftempty.h @@ -24,14 +24,14 @@ namespace swift::core::context public slots: //! \copydoc IContextOwnAircraft::getOwnAircraft() - virtual swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override + swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatedAircraft(); } //! \copydoc IContextOwnAircraft::getOwnComSystem - virtual swift::misc::aviation::CComSystem + swift::misc::aviation::CComSystem getOwnComSystem(swift::misc::aviation::CComSystem::ComUnit unit) const override { Q_UNUSED((unit);) @@ -40,23 +40,23 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::getOwnTransponder() - virtual swift::misc::aviation::CTransponder getOwnTransponder() const override + swift::misc::aviation::CTransponder getOwnTransponder() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::aviation::CTransponder(); } //! \copydoc IContextOwnAircraft::getOwnAircraftSituation() - virtual swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override + swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::aviation::CAircraftSituation(); } //! \copydoc IContextOwnAircraft::updateOwnPosition - virtual bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, - const swift::misc::aviation::CAltitude &altitude, - const swift::misc::aviation::CAltitude &pressureAltitude) override + bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, + const swift::misc::aviation::CAltitude &altitude, + const swift::misc::aviation::CAltitude &pressureAltitude) override { Q_UNUSED(position); Q_UNUSED(altitude); @@ -66,10 +66,9 @@ namespace swift::core::context } //! \copydoc 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 + 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 { Q_UNUSED(com1); Q_UNUSED(com2); @@ -80,8 +79,8 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateTransponderMode - virtual bool updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, - const swift::misc::CIdentifier &originator) override + bool updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, + const swift::misc::CIdentifier &originator) override { Q_UNUSED(transponderMode); Q_UNUSED(originator); @@ -90,9 +89,9 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateActiveComFrequency - virtual bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, - swift::misc::aviation::CComSystem::ComUnit comUnit, - const swift::misc::CIdentifier &originator) override + bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, + swift::misc::aviation::CComSystem::ComUnit comUnit, + const swift::misc::CIdentifier &originator) override { Q_UNUSED(frequency); Q_UNUSED(comUnit); @@ -102,7 +101,7 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateOwnAircraftPilot - virtual bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override + bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override { Q_UNUSED(pilot); logEmptyContextWarning(Q_FUNC_INFO); @@ -110,8 +109,8 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override + bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override { Q_UNUSED(selcal); Q_UNUSED(originator); @@ -120,7 +119,7 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateOwnCallsign - virtual bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override + bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override { Q_UNUSED(callsign); logEmptyContextWarning(Q_FUNC_INFO); @@ -128,8 +127,8 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::updateOwnIcaoCodes - virtual bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, - const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override + bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, + const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override { Q_UNUSED(aircraftIcaoCode); Q_UNUSED(airlineIcaoCode); @@ -138,10 +137,10 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::toggleTransponderMode - virtual void toggleTransponderMode() override { logEmptyContextWarning(Q_FUNC_INFO); } + void toggleTransponderMode() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextOwnAircraft::setTransponderMode - virtual bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override + bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override { Q_UNUSED(mode); logEmptyContextWarning(Q_FUNC_INFO); @@ -149,7 +148,7 @@ namespace swift::core::context } //! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override { Q_UNUSED(commandLine); Q_UNUSED(originator); diff --git a/src/core/context/contextownaircraftimpl.cpp b/src/core/context/contextownaircraftimpl.cpp index 14b02040a..4b3191ff7 100644 --- a/src/core/context/contextownaircraftimpl.cpp +++ b/src/core/context/contextownaircraftimpl.cpp @@ -70,8 +70,6 @@ namespace swift::core::context this->initOwnAircraft(); } - CContextOwnAircraft::~CContextOwnAircraft() {} - CSimulatedAircraft CContextOwnAircraft::getOwnAircraft() const { if (isDebugEnabled()) { CLogMessage(this, CLogCategories::contextSlot()).debug() << Q_FUNC_INFO; } diff --git a/src/core/context/contextownaircraftimpl.h b/src/core/context/contextownaircraftimpl.h index b88cc730d..dcc5bb849 100644 --- a/src/core/context/contextownaircraftimpl.h +++ b/src/core/context/contextownaircraftimpl.h @@ -73,49 +73,49 @@ namespace swift::core public: //! Destructor - virtual ~CContextOwnAircraft() override; + ~CContextOwnAircraft() override = default; // IOwnAircraftProvider overrides //! \copydoc swift::misc::simulation::IOwnAircraftProvider::getOwnCallsign //! \ingroup ownaircraftprovider - virtual swift::misc::aviation::CCallsign getOwnCallsign() const override; + swift::misc::aviation::CCallsign getOwnCallsign() const override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::getOwnAircraftPosition //! \ingroup ownaircraftprovider - virtual swift::misc::geo::CCoordinateGeodetic getOwnAircraftPosition() const override; + swift::misc::geo::CCoordinateGeodetic getOwnAircraftPosition() const override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::getOwnAircraftParts //! \ingroup ownaircraftprovider - virtual swift::misc::aviation::CAircraftParts getOwnAircraftParts() const override; + swift::misc::aviation::CAircraftParts getOwnAircraftParts() const override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::getOwnAircraftModel //! \ingroup ownaircraftprovider - virtual swift::misc::simulation::CAircraftModel getOwnAircraftModel() const override; + swift::misc::simulation::CAircraftModel getOwnAircraftModel() const override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::getDistanceToOwnAircraft //! \ingroup ownaircraftprovider - virtual swift::misc::physical_quantities::CLength + swift::misc::physical_quantities::CLength getDistanceToOwnAircraft(const swift::misc::geo::ICoordinateGeodetic &position) const override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::updateOwnModel //! \ingroup ownaircraftprovider //! \remark perform reverse lookup if possible - virtual bool updateOwnModel(const swift::misc::simulation::CAircraftModel &model) override; + bool updateOwnModel(const swift::misc::simulation::CAircraftModel &model) override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::updateOwnSituation //! \ingroup ownaircraftprovider - virtual bool updateOwnSituation(const swift::misc::aviation::CAircraftSituation &situation) override; + bool updateOwnSituation(const swift::misc::aviation::CAircraftSituation &situation) override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::updateOwnParts //! \ingroup ownaircraftprovider - virtual bool updateOwnParts(const swift::misc::aviation::CAircraftParts &parts) override; + bool updateOwnParts(const swift::misc::aviation::CAircraftParts &parts) override; //! \copydoc swift::misc::simulation::IOwnAircraftProvider::updateOwnParts //! \ingroup ownaircraftprovider - virtual bool updateOwnCG(const swift::misc::physical_quantities::CLength &cg) override; + bool updateOwnCG(const swift::misc::physical_quantities::CLength &cg) override; //! \copydoc swift::misc::IProvider::asQObject - virtual QObject *asQObject() override { return this; } + QObject *asQObject() override { return this; } signals: //! Changed aircraft model @@ -127,63 +127,62 @@ namespace swift::core public slots: //! \copydoc IContextOwnAircraft::getOwnAircraft() //! \ingroup ownaircraftprovider - virtual swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override; + swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override; //! \copydoc IContextOwnAircraft::getOwnComSystem //! \ingroup ownaircraftprovider - virtual swift::misc::aviation::CComSystem + swift::misc::aviation::CComSystem getOwnComSystem(swift::misc::aviation::CComSystem::ComUnit unit) const override; //! \copydoc IContextOwnAircraft::getOwnTransponder() //! \ingroup ownaircraftprovider - virtual swift::misc::aviation::CTransponder getOwnTransponder() const override; + swift::misc::aviation::CTransponder getOwnTransponder() const override; //! \copydoc IContextOwnAircraft::getOwnAircraftSituation() //! \ingroup ownaircraftprovider - virtual swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; + swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; //! \copydoc IContextOwnAircraft::updateOwnCallsign //! \ingroup ownaircraftprovider - virtual bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; + bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc IContextOwnAircraft::updateOwnIcaoCodes //! \ingroup ownaircraftprovider - virtual bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, - const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; + bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, + const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; //! \copydoc IContextOwnAircraft::updateOwnPosition - virtual bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, - const swift::misc::aviation::CAltitude &altitude, - const swift::misc::aviation::CAltitude &pressureAltitude) override; + bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, + const swift::misc::aviation::CAltitude &altitude, + const swift::misc::aviation::CAltitude &pressureAltitude) override; //! \copydoc 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; + 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 IContextOwnAircraft::updateTransponderMode - virtual bool - updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, - const swift::misc::CIdentifier &originator) override; + bool updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, + const swift::misc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; + bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateActiveComFrequency - virtual bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, - swift::misc::aviation::CComSystem::ComUnit comUnit, - const swift::misc::CIdentifier &originator) override; + bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, + swift::misc::aviation::CComSystem::ComUnit comUnit, + const swift::misc::CIdentifier &originator) override; //! \copydoc IContextOwnAircraft::updateOwnAircraftPilot - virtual bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override; + bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override; //! \copydoc IContextOwnAircraft::toggleTransponderMode - virtual void toggleTransponderMode() override; + void toggleTransponderMode() override; //! \copydoc IContextOwnAircraft::setTransponderMode - virtual bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override; + bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override; //! \ingroup swiftdotcommands //! 
@@ -193,8 +192,7 @@ namespace swift::core
             //! .selcal      code       set SELCAL code         swift::core::context::CContextOwnAircraft
             //!
//! \copydoc IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! Register help static void registerHelp() diff --git a/src/core/context/contextownaircraftproxy.h b/src/core/context/contextownaircraftproxy.h index 95bfcf77c..f318b281b 100644 --- a/src/core/context/contextownaircraftproxy.h +++ b/src/core/context/contextownaircraftproxy.h @@ -49,7 +49,7 @@ namespace swift::core public: //! Destructor - virtual ~CContextOwnAircraftProxy() override {} + ~CContextOwnAircraftProxy() override = default; //! Unit test relay signals //! \private @@ -57,62 +57,60 @@ namespace swift::core public slots: //! \copydoc swift::core::context::IContextOwnAircraft::getOwnAircraft - virtual swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override; + swift::misc::simulation::CSimulatedAircraft getOwnAircraft() const override; //! \copydoc swift::core::context::IContextOwnAircraft::getOwnComSystem - virtual swift::misc::aviation::CComSystem + swift::misc::aviation::CComSystem getOwnComSystem(swift::misc::aviation::CComSystem::ComUnit unit) const override; //! \copydoc swift::core::context::IContextOwnAircraft::getOwnTransponder - virtual swift::misc::aviation::CTransponder getOwnTransponder() const override; + swift::misc::aviation::CTransponder getOwnTransponder() const override; //! \copydoc swift::core::context::IContextOwnAircraft::getOwnAircraftSituation - virtual swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; + swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; //! \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; + bool updateOwnPosition(const swift::misc::geo::CCoordinateGeodetic &position, + const swift::misc::aviation::CAltitude &altitude, + const swift::misc::aviation::CAltitude &pressureAltitude) override; //! \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; + 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 swift::core::context::IContextOwnAircraft::updateTransponderMode - virtual bool - updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, - const swift::misc::CIdentifier &originator) override; + bool updateTransponderMode(const swift::misc::aviation::CTransponder::TransponderMode &transponderMode, + const swift::misc::CIdentifier &originator) override; //! \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; + bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, + swift::misc::aviation::CComSystem::ComUnit comUnit, + const swift::misc::CIdentifier &originator) override; //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnAircraftPilot - virtual bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override; + bool updateOwnAircraftPilot(const swift::misc::network::CUser &pilot) override; //! \copydoc swift::core::context::IContextOwnAircraft::updateSelcal - virtual bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; + bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnCallsign - virtual bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; + bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextOwnAircraft::updateOwnIcaoCodes - virtual bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, - const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; + bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, + const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; //! \copydoc swift::core::context::IContextOwnAircraft::toggleTransponderMode - virtual void toggleTransponderMode() override; + void toggleTransponderMode() override; //! \copydoc swift::core::context::IContextOwnAircraft::setTransponderMode - virtual bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override; + bool setTransponderMode(swift::misc::aviation::CTransponder::TransponderMode mode) override; //! \copydoc swift::core::context::IContextOwnAircraft::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; protected: //! \brief Constructor diff --git a/src/core/context/contextsimulator.h b/src/core/context/contextsimulator.h index 85617a047..a607745ba 100644 --- a/src/core/context/contextsimulator.h +++ b/src/core/context/contextsimulator.h @@ -71,7 +71,7 @@ namespace swift::core::context swift::misc::CDBusServer *server, QDBusConnection &connection); //! Destructor - ~IContextSimulator() override {} + ~IContextSimulator() override = default; signals: //! Simulator combined status diff --git a/src/core/context/contextsimulatorempty.h b/src/core/context/contextsimulatorempty.h index 6fc79af78..fc374a50c 100644 --- a/src/core/context/contextsimulatorempty.h +++ b/src/core/context/contextsimulatorempty.h @@ -25,29 +25,29 @@ namespace swift::core::context public slots: //! \copydoc IContextSimulator::getSimulatorPluginInfo - virtual swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override + swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatorPluginInfo(); } //! \copydoc IContextSimulator::getAvailableSimulatorPlugins - virtual swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override + swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatorPluginInfoList(); } //! \copydoc IContextSimulator::getSimulatorSettings - virtual swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override + swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::settings::CSimulatorSettings(); } //! \copydoc IContextSimulator::setSimulatorSettings - virtual bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, - const swift::misc::simulation::CSimulatorInfo &simulatorInfo) override + bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, + const swift::misc::simulation::CSimulatorInfo &simulatorInfo) override { Q_UNUSED(settings) Q_UNUSED(simulatorInfo) @@ -56,7 +56,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::startSimulatorPlugin - virtual bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override + bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override { Q_UNUSED(simulatorInfo) logEmptyContextWarning(Q_FUNC_INFO); @@ -64,66 +64,66 @@ namespace swift::core::context } //! \copydoc IContextSimulator::checkListeners - virtual int checkListeners() override { return 0; } + int checkListeners() override { return 0; } //! \copydoc IContextSimulator::getSimulatorStatus - virtual ISimulator::SimulatorStatus getSimulatorStatus() const override + ISimulator::SimulatorStatus getSimulatorStatus() const override { logEmptyContextWarning(Q_FUNC_INFO); return ISimulator::Unspecified; } //! \copydoc IContextSimulator::stopSimulatorPlugin - virtual void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override + void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override { Q_UNUSED(simulatorInfo) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextSimulator::getModelSet - virtual swift::misc::simulation::CAircraftModelList getModelSet() const override + swift::misc::simulation::CAircraftModelList getModelSet() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CAircraftModelList(); } //! \copydoc IContextSimulator::simulatorsWithInitializedModelSet - virtual swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override + swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatorInfo(); } //! \copydoc IContextSimulator::verifyPrerequisites - virtual swift::misc::CStatusMessageList verifyPrerequisites() const override + swift::misc::CStatusMessageList verifyPrerequisites() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::CStatusMessageList(); } //! \copydoc IContextSimulator::getModelSetLoaderSimulator - virtual swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override + swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatorInfo(); } //! \copydoc IContextSimulator::setModelSetLoaderSimulator - virtual void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override + void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override { Q_UNUSED(simulator); logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextSimulator::getModelSetStrings - virtual QStringList getModelSetStrings() const override + QStringList getModelSetStrings() const override { logEmptyContextWarning(Q_FUNC_INFO); return QStringList(); } //! \copydoc IContextSimulator::getModelSetCompleterStrings - virtual QStringList getModelSetCompleterStrings(bool sorted) const override + QStringList getModelSetCompleterStrings(bool sorted) const override { Q_UNUSED(sorted); logEmptyContextWarning(Q_FUNC_INFO); @@ -131,7 +131,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::removeModelsFromSet - virtual int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override + int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override { Q_UNUSED(removeModels); logEmptyContextWarning(Q_FUNC_INFO); @@ -139,8 +139,8 @@ namespace swift::core::context } //! \copydoc CAircraftMatcher::disableModelsForMatching - virtual void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, - bool incremental) override + void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, + bool incremental) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(removedModels); @@ -148,17 +148,17 @@ namespace swift::core::context } //! \copydoc CAircraftMatcher::getDisabledModelsForMatching - virtual swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override + swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CAircraftModelList(); } //! \copydoc CAircraftMatcher::restoreDisabledModels - virtual void restoreDisabledModels() override { logEmptyContextWarning(Q_FUNC_INFO); } + void restoreDisabledModels() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc swift::misc::simulation::CBackgroundValidation::triggerValidation - virtual bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override + bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override { logEmptyContextWarning(Q_FUNC_INFO); Q_UNUSED(simulator); @@ -166,14 +166,14 @@ namespace swift::core::context } //! \copydoc swift::misc::simulation::CBackgroundValidation::isValidating - virtual bool isValidationInProgress() const override + bool isValidationInProgress() const override { logEmptyContextWarning(Q_FUNC_INFO); return false; } //! \copydoc IContextSimulator::isKnownModelInSet - virtual bool isKnownModelInSet(const QString &modelstring) const override + bool isKnownModelInSet(const QString &modelstring) const override { Q_UNUSED(modelstring); logEmptyContextWarning(Q_FUNC_INFO); @@ -181,7 +181,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::getModelSetModelsStartingWith - virtual swift::misc::simulation::CAircraftModelList + swift::misc::simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override { Q_UNUSED(modelString); @@ -190,21 +190,21 @@ namespace swift::core::context } //! \copydoc IContextSimulator::getModelSetCount - virtual int getModelSetCount() const override + int getModelSetCount() const override { logEmptyContextWarning(Q_FUNC_INFO); return 0; } //! \copydoc IContextSimulator::getSimulatorInternals - virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override + swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CSimulatorInternals(); } //! \copydoc ISimulator::getInterpolationSetupGlobal - virtual swift::misc::simulation::CInterpolationAndRenderingSetupGlobal + swift::misc::simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override { logEmptyContextWarning(Q_FUNC_INFO); @@ -212,15 +212,14 @@ namespace swift::core::context } //! \copydoc ISimulator::getInterpolationSetupsPerCallsign - virtual swift::misc::simulation::CInterpolationSetupList - getInterpolationAndRenderingSetupsPerCallsign() const override + swift::misc::simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CInterpolationSetupList(); } //! \copydoc ISimulator::getInterpolationSetupPerCallsignOrDefault - virtual swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign + swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault( const swift::misc::aviation::CCallsign &callsign) const override { @@ -230,7 +229,7 @@ namespace swift::core::context } //! \copydoc swift::misc::simulation::IInterpolationSetupProvider::setInterpolationSetupGlobal - virtual void setInterpolationAndRenderingSetupGlobal( + void setInterpolationAndRenderingSetupGlobal( const swift::misc::simulation::CInterpolationAndRenderingSetupGlobal &setup) override { Q_UNUSED(setup) @@ -238,7 +237,7 @@ namespace swift::core::context } //! \copydoc swift::misc::simulation::IInterpolationSetupProvider::setInterpolationSetupsPerCallsign - virtual bool + bool setInterpolationAndRenderingSetupsPerCallsign(const swift::misc::simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override { @@ -249,7 +248,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::getInterpolationMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign) @@ -258,7 +257,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::followAircraft - virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override + bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override { Q_UNUSED(callsign) logEmptyContextWarning(Q_FUNC_INFO); @@ -266,27 +265,27 @@ namespace swift::core::context } //! \copydoc IContextSimulator::recalculateAllAircraft - virtual void recalculateAllAircraft() override { logEmptyContextWarning(Q_FUNC_INFO); } + void recalculateAllAircraft() override { logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextSimulator::resetToModelMatchingAircraft - virtual bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override + bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override { Q_UNUSED(callsign) return false; } //! \copydoc IContextSimulator::doMatchingsAgain - virtual int doMatchingsAgain() override { return 0; } + int doMatchingsAgain() override { return 0; } //! \copydoc IContextSimulator::doMatchingAgain - virtual bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override + bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override { Q_UNUSED(callsign) return false; } //! \copydoc IContextSimulator::requestElevationBySituation - virtual bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override + bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override { Q_UNUSED(situation) logEmptyContextWarning(Q_FUNC_INFO); @@ -294,7 +293,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::findClosestElevationWithinRange - virtual swift::misc::geo::CElevationPlane + swift::misc::geo::CElevationPlane findClosestElevationWithinRange(const swift::misc::geo::CCoordinateGeodetic &reference, const swift::misc::physical_quantities::CLength &range) const override { @@ -305,7 +304,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::getMatchingMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getMatchingMessages(const swift::misc::aviation::CCallsign &callsign) const override { Q_UNUSED(callsign); @@ -314,21 +313,21 @@ namespace swift::core::context } //! \copydoc IContextSimulator::enableMatchingMessages - virtual void enableMatchingMessages(swift::misc::simulation::MatchingLog enable) override + void enableMatchingMessages(swift::misc::simulation::MatchingLog enable) override { Q_UNUSED(enable) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextSimulator::isMatchingMessagesEnabled - virtual swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override + swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::MatchingLogNothing; } //! \copydoc IContextSimulator::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override { Q_UNUSED(commandLine) Q_UNUSED(originator) @@ -337,8 +336,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::getCurrentMatchingStatistics - virtual swift::misc::simulation::CMatchingStatistics - getCurrentMatchingStatistics(bool missingOnly) const override + swift::misc::simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override { Q_UNUSED(missingOnly) logEmptyContextWarning(Q_FUNC_INFO); @@ -346,14 +344,14 @@ namespace swift::core::context } //! \copydoc IContextSimulator::setMatchingSetup - virtual void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override + void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override { Q_UNUSED(setup) logEmptyContextWarning(Q_FUNC_INFO); } //! \copydoc IContextSimulator::testRemoteAircraft - virtual bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override + bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override { Q_UNUSED(aircraft) Q_UNUSED(add) @@ -362,9 +360,9 @@ namespace swift::core::context } //! \copydoc IContextSimulator::testUpdateRemoteAircraft - virtual bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, - const swift::misc::aviation::CAircraftSituation &situation, - const swift::misc::aviation::CAircraftParts &parts) override + bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override { Q_UNUSED(cs) Q_UNUSED(situation) @@ -374,7 +372,7 @@ namespace swift::core::context } //! \copydoc IContextSimulator::setMatchingSetup - virtual swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override + swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override { logEmptyContextWarning(Q_FUNC_INFO); return swift::misc::simulation::CAircraftMatcherSetup(); diff --git a/src/core/context/contextsimulatorimpl.h b/src/core/context/contextsimulatorimpl.h index c4a630b7a..f05511936 100644 --- a/src/core/context/contextsimulatorimpl.h +++ b/src/core/context/contextsimulatorimpl.h @@ -74,162 +74,157 @@ namespace swift::core public slots: //! \copydoc swift::core::context::IContextSimulator::getSimulatorPluginInfo - virtual swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; + swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; //! \copydoc swift::core::context::IContextSimulator::getAvailableSimulatorPlugins - virtual swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; + swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorSettings - virtual swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; + swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; //! \copydoc swift::core::context::IContextSimulator::setSimulatorSettings - virtual bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, - const swift::misc::simulation::CSimulatorInfo &simulator) override; + bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, + const swift::misc::simulation::CSimulatorInfo &simulator) override; //! \copydoc swift::core::context::IContextSimulator::startSimulatorPlugin - virtual bool - startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; + bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; //! \copydoc swift::core::context::IContextSimulator::stopSimulatorPlugin - virtual void - stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; + void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; //! \copydoc swift::core::context::IContextSimulator::checkListeners - virtual int checkListeners() override; + int checkListeners() override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus - virtual ISimulator::SimulatorStatus getSimulatorStatus() const override; + ISimulator::SimulatorStatus getSimulatorStatus() const override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals - virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; + swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetLoaderSimulator - virtual swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; + swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; //! \copydoc swift::core::context::IContextSimulator::setModelSetLoaderSimulator - virtual void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; + void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; //! \copydoc swift::core::context::IContextSimulator::simulatorsWithInitializedModelSet - virtual swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; + swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; //! \copydoc swift::core::context::IContextSimulator::verifyPrerequisites - virtual swift::misc::CStatusMessageList verifyPrerequisites() const override; + swift::misc::CStatusMessageList verifyPrerequisites() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetStrings - virtual QStringList getModelSetStrings() const override; + QStringList getModelSetStrings() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetCompleterStrings - virtual QStringList getModelSetCompleterStrings(bool sorted) const override; + QStringList getModelSetCompleterStrings(bool sorted) const override; //! \copydoc swift::core::context::IContextSimulator::isKnownModelInSet - virtual bool isKnownModelInSet(const QString &modelString) const override; + bool isKnownModelInSet(const QString &modelString) const override; //! \copydoc swift::core::context::IContextSimulator::removeModelsFromSet - virtual int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; + int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; //! \copydoc swift::core::context::IContextSimulator::disableModelsForMatching - virtual void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, - bool incremental) override; + void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, + bool incremental) override; //! \copydoc swift::core::context::IContextSimulator::getDisabledModelsForMatching - virtual swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; + swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; //! \copydoc swift::core::context::IContextSimulator::restoreDisabledModels - virtual void restoreDisabledModels() override; + void restoreDisabledModels() override; //! \copydoc swift::core::context::IContextSimulator::isValidationInProgress - virtual bool isValidationInProgress() const override; + bool isValidationInProgress() const override; //! \copydoc swift::core::context::IContextSimulator::triggerModelSetValidation - virtual bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; + bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; //! \copydoc swift::core::context::IContextSimulator::getModelSetModelsStartingWith - virtual swift::misc::simulation::CAircraftModelList + swift::misc::simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupGlobal - virtual swift::misc::simulation::CInterpolationAndRenderingSetupGlobal + swift::misc::simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign - virtual swift::misc::simulation::CInterpolationSetupList + swift::misc::simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault - virtual swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign + swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault( const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign - virtual bool setInterpolationAndRenderingSetupsPerCallsign( + bool setInterpolationAndRenderingSetupsPerCallsign( const swift::misc::simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override; //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupGlobal - virtual void setInterpolationAndRenderingSetupGlobal( + void setInterpolationAndRenderingSetupGlobal( const swift::misc::simulation::CInterpolationAndRenderingSetupGlobal &setup) override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::followAircraft - virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; + bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::recalculateAllAircraft - virtual void recalculateAllAircraft() override; + void recalculateAllAircraft() override; //! \copydoc swift::core::context::IContextSimulator::resetToModelMatchingAircraft - virtual bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; + bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::requestElevationBySituation - virtual bool - requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; + bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; //! \copydoc swift::core::context::IContextSimulator::findClosestElevationWithinRange - virtual swift::misc::geo::CElevationPlane + swift::misc::geo::CElevationPlane findClosestElevationWithinRange(const swift::misc::geo::CCoordinateGeodetic &reference, const swift::misc::physical_quantities::CLength &range) const override; //! \copydoc swift::core::context::IContextSimulator::doMatchingsAgain - virtual int doMatchingsAgain() override; + int doMatchingsAgain() override; //! \copydoc swift::core::context::IContextSimulator::doMatchingAgain - virtual bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; + bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::getMatchingMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getMatchingMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::isMatchingMessagesEnabled - virtual swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; + swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; //! \copydoc swift::core::context::IContextSimulator::enableMatchingMessages - virtual void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; + void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; //! \copydoc swift::core::context::IContextSimulator::getCurrentMatchingStatistics - virtual swift::misc::simulation::CMatchingStatistics - getCurrentMatchingStatistics(bool missingOnly) const override; + swift::misc::simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override; //! \copydoc swift::core::context::IContextSimulator::setMatchingSetup - virtual void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; + void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; //! \copydoc swift::core::context::IContextSimulator::getMatchingSetup - virtual swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; + swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; //! \copydoc swift::core::context::IContextSimulator::testRemoteAircraft - virtual bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, - bool add) override; + bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override; //! \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; + bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override; //! \copydoc swift::core::context::IContextSimulator::getModelSet - virtual swift::misc::simulation::CAircraftModelList getModelSet() const override; + swift::misc::simulation::CAircraftModelList getModelSet() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetCount - virtual int getModelSetCount() const override; + int getModelSetCount() const override; //! \ingroup swiftdotcommands //! 
@@ -240,13 +235,12 @@ namespace swift::core
             //! .ris parts on|off interpolation/rendering setup, aircraft parts
             //!
//! \copydoc IContextSimulator::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; // ----------------------------- context interface ----------------------------- public: //! Destructor - virtual ~CContextSimulator() override; + ~CContextSimulator() override; //! Gracefully shut down, e.g. for plugin unloading void gracefulShutdown(); diff --git a/src/core/context/contextsimulatorproxy.h b/src/core/context/contextsimulatorproxy.h index d3b7f9ccc..a877b6aef 100644 --- a/src/core/context/contextsimulatorproxy.h +++ b/src/core/context/contextsimulatorproxy.h @@ -46,7 +46,7 @@ namespace swift::core public: //! Destructor - virtual ~CContextSimulatorProxy() override {} + ~CContextSimulatorProxy() override = default; //! Unit test relay signals //! \private @@ -57,166 +57,160 @@ namespace swift::core //! @{ //! \copydoc swift::core::context::IContextSimulator::getSimulatorPluginInfo - virtual swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; + swift::misc::simulation::CSimulatorPluginInfo getSimulatorPluginInfo() const override; //! \copydoc swift::core::context::IContextSimulator::getAvailableSimulatorPlugins - virtual swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; + swift::misc::simulation::CSimulatorPluginInfoList getAvailableSimulatorPlugins() const override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorSettings - virtual swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; + swift::misc::simulation::settings::CSimulatorSettings getSimulatorSettings() const override; //! \copydoc swift::core::context::IContextSimulator::setSimulatorSettings - virtual bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, - const swift::misc::simulation::CSimulatorInfo &simulatorInfo) override; + bool setSimulatorSettings(const swift::misc::simulation::settings::CSimulatorSettings &settings, + const swift::misc::simulation::CSimulatorInfo &simulatorInfo) override; //! \copydoc swift::core::context::IContextSimulator::startSimulatorPlugin - virtual bool - startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; + bool startSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; //! \copydoc swift::core::context::IContextSimulator::stopSimulatorPlugin - virtual void - stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; + void stopSimulatorPlugin(const swift::misc::simulation::CSimulatorPluginInfo &simulatorInfo) override; //! \copydoc swift::core::context::IContextSimulator::checkListeners - virtual int checkListeners() override; + int checkListeners() override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorStatus - virtual ISimulator::SimulatorStatus getSimulatorStatus() const override; + ISimulator::SimulatorStatus getSimulatorStatus() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSet - virtual swift::misc::simulation::CAircraftModelList getModelSet() const override; + swift::misc::simulation::CAircraftModelList getModelSet() const override; //! \copydoc swift::core::context::IContextSimulator::simulatorsWithInitializedModelSet - virtual swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; + swift::misc::simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const override; //! \copydoc swift::core::context::IContextSimulator::verifyPrerequisites - virtual swift::misc::CStatusMessageList verifyPrerequisites() const override; + swift::misc::CStatusMessageList verifyPrerequisites() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetLoaderSimulator - virtual swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; + swift::misc::simulation::CSimulatorInfo getModelSetLoaderSimulator() const override; //! \copydoc swift::core::context::IContextSimulator::setModelSetLoaderSimulator - virtual void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; + void setModelSetLoaderSimulator(const swift::misc::simulation::CSimulatorInfo &simulator) override; //! \copydoc swift::core::context::IContextSimulator::getModelSetStrings - virtual QStringList getModelSetStrings() const override; + QStringList getModelSetStrings() const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetCompleterStrings - virtual QStringList getModelSetCompleterStrings(bool sorted) const override; + QStringList getModelSetCompleterStrings(bool sorted) const override; //! \copydoc swift::core::context::IContextSimulator::removeModelsFromSet - virtual int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; + int removeModelsFromSet(const swift::misc::simulation::CAircraftModelList &removeModels) override; //! \copydoc swift::core::context::IContextSimulator::isKnownModelInSet - virtual bool isKnownModelInSet(const QString &modelString) const override; + bool isKnownModelInSet(const QString &modelString) const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetModelsStartingWith - virtual swift::misc::simulation::CAircraftModelList + swift::misc::simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override; //! \copydoc swift::core::context::IContextSimulator::getModelSetCount - virtual int getModelSetCount() const override; + int getModelSetCount() const override; //! \copydoc swift::core::context::IContextSimulator::getSimulatorInternals - virtual swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; + swift::misc::simulation::CSimulatorInternals getSimulatorInternals() const override; //! \copydoc swift::core::context::IContextSimulator::disableModelsForMatching - virtual void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, - bool incremental) override; + void disableModelsForMatching(const swift::misc::simulation::CAircraftModelList &removedModels, + bool incremental) override; //! \copydoc swift::core::context::IContextSimulator::getDisabledModelsForMatching - virtual swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; + swift::misc::simulation::CAircraftModelList getDisabledModelsForMatching() const override; //! \copydoc swift::core::context::IContextSimulator::triggerModelSetValidation - virtual bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; + bool triggerModelSetValidation(const swift::misc::simulation::CSimulatorInfo &simulator) override; //! \copydoc swift::core::context::IContextSimulator::isValidationInProgress - virtual bool isValidationInProgress() const override; + bool isValidationInProgress() const override; //! \copydoc swift::core::context::IContextSimulator::restoreDisabledModels - virtual void restoreDisabledModels() override; + void restoreDisabledModels() override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupGlobal - virtual swift::misc::simulation::CInterpolationAndRenderingSetupGlobal + swift::misc::simulation::CInterpolationAndRenderingSetupGlobal getInterpolationAndRenderingSetupGlobal() const override; //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupGlobal - virtual void setInterpolationAndRenderingSetupGlobal( + void setInterpolationAndRenderingSetupGlobal( const swift::misc::simulation::CInterpolationAndRenderingSetupGlobal &setup) override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupsPerCallsign - virtual swift::misc::simulation::CInterpolationSetupList + swift::misc::simulation::CInterpolationSetupList getInterpolationAndRenderingSetupsPerCallsign() const override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationAndRenderingSetupPerCallsignOrDefault - virtual swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign + swift::misc::simulation::CInterpolationAndRenderingSetupPerCallsign getInterpolationAndRenderingSetupPerCallsignOrDefault( const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::setInterpolationAndRenderingSetupsPerCallsign - virtual bool setInterpolationAndRenderingSetupsPerCallsign( + bool setInterpolationAndRenderingSetupsPerCallsign( const swift::misc::simulation::CInterpolationSetupList &setups, bool ignoreSameAsGlobal) override; //! \copydoc swift::core::context::IContextSimulator::getInterpolationMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::followAircraft - virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; + bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::recalculateAllAircraft - virtual void recalculateAllAircraft() override; + void recalculateAllAircraft() override; //! \copydoc swift::core::context::IContextSimulator::resetToModelMatchingAircraft - virtual bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; + bool resetToModelMatchingAircraft(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::requestElevationBySituation - virtual bool - requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; + bool requestElevationBySituation(const swift::misc::aviation::CAircraftSituation &situation) override; //! \copydoc swift::core::context::IContextSimulator::findClosestElevationWithinRange - virtual swift::misc::geo::CElevationPlane + swift::misc::geo::CElevationPlane findClosestElevationWithinRange(const swift::misc::geo::CCoordinateGeodetic &reference, const swift::misc::physical_quantities::CLength &range) const override; //! \copydoc swift::core::context::IContextSimulator::getMatchingMessages - virtual swift::misc::CStatusMessageList + swift::misc::CStatusMessageList getMatchingMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! \copydoc swift::core::context::IContextSimulator::isMatchingMessagesEnabled - virtual swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; + swift::misc::simulation::MatchingLog isMatchingMessagesEnabled() const override; //! \copydoc swift::core::context::IContextSimulator::enableMatchingMessages - virtual void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; + void enableMatchingMessages(swift::misc::simulation::MatchingLog enabled) override; //! \copydoc swift::core::context::IContextSimulator::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, - const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! \copydoc swift::core::context::IContextSimulator::doMatchingsAgain - virtual int doMatchingsAgain() override; + int doMatchingsAgain() override; //! \copydoc swift::core::context::IContextSimulator::doMatchingAgain - virtual bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; + bool doMatchingAgain(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc swift::core::context::IContextSimulator::getCurrentMatchingStatistics - virtual swift::misc::simulation::CMatchingStatistics - getCurrentMatchingStatistics(bool missingOnly) const override; + swift::misc::simulation::CMatchingStatistics getCurrentMatchingStatistics(bool missingOnly) const override; //! \copydoc swift::core::context::IContextSimulator::setMatchingSetup - virtual void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; + void setMatchingSetup(const swift::misc::simulation::CAircraftMatcherSetup &setup) override; //! \copydoc swift::core::context::IContextSimulator::getMatchingSetup - virtual swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; + swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const override; //! \copydoc swift::core::context::IContextSimulator::testRemoteAircraft - virtual bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, - bool add) override; + bool testRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, bool add) override; //! \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; + bool testUpdateRemoteAircraft(const swift::misc::aviation::CCallsign &cs, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override; //! @} private: diff --git a/src/core/corefacade.h b/src/core/corefacade.h index d05388328..d4c974dce 100644 --- a/src/core/corefacade.h +++ b/src/core/corefacade.h @@ -62,7 +62,7 @@ namespace swift::core CCoreFacade(const CCoreFacadeConfig &config, QObject *parent = nullptr); //! Destructor - virtual ~CCoreFacade() override { this->gracefulShutdown(); } + ~CCoreFacade() override { this->gracefulShutdown(); } //! Transport mechanism for sharing state between applications swift::misc::shared_state::CDataLinkDBus *getDataLinkDBus() { return this->m_dataLinkDBus; } diff --git a/src/core/data/launchersetup.h b/src/core/data/launchersetup.h index f6a7f2bf3..126c60617 100644 --- a/src/core/data/launchersetup.h +++ b/src/core/data/launchersetup.h @@ -47,7 +47,7 @@ namespace swift::core::data Q_DECLARE_FLAGS(AudioMode, AudioModeFlag) //! Default constructor - CLauncherSetup() {} + CLauncherSetup() = default; //! Destructor. // virtual ~CLauncherSetup() {} diff --git a/src/core/data/networksetup.cpp b/src/core/data/networksetup.cpp index 8a2afe4bd..b555b8dff 100644 --- a/src/core/data/networksetup.cpp +++ b/src/core/data/networksetup.cpp @@ -12,8 +12,6 @@ using namespace swift::misc::network; namespace swift::core::data { - CNetworkSetup::CNetworkSetup() {} - CServer CNetworkSetup::getLastVatsimServer() const { return m_lastVatsimServer.get(); } CStatusMessage CNetworkSetup::setLastVatsimServer(const CServer &server) { return m_lastVatsimServer.set(server); } diff --git a/src/core/data/networksetup.h b/src/core/data/networksetup.h index 9b6906d28..a45a20563 100644 --- a/src/core/data/networksetup.h +++ b/src/core/data/networksetup.h @@ -27,10 +27,10 @@ namespace swift::core::data public: //! Default constructor - CNetworkSetup(); + CNetworkSetup() = default; //! Destructor. - virtual ~CNetworkSetup() {} + ~CNetworkSetup() override = default; //! Last VATSIM server (VATSIM only) swift::misc::network::CServer getLastVatsimServer() const; diff --git a/src/core/db/airportdatareader.h b/src/core/db/airportdatareader.h index 1c84fa5f1..ae08083cb 100644 --- a/src/core/db/airportdatareader.h +++ b/src/core/db/airportdatareader.h @@ -44,30 +44,28 @@ namespace swift::core::db int getAirportsCount() const; // data read from local data - virtual swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; - virtual bool readFromJsonFilesInBackground(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; + swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, + swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; + bool readFromJsonFilesInBackground(const QString &dir, swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; // base class overrides - virtual swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; - virtual QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entities) const override; - virtual int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; - virtual swift::misc::network::CEntityFlags::Entity + swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; + QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entities) const override; + int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const override; - virtual void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; protected: // base class overrides - virtual void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, - swift::misc::network::CUrl &oldUrlInfo, - swift::misc::network::CUrl &newUrlInfo) const override; - virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; + void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; + bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CUrl &oldUrlInfo, + swift::misc::network::CUrl &newUrlInfo) const override; + swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: swift::misc::CData m_airportCache { diff --git a/src/core/db/databasereader.h b/src/core/db/databasereader.h index b68129f2b..098c3f43f 100644 --- a/src/core/db/databasereader.h +++ b/src/core/db/databasereader.h @@ -450,7 +450,7 @@ namespace swift::core::db const JsonDatastoreResponse &response) const; //! Network request progress - virtual void networkReplyProgress(int logId, qint64 current, qint64 max, const QUrl &url) override; + void networkReplyProgress(int logId, qint64 current, qint64 max, const QUrl &url) override; private: //! Read / re-read data file diff --git a/src/core/db/icaodatareader.h b/src/core/db/icaodatareader.h index 1722486c7..92b637675 100644 --- a/src/core/db/icaodatareader.h +++ b/src/core/db/icaodatareader.h @@ -141,30 +141,28 @@ namespace swift::core::db bool writeToJsonFiles(const QString &dir); // data read from local data - virtual swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; - virtual bool readFromJsonFilesInBackground(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; + swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, + swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; + bool readFromJsonFilesInBackground(const QString &dir, swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; // cache handling for base class - virtual swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; - virtual QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; - virtual swift::misc::network::CEntityFlags::Entity + swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; + QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; + int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const override; - virtual void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; protected: // cache handling for base class - virtual void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, - swift::misc::network::CUrl &oldUrlInfo, - swift::misc::network::CUrl &newUrlInfo) const override; - virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; + void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; + bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CUrl &oldUrlInfo, + swift::misc::network::CUrl &newUrlInfo) const override; + swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: swift::misc::CData m_aircraftIcaoCache { @@ -184,8 +182,8 @@ namespace swift::core::db std::atomic_bool m_syncedCategories { false }; //!< already synchronized? //! \copydoc CDatabaseReader::read - virtual void read(swift::misc::network::CEntityFlags::Entity entities, - swift::misc::db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) override; + void read(swift::misc::network::CEntityFlags::Entity entities, + 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 { diff --git a/src/core/db/infodatareader.h b/src/core/db/infodatareader.h index c11499656..368db19a8 100644 --- a/src/core/db/infodatareader.h +++ b/src/core/db/infodatareader.h @@ -47,30 +47,28 @@ namespace swift::core::db swift::misc::network::CUrl getInfoObjectsUrl() const; // data read from local data - virtual swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewer) override; - virtual bool readFromJsonFilesInBackground(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewer) override; + swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, + swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewer) override; + bool readFromJsonFilesInBackground(const QString &dir, swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewer) override; // cache handling for base class: no cache handling here in that case - virtual swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; - virtual QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; - virtual swift::misc::network::CEntityFlags::Entity + swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; + QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; + int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const override; - virtual void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; protected: // cache handling for base class - virtual void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, - swift::misc::network::CUrl &oldUrlInfo, - swift::misc::network::CUrl &newUrlInfo) const override; - virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; + void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; + bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CUrl &oldUrlInfo, + swift::misc::network::CUrl &newUrlInfo) const override; + swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: //! Info objects have been read @@ -87,8 +85,8 @@ namespace swift::core::db swift::misc::network::CEntityFlags::EntityFlag getEntityForMode() const; //! \copydoc CDatabaseReader::read - virtual void read(swift::misc::network::CEntityFlags::Entity entities, - swift::misc::db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) override; + void read(swift::misc::network::CEntityFlags::Entity entities, + swift::misc::db::CDbFlags::DataRetrievalModeFlag mode, const QDateTime &newerThan) override; swift::misc::db::CDbFlags::DataRetrievalModeFlag m_mode; //!< shared or DB web service? swift::misc::db::CDbInfoList m_infoObjects; diff --git a/src/core/db/modeldatareader.h b/src/core/db/modeldatareader.h index 0d0c17510..a46db05c3 100644 --- a/src/core/db/modeldatareader.h +++ b/src/core/db/modeldatareader.h @@ -136,30 +136,28 @@ namespace swift::core::db bool writeToJsonFiles(const QString &dir); // Data read from local data - virtual swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; - virtual bool readFromJsonFilesInBackground(const QString &dir, - swift::misc::network::CEntityFlags::Entity whatToRead, - bool overrideNewerOnly) override; + swift::misc::CStatusMessageList readFromJsonFiles(const QString &dir, + swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; + bool readFromJsonFilesInBackground(const QString &dir, swift::misc::network::CEntityFlags::Entity whatToRead, + bool overrideNewerOnly) override; // cache handling for base class - virtual swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; - virtual QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; - virtual swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; - virtual swift::misc::network::CEntityFlags::Entity + swift::misc::network::CEntityFlags::Entity getSupportedEntities() const override; + QDateTime getCacheTimestamp(swift::misc::network::CEntityFlags::Entity entity) const override; + int getCacheCount(swift::misc::network::CEntityFlags::Entity entity) const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheCount() const override; + swift::misc::network::CEntityFlags::Entity getEntitiesWithCacheTimestampNewerThan(const QDateTime &threshold) const override; - virtual void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void synchronizeCaches(swift::misc::network::CEntityFlags::Entity entities) override; + void admitCaches(swift::misc::network::CEntityFlags::Entity entities) override; protected: // cache handling for base class - virtual void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; - virtual bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, - swift::misc::network::CUrl &oldUrlInfo, - swift::misc::network::CUrl &newUrlInfo) const override; - virtual swift::misc::network::CUrl getDbServiceBaseUrl() const override; + void invalidateCaches(swift::misc::network::CEntityFlags::Entity entities) override; + bool hasChangedUrl(swift::misc::network::CEntityFlags::Entity entity, swift::misc::network::CUrl &oldUrlInfo, + swift::misc::network::CUrl &newUrlInfo) const override; + swift::misc::network::CUrl getDbServiceBaseUrl() const override; private: swift::misc::CData m_liveryCache { this, @@ -174,10 +172,10 @@ namespace swift::core::db std::atomic_bool m_syncedDistributorCache { false }; //!< already synchronized? //! \copydoc CDatabaseReader::read - virtual void read(swift::misc::network::CEntityFlags::Entity entities = - swift::misc::network::CEntityFlags::DistributorLiveryModel, - swift::misc::db::CDbFlags::DataRetrievalModeFlag mode = swift::misc::db::CDbFlags::DbReading, - const QDateTime &newerThan = QDateTime()) override; + void read(swift::misc::network::CEntityFlags::Entity entities = + swift::misc::network::CEntityFlags::DistributorLiveryModel, + 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 { diff --git a/src/core/fsd/clientresponse.cpp b/src/core/fsd/clientresponse.cpp index a564a6a42..fc6efecb1 100644 --- a/src/core/fsd/clientresponse.cpp +++ b/src/core/fsd/clientresponse.cpp @@ -8,8 +8,6 @@ namespace swift::core::fsd { - ClientResponse::ClientResponse() {} - ClientResponse::ClientResponse(const QString &sender, const QString &receiver, ClientQueryType queryType, const QStringList &responseData) : MessageBase(sender, receiver), m_queryType(queryType), m_responseData(responseData) diff --git a/src/core/fsd/clientresponse.h b/src/core/fsd/clientresponse.h index c5213d482..f6c7df238 100644 --- a/src/core/fsd/clientresponse.h +++ b/src/core/fsd/clientresponse.h @@ -38,7 +38,7 @@ namespace swift::core::fsd //! @} private: - ClientResponse(); + ClientResponse() = default; }; //! Equal to operator diff --git a/src/core/fsd/euroscopesimdata.cpp b/src/core/fsd/euroscopesimdata.cpp index 42d18f20f..18a5fde1d 100644 --- a/src/core/fsd/euroscopesimdata.cpp +++ b/src/core/fsd/euroscopesimdata.cpp @@ -12,8 +12,6 @@ using namespace swift::misc::aviation; namespace swift::core::fsd { - EuroscopeSimData::EuroscopeSimData() = default; - EuroscopeSimData::EuroscopeSimData(const QString &sender, const QString &model, const QString &livery, quint64 timestamp, double latitude, double longitude, double altitude, double heading, int bank, int pitch, int groundSpeed, bool onGround, diff --git a/src/core/fsd/euroscopesimdata.h b/src/core/fsd/euroscopesimdata.h index bb27b5143..378393e87 100644 --- a/src/core/fsd/euroscopesimdata.h +++ b/src/core/fsd/euroscopesimdata.h @@ -50,7 +50,7 @@ namespace swift::core::fsd //! @} private: - EuroscopeSimData(); + EuroscopeSimData() = default; }; //! Equal to operator diff --git a/src/core/fsd/flightplan.cpp b/src/core/fsd/flightplan.cpp index ff4be14dd..9dd1b4d82 100644 --- a/src/core/fsd/flightplan.cpp +++ b/src/core/fsd/flightplan.cpp @@ -8,8 +8,6 @@ namespace swift::core::fsd { - FlightPlan::FlightPlan() {} - FlightPlan::FlightPlan(const QString &sender, const QString &receiver, FlightType flightType, const QString &aircraftIcaoType, int trueCruisingSpeed, const QString &depAirport, int estimatedDepTime, int actualDepTime, const QString &cruiseAlt, diff --git a/src/core/fsd/flightplan.h b/src/core/fsd/flightplan.h index 220744561..093374fc0 100644 --- a/src/core/fsd/flightplan.h +++ b/src/core/fsd/flightplan.h @@ -52,7 +52,7 @@ namespace swift::core::fsd //! @} protected: - FlightPlan(); + FlightPlan() = default; }; //! Equal to operator diff --git a/src/core/fsd/messagebase.h b/src/core/fsd/messagebase.h index 00515e98d..f9f317043 100644 --- a/src/core/fsd/messagebase.h +++ b/src/core/fsd/messagebase.h @@ -58,7 +58,7 @@ namespace swift::core::fsd { public: //! Default Constructor - MessageBase() {} + MessageBase() = default; //! Constructor MessageBase(const QString &sender); diff --git a/src/core/fsd/revbclientparts.cpp b/src/core/fsd/revbclientparts.cpp index 8f9932378..06163cdff 100644 --- a/src/core/fsd/revbclientparts.cpp +++ b/src/core/fsd/revbclientparts.cpp @@ -8,8 +8,6 @@ namespace swift::core::fsd { - RevBClientParts::RevBClientParts() {} - RevBClientParts::RevBClientParts(const QString &sender, const QString &partsval1, const QString &partsval2, const QString &partsval3) : MessageBase(sender), m_partsval1(partsval1), m_partsval2(partsval2), m_partsval3(partsval3) diff --git a/src/core/fsd/revbclientparts.h b/src/core/fsd/revbclientparts.h index dd2748303..e1d77dbab 100644 --- a/src/core/fsd/revbclientparts.h +++ b/src/core/fsd/revbclientparts.h @@ -40,7 +40,7 @@ namespace swift::core::fsd //! @} private: - RevBClientParts(); + RevBClientParts() = default; }; //! Equal to operator diff --git a/src/core/fsd/servererror.cpp b/src/core/fsd/servererror.cpp index 37658e4ab..9ad94dd7f 100644 --- a/src/core/fsd/servererror.cpp +++ b/src/core/fsd/servererror.cpp @@ -9,8 +9,6 @@ namespace swift::core::fsd { - ServerError::ServerError() {} - ServerError::ServerError(const QString &sender, const QString &receiver, ServerErrorCode errorCode, const QString &causingParameter, const QString &description) : MessageBase(sender, receiver), m_errorNumber(errorCode), m_causingParameter(causingParameter), diff --git a/src/core/fsd/servererror.h b/src/core/fsd/servererror.h index 5768635f0..82a3f93e3 100644 --- a/src/core/fsd/servererror.h +++ b/src/core/fsd/servererror.h @@ -54,7 +54,7 @@ namespace swift::core::fsd private: //! Ctor - ServerError(); + ServerError() = default; }; //! Equal to operator diff --git a/src/core/pluginmanagersimulator.h b/src/core/pluginmanagersimulator.h index 922d0f235..25519dc1e 100644 --- a/src/core/pluginmanagersimulator.h +++ b/src/core/pluginmanagersimulator.h @@ -51,14 +51,14 @@ namespace swift::core int checkAvailableListeners(); //! \copydoc swift::core::IPluginManager::collectPlugins() - virtual void collectPlugins() override; + void collectPlugins() override; protected: //! \copydoc swift::core::IPluginManager::acceptedIids() - virtual swift::misc::CSequence acceptedIids() const override; + swift::misc::CSequence acceptedIids() const override; //! \copydoc swift::core::IPluginManager::pluginDirectory() - virtual const QString &pluginDirectory() const override; + const QString &pluginDirectory() const override; private: /*! diff --git a/src/core/progress.h b/src/core/progress.h index 5027d9457..39b26caf9 100644 --- a/src/core/progress.h +++ b/src/core/progress.h @@ -19,7 +19,7 @@ namespace swift::core virtual void updateProgressIndicator(int percentage) = 0; //! Dtor - virtual ~IProgressIndicator() {} + virtual ~IProgressIndicator() = default; //! Same as updateProgressIndicator but processing events void updateProgressIndicatorAndProcessEvents(int percentage) diff --git a/src/core/vatsim/vatsimdatafilereader.h b/src/core/vatsim/vatsimdatafilereader.h index ae6692c07..73029a53b 100644 --- a/src/core/vatsim/vatsimdatafilereader.h +++ b/src/core/vatsim/vatsimdatafilereader.h @@ -122,7 +122,7 @@ namespace swift::core::vatsim protected: // CThreadedReader overrides - virtual void doWorkImpl() override; + void doWorkImpl() override; private: //! Section in file diff --git a/src/core/vatsim/vatsimmetarreader.h b/src/core/vatsim/vatsimmetarreader.h index c7934e3de..f8d637e7b 100644 --- a/src/core/vatsim/vatsimmetarreader.h +++ b/src/core/vatsim/vatsimmetarreader.h @@ -48,7 +48,7 @@ namespace swift::core::vatsim protected: // CThreadedReader overrides - virtual void doWorkImpl() override; + void doWorkImpl() override; private: //! Decode METARs diff --git a/src/core/vatsim/vatsimsettings.cpp b/src/core/vatsim/vatsimsettings.cpp index 7fa05057e..6d6fa6354 100644 --- a/src/core/vatsim/vatsimsettings.cpp +++ b/src/core/vatsim/vatsimsettings.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::core::vatsim, CRawFsdMessageSettings) namespace swift::core::vatsim { - CReaderSettings::CReaderSettings() {} - CReaderSettings::CReaderSettings(const CTime &initialTime, const CTime &periodicTime, bool neverUpdate) : m_initialTime(initialTime), m_periodicTime(periodicTime), m_neverUpdate(neverUpdate) {} @@ -61,8 +59,6 @@ namespace swift::core::vatsim } } - CRawFsdMessageSettings::CRawFsdMessageSettings() {} - CRawFsdMessageSettings::CRawFsdMessageSettings(bool enabled, const QString &FileDir) : m_rawFsdMessagesEnabled(enabled), m_FileDir(FileDir) {} diff --git a/src/core/vatsim/vatsimsettings.h b/src/core/vatsim/vatsimsettings.h index e9e4de18b..fd406f0fc 100644 --- a/src/core/vatsim/vatsimsettings.h +++ b/src/core/vatsim/vatsimsettings.h @@ -34,7 +34,7 @@ namespace swift::core::vatsim }; //! Default constructor. - CReaderSettings(); + CReaderSettings() = default; //! Simplified constructor CReaderSettings(const swift::misc::physical_quantities::CTime &initialTime, @@ -152,7 +152,7 @@ namespace swift::core::vatsim }; //! Default constructor. - CRawFsdMessageSettings(); + CRawFsdMessageSettings() = default; //! Simplified constructor CRawFsdMessageSettings(bool enabled, const QString &fileDir); diff --git a/src/core/webdataservices.h b/src/core/webdataservices.h index 94e95dbc8..8aaabdb58 100644 --- a/src/core/webdataservices.h +++ b/src/core/webdataservices.h @@ -89,7 +89,7 @@ namespace swift::core const swift::core::db::CDatabaseReaderConfigList &dbReaderConfig, QObject *parent = nullptr); //! Destructor - virtual ~CWebDataServices() override; + ~CWebDataServices() override; //! Shutdown void gracefulShutdown(); diff --git a/src/core/webdataservicesms.h b/src/core/webdataservicesms.h index 5dd2942d7..d326c73b8 100644 --- a/src/core/webdataservicesms.h +++ b/src/core/webdataservicesms.h @@ -23,7 +23,7 @@ namespace swift::core public: //! Ctor - Q_INVOKABLE MSWebServices() {} + Q_INVOKABLE MSWebServices() = default; //! @{ //! Functions calling the web services diff --git a/src/gui/components/aboutdialog.cpp b/src/gui/components/aboutdialog.cpp index cd3768405..78ac19837 100644 --- a/src/gui/components/aboutdialog.cpp +++ b/src/gui/components/aboutdialog.cpp @@ -30,7 +30,7 @@ namespace swift::gui::components }); } - CAboutDialog::~CAboutDialog() {} + CAboutDialog::~CAboutDialog() = default; void CAboutDialog::init() { diff --git a/src/gui/components/aboutdialog.h b/src/gui/components/aboutdialog.h index 07a111f12..0508f1c65 100644 --- a/src/gui/components/aboutdialog.h +++ b/src/gui/components/aboutdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAboutDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAboutDialog() override; + ~CAboutDialog() override; private: //! Init values diff --git a/src/gui/components/abouthtmlcomponent.cpp b/src/gui/components/abouthtmlcomponent.cpp index 3d12a9c68..16cf7268b 100644 --- a/src/gui/components/abouthtmlcomponent.cpp +++ b/src/gui/components/abouthtmlcomponent.cpp @@ -32,7 +32,7 @@ namespace swift::gui::components }); } - CAboutHtmlComponent::~CAboutHtmlComponent() {} + CAboutHtmlComponent::~CAboutHtmlComponent() = default; void CAboutHtmlComponent::loadAbout() { diff --git a/src/gui/components/abouthtmlcomponent.h b/src/gui/components/abouthtmlcomponent.h index ba8ec3ed5..df01bc666 100644 --- a/src/gui/components/abouthtmlcomponent.h +++ b/src/gui/components/abouthtmlcomponent.h @@ -30,7 +30,7 @@ namespace swift::gui::components explicit CAboutHtmlComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAboutHtmlComponent() override; + ~CAboutHtmlComponent() override; private: //! Load credits and legal info diff --git a/src/gui/components/aircraftcombinedtypeselector.cpp b/src/gui/components/aircraftcombinedtypeselector.cpp index 3d09ffe6c..3fd87782f 100644 --- a/src/gui/components/aircraftcombinedtypeselector.cpp +++ b/src/gui/components/aircraftcombinedtypeselector.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components ui->le_CombinedType->setValidator(new CUpperCaseValidator(this)); } - CAircraftCombinedTypeSelector::~CAircraftCombinedTypeSelector() {} + CAircraftCombinedTypeSelector::~CAircraftCombinedTypeSelector() = default; void CAircraftCombinedTypeSelector::setCombinedType(const QString &combinedCode) { diff --git a/src/gui/components/aircraftcombinedtypeselector.h b/src/gui/components/aircraftcombinedtypeselector.h index 2e2326429..c7717b8c2 100644 --- a/src/gui/components/aircraftcombinedtypeselector.h +++ b/src/gui/components/aircraftcombinedtypeselector.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CAircraftCombinedTypeSelector(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftCombinedTypeSelector() override; + ~CAircraftCombinedTypeSelector() override; //! Set comined code, e.g. L1P void setCombinedType(const QString &combinedCode); diff --git a/src/gui/components/aircraftcomponent.cpp b/src/gui/components/aircraftcomponent.cpp index 1295e1965..c7670298f 100644 --- a/src/gui/components/aircraftcomponent.cpp +++ b/src/gui/components/aircraftcomponent.cpp @@ -62,7 +62,7 @@ namespace swift::gui::components m_updateTimer.start(); } - CAircraftComponent::~CAircraftComponent() {} + CAircraftComponent::~CAircraftComponent() = default; int CAircraftComponent::countAircraftInView() const { diff --git a/src/gui/components/aircraftcomponent.h b/src/gui/components/aircraftcomponent.h index 964b7942b..748604842 100644 --- a/src/gui/components/aircraftcomponent.h +++ b/src/gui/components/aircraftcomponent.h @@ -56,13 +56,13 @@ namespace swift::gui explicit CAircraftComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftComponent() override; + ~CAircraftComponent() override; //! Aircraft in range int countAircraftInView() const; //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; //! Update aircraft/airport view void update(); diff --git a/src/gui/components/aircraftmodelsetvalidationdialog.cpp b/src/gui/components/aircraftmodelsetvalidationdialog.cpp index bb88ea958..4e5e58ca1 100644 --- a/src/gui/components/aircraftmodelsetvalidationdialog.cpp +++ b/src/gui/components/aircraftmodelsetvalidationdialog.cpp @@ -20,7 +20,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() | Qt::WindowContextHelpButtonHint); } - CAircraftModelSetValidationDialog::~CAircraftModelSetValidationDialog() {} + CAircraftModelSetValidationDialog::~CAircraftModelSetValidationDialog() = default; void CAircraftModelSetValidationDialog::validatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, diff --git a/src/gui/components/aircraftmodelsetvalidationdialog.h b/src/gui/components/aircraftmodelsetvalidationdialog.h index 949b26afe..15fc07f70 100644 --- a/src/gui/components/aircraftmodelsetvalidationdialog.h +++ b/src/gui/components/aircraftmodelsetvalidationdialog.h @@ -39,7 +39,7 @@ namespace swift::gui::components explicit CAircraftModelSetValidationDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelSetValidationDialog() override; + ~CAircraftModelSetValidationDialog() override; //! \copydoc CAircraftModelValidationComponent::validatedModelSet void validatedModelSet(const swift::misc::simulation::CSimulatorInfo &simulator, diff --git a/src/gui/components/aircraftmodelstringcompleter.cpp b/src/gui/components/aircraftmodelstringcompleter.cpp index 8119b0e5e..9d3cdad5c 100644 --- a/src/gui/components/aircraftmodelstringcompleter.cpp +++ b/src/gui/components/aircraftmodelstringcompleter.cpp @@ -55,7 +55,7 @@ namespace swift::gui::components this->initGui(); } - CAircraftModelStringCompleter::~CAircraftModelStringCompleter() {} + CAircraftModelStringCompleter::~CAircraftModelStringCompleter() = default; QString CAircraftModelStringCompleter::getModelString() const { return ui->le_modelString->text(); } diff --git a/src/gui/components/aircraftmodelstringcompleter.h b/src/gui/components/aircraftmodelstringcompleter.h index 4bb5735c3..890b60fa8 100644 --- a/src/gui/components/aircraftmodelstringcompleter.h +++ b/src/gui/components/aircraftmodelstringcompleter.h @@ -43,7 +43,7 @@ namespace swift::gui::components explicit CAircraftModelStringCompleter(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelStringCompleter() override; + ~CAircraftModelStringCompleter() override; //! The model string QString getModelString() const; diff --git a/src/gui/components/aircraftmodelvalidationcomponent.cpp b/src/gui/components/aircraftmodelvalidationcomponent.cpp index a62c0a8b2..dc6e26a60 100644 --- a/src/gui/components/aircraftmodelvalidationcomponent.cpp +++ b/src/gui/components/aircraftmodelvalidationcomponent.cpp @@ -58,7 +58,7 @@ namespace swift::gui::components }); } - CAircraftModelValidationComponent::~CAircraftModelValidationComponent() {} + CAircraftModelValidationComponent::~CAircraftModelValidationComponent() = default; void CAircraftModelValidationComponent::validatedModelSet(const CSimulatorInfo &simulator, const CAircraftModelList &valid, diff --git a/src/gui/components/aircraftmodelvalidationcomponent.h b/src/gui/components/aircraftmodelvalidationcomponent.h index f7e5acfad..a8100cd0f 100644 --- a/src/gui/components/aircraftmodelvalidationcomponent.h +++ b/src/gui/components/aircraftmodelvalidationcomponent.h @@ -41,7 +41,7 @@ namespace swift::gui::components explicit CAircraftModelValidationComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelValidationComponent() override; + ~CAircraftModelValidationComponent() override; //! Validated a model set //! \remark coming from swift::misc::simulation::CBackgroundValidation diff --git a/src/gui/components/aircraftpartscomponent.cpp b/src/gui/components/aircraftpartscomponent.cpp index ded573d57..5d35a03ba 100644 --- a/src/gui/components/aircraftpartscomponent.cpp +++ b/src/gui/components/aircraftpartscomponent.cpp @@ -43,10 +43,7 @@ namespace swift::gui::components ui->comp_RemoteAircraftCompleter->addOwnCallsign(true); } - CAircraftPartsComponent::~CAircraftPartsComponent() - { - // void - } + CAircraftPartsComponent::~CAircraftPartsComponent() = default; void CAircraftPartsComponent::setCallsign(const CCallsign &callsign) { diff --git a/src/gui/components/aircraftpartscomponent.h b/src/gui/components/aircraftpartscomponent.h index 79cecaa40..8121e76c2 100644 --- a/src/gui/components/aircraftpartscomponent.h +++ b/src/gui/components/aircraftpartscomponent.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAircraftPartsComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CAircraftPartsComponent() override; + ~CAircraftPartsComponent() override; //! Set selected callsign void setCallsign(const swift::misc::aviation::CCallsign &callsign); diff --git a/src/gui/components/aircraftpartshistory.cpp b/src/gui/components/aircraftpartshistory.cpp index 283b376ca..b99821e8d 100644 --- a/src/gui/components/aircraftpartshistory.cpp +++ b/src/gui/components/aircraftpartshistory.cpp @@ -47,7 +47,7 @@ namespace swift::gui::components connect(&m_timerUpdateHistory, &QTimer::timeout, this, &CAircraftPartsHistory::updatePartsHistory); } - CAircraftPartsHistory::~CAircraftPartsHistory() {} + CAircraftPartsHistory::~CAircraftPartsHistory() = default; void CAircraftPartsHistory::initGui() { diff --git a/src/gui/components/aircraftpartshistory.h b/src/gui/components/aircraftpartshistory.h index 30e3192d3..e2c579f71 100644 --- a/src/gui/components/aircraftpartshistory.h +++ b/src/gui/components/aircraftpartshistory.h @@ -31,7 +31,7 @@ namespace swift::gui::components explicit CAircraftPartsHistory(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftPartsHistory(); + ~CAircraftPartsHistory() override; private: QScopedPointer ui; diff --git a/src/gui/components/airportcompleter.cpp b/src/gui/components/airportcompleter.cpp index 38adf5b6b..77d7318c2 100644 --- a/src/gui/components/airportcompleter.cpp +++ b/src/gui/components/airportcompleter.cpp @@ -30,7 +30,7 @@ namespace swift::gui::components this->onAirportsChanged(); } - CAirportCompleter::~CAirportCompleter() {} + CAirportCompleter::~CAirportCompleter() = default; void CAirportCompleter::setAirport(const CAirport &airport) { diff --git a/src/gui/components/airportcompleter.h b/src/gui/components/airportcompleter.h index 734c85c69..dfbebe823 100644 --- a/src/gui/components/airportcompleter.h +++ b/src/gui/components/airportcompleter.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAirportCompleter(QWidget *parent = nullptr); //! Destructor - virtual ~CAirportCompleter(); + ~CAirportCompleter() override; //! Set airport void setAirport(const swift::misc::aviation::CAirport &airport); diff --git a/src/gui/components/airportdialog.cpp b/src/gui/components/airportdialog.cpp index cb87ce1c2..791fd4889 100644 --- a/src/gui/components/airportdialog.cpp +++ b/src/gui/components/airportdialog.cpp @@ -15,7 +15,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CAirportDialog::~CAirportDialog() {} + CAirportDialog::~CAirportDialog() = default; void CAirportDialog::setAirport(const CAirport &airport) { ui->comp_AirportCompleter->setAirport(airport); } diff --git a/src/gui/components/airportdialog.h b/src/gui/components/airportdialog.h index bee4b357a..1e90f5c18 100644 --- a/src/gui/components/airportdialog.h +++ b/src/gui/components/airportdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAirportDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAirportDialog(); + ~CAirportDialog() override; //! Set airport void setAirport(const swift::misc::aviation::CAirport &airport); diff --git a/src/gui/components/airportsmallcompleter.cpp b/src/gui/components/airportsmallcompleter.cpp index f3acc87ac..2fdd8c753 100644 --- a/src/gui/components/airportsmallcompleter.cpp +++ b/src/gui/components/airportsmallcompleter.cpp @@ -33,7 +33,7 @@ namespace swift::gui::components this->onAirportsChanged(); } - CAirportSmallCompleter::~CAirportSmallCompleter() {} + CAirportSmallCompleter::~CAirportSmallCompleter() = default; void CAirportSmallCompleter::setAirport(const CAirport &airport) { diff --git a/src/gui/components/airportsmallcompleter.h b/src/gui/components/airportsmallcompleter.h index 715831607..9150c49c1 100644 --- a/src/gui/components/airportsmallcompleter.h +++ b/src/gui/components/airportsmallcompleter.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CAirportSmallCompleter(QWidget *parent = nullptr); //! Destructor - virtual ~CAirportSmallCompleter(); + ~CAirportSmallCompleter() override; //! Set airport void setAirport(const swift::misc::aviation::CAirport &airport); diff --git a/src/gui/components/altitudedialog.cpp b/src/gui/components/altitudedialog.cpp index 5c9148502..75719bf62 100644 --- a/src/gui/components/altitudedialog.cpp +++ b/src/gui/components/altitudedialog.cpp @@ -66,7 +66,7 @@ namespace swift::gui::components connect(ui->le_Sm, &QLineEdit::textEdited, this, &CAltitudeDialog::onTextEdit); } - CAltitudeDialog::~CAltitudeDialog() {} + CAltitudeDialog::~CAltitudeDialog() = default; CAltitudeDialog::Mode CAltitudeDialog::getMode() const { diff --git a/src/gui/components/altitudedialog.h b/src/gui/components/altitudedialog.h index bd634dd72..b9df3875d 100644 --- a/src/gui/components/altitudedialog.h +++ b/src/gui/components/altitudedialog.h @@ -44,7 +44,7 @@ namespace swift::gui::components explicit CAltitudeDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAltitudeDialog() override; + ~CAltitudeDialog() override; //! Get mode Mode getMode() const; diff --git a/src/gui/components/applicationclosedialog.cpp b/src/gui/components/applicationclosedialog.cpp index b7fcf3e4f..58d0197fa 100644 --- a/src/gui/components/applicationclosedialog.cpp +++ b/src/gui/components/applicationclosedialog.cpp @@ -38,7 +38,7 @@ namespace swift::gui::components &CApplicationCloseDialog::buttonClicked); } - CApplicationCloseDialog::~CApplicationCloseDialog() {} + CApplicationCloseDialog::~CApplicationCloseDialog() = default; void CApplicationCloseDialog::onAccepted() { diff --git a/src/gui/components/applicationclosedialog.h b/src/gui/components/applicationclosedialog.h index a1c4408c8..05f96bddf 100644 --- a/src/gui/components/applicationclosedialog.h +++ b/src/gui/components/applicationclosedialog.h @@ -30,7 +30,7 @@ namespace swift::gui::components explicit CApplicationCloseDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CApplicationCloseDialog(); + ~CApplicationCloseDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/atcbuttoncomponent.cpp b/src/gui/components/atcbuttoncomponent.cpp index 976572b4b..b737b09c4 100644 --- a/src/gui/components/atcbuttoncomponent.cpp +++ b/src/gui/components/atcbuttoncomponent.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components this->setVisible(false); // will be changed when ATC stations are reported } - CAtcButtonComponent::~CAtcButtonComponent() {} + CAtcButtonComponent::~CAtcButtonComponent() = default; void CAtcButtonComponent::updateStations() { diff --git a/src/gui/components/atcbuttoncomponent.h b/src/gui/components/atcbuttoncomponent.h index 9f329abcd..c86cd7613 100644 --- a/src/gui/components/atcbuttoncomponent.h +++ b/src/gui/components/atcbuttoncomponent.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CAtcButtonComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CAtcButtonComponent(); + ~CAtcButtonComponent() override; //! Update void updateStations(); diff --git a/src/gui/components/atcstationcomponent.cpp b/src/gui/components/atcstationcomponent.cpp index ce4cff06a..683aac071 100644 --- a/src/gui/components/atcstationcomponent.cpp +++ b/src/gui/components/atcstationcomponent.cpp @@ -158,7 +158,7 @@ namespace swift::gui::components this->settingsChanged(); } - CAtcStationComponent::~CAtcStationComponent() {} + CAtcStationComponent::~CAtcStationComponent() = default; void CAtcStationComponent::setTab(AtcTab tab) { diff --git a/src/gui/components/atcstationcomponent.h b/src/gui/components/atcstationcomponent.h index d13809bd8..3e36c6b3e 100644 --- a/src/gui/components/atcstationcomponent.h +++ b/src/gui/components/atcstationcomponent.h @@ -61,7 +61,7 @@ namespace swift::gui explicit CAtcStationComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAtcStationComponent() override; + ~CAtcStationComponent() override; //! Set tab void setTab(AtcTab tab); @@ -76,7 +76,7 @@ namespace swift::gui void getMetar(const QString &airportIcaoCode); //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; signals: //! Request audio widget diff --git a/src/gui/components/audioadvanceddistributedcomponent.cpp b/src/gui/components/audioadvanceddistributedcomponent.cpp index 669d95be7..1869c9b67 100644 --- a/src/gui/components/audioadvanceddistributedcomponent.cpp +++ b/src/gui/components/audioadvanceddistributedcomponent.cpp @@ -24,7 +24,7 @@ namespace swift::gui::components &CAudioAdvancedDistributedComponent::reloadRegisteredDevices, Qt::QueuedConnection); } - CAudioAdvancedDistributedComponent::~CAudioAdvancedDistributedComponent() {} + CAudioAdvancedDistributedComponent::~CAudioAdvancedDistributedComponent() = default; void CAudioAdvancedDistributedComponent::reloadRegisteredDevices() { diff --git a/src/gui/components/audioadvanceddistributedcomponent.h b/src/gui/components/audioadvanceddistributedcomponent.h index 770c42003..6edfe190a 100644 --- a/src/gui/components/audioadvanceddistributedcomponent.h +++ b/src/gui/components/audioadvanceddistributedcomponent.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAudioAdvancedDistributedComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CAudioAdvancedDistributedComponent() override; + ~CAudioAdvancedDistributedComponent() override; //! Reload registered devices void reloadRegisteredDevices(); diff --git a/src/gui/components/audioadvanceddistributeddialog.cpp b/src/gui/components/audioadvanceddistributeddialog.cpp index 3876e6a81..096f6a3e6 100644 --- a/src/gui/components/audioadvanceddistributeddialog.cpp +++ b/src/gui/components/audioadvanceddistributeddialog.cpp @@ -15,7 +15,7 @@ namespace swift::gui::components this->reloadRegisteredDevices(); } - CAudioAdvancedDistributedDialog::~CAudioAdvancedDistributedDialog() {} + CAudioAdvancedDistributedDialog::~CAudioAdvancedDistributedDialog() = default; void CAudioAdvancedDistributedDialog::reloadRegisteredDevices() { diff --git a/src/gui/components/audioadvanceddistributeddialog.h b/src/gui/components/audioadvanceddistributeddialog.h index 15e807cf1..02cb7247a 100644 --- a/src/gui/components/audioadvanceddistributeddialog.h +++ b/src/gui/components/audioadvanceddistributeddialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAudioAdvancedDistributedDialog(QWidget *parent = nullptr); //! Dtor - virtual ~CAudioAdvancedDistributedDialog() override; + ~CAudioAdvancedDistributedDialog() override; //! Reload registered devices void reloadRegisteredDevices(); diff --git a/src/gui/components/audiodevicevolumesetupcomponent.cpp b/src/gui/components/audiodevicevolumesetupcomponent.cpp index 86bf0b751..9cc59f572 100644 --- a/src/gui/components/audiodevicevolumesetupcomponent.cpp +++ b/src/gui/components/audiodevicevolumesetupcomponent.cpp @@ -209,7 +209,7 @@ namespace swift::gui::components this->setTransmitReceiveInUiFromVoiceClient(); } - CAudioDeviceVolumeSetupComponent::~CAudioDeviceVolumeSetupComponent() {} + CAudioDeviceVolumeSetupComponent::~CAudioDeviceVolumeSetupComponent() = default; int CAudioDeviceVolumeSetupComponent::getInValue(int from, int to) const { diff --git a/src/gui/components/audiodevicevolumesetupcomponent.h b/src/gui/components/audiodevicevolumesetupcomponent.h index 51a9948f2..f4faee693 100644 --- a/src/gui/components/audiodevicevolumesetupcomponent.h +++ b/src/gui/components/audiodevicevolumesetupcomponent.h @@ -39,7 +39,7 @@ namespace swift::gui::components explicit CAudioDeviceVolumeSetupComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAudioDeviceVolumeSetupComponent() override; + ~CAudioDeviceVolumeSetupComponent() override; //! @{ //! Get input and output volume values diff --git a/src/gui/components/audionotificationcomponent.cpp b/src/gui/components/audionotificationcomponent.cpp index 06d522f72..933797b42 100644 --- a/src/gui/components/audionotificationcomponent.cpp +++ b/src/gui/components/audionotificationcomponent.cpp @@ -94,7 +94,7 @@ namespace swift::gui::components Q_ASSERT(c); } - CAudioNotificationComponent::~CAudioNotificationComponent() {} + CAudioNotificationComponent::~CAudioNotificationComponent() = default; void CAudioNotificationComponent::reloadSettings() { diff --git a/src/gui/components/autopublishcomponent.cpp b/src/gui/components/autopublishcomponent.cpp index e4e9abaf2..b578c6f7d 100644 --- a/src/gui/components/autopublishcomponent.cpp +++ b/src/gui/components/autopublishcomponent.cpp @@ -41,7 +41,7 @@ namespace swift::gui::components } } - CAutoPublishComponent::~CAutoPublishComponent() {} + CAutoPublishComponent::~CAutoPublishComponent() = default; int CAutoPublishComponent::readFiles() { diff --git a/src/gui/components/autopublishcomponent.h b/src/gui/components/autopublishcomponent.h index 03dc8250c..a6d9be36b 100644 --- a/src/gui/components/autopublishcomponent.h +++ b/src/gui/components/autopublishcomponent.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CAutoPublishComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CAutoPublishComponent() override; + ~CAutoPublishComponent() override; //! Read the files int readFiles(); diff --git a/src/gui/components/autopublishdialog.cpp b/src/gui/components/autopublishdialog.cpp index 660f3036c..65366f88f 100644 --- a/src/gui/components/autopublishdialog.cpp +++ b/src/gui/components/autopublishdialog.cpp @@ -15,7 +15,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CAutoPublishDialog::~CAutoPublishDialog() {} + CAutoPublishDialog::~CAutoPublishDialog() = default; int CAutoPublishDialog::readFiles() { return ui->comp_AutoPublish->readFiles(); } diff --git a/src/gui/components/autopublishdialog.h b/src/gui/components/autopublishdialog.h index 5f9a18f6c..de3c049e4 100644 --- a/src/gui/components/autopublishdialog.h +++ b/src/gui/components/autopublishdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CAutoPublishDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAutoPublishDialog() override; + ~CAutoPublishDialog() override; //! \copydoc CAutoPublishComponent::readFiles int readFiles(); diff --git a/src/gui/components/callsigncompleter.cpp b/src/gui/components/callsigncompleter.cpp index 914810a41..cd531e358 100644 --- a/src/gui/components/callsigncompleter.cpp +++ b/src/gui/components/callsigncompleter.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components m_dsAircraftsInRangeChanged.inputSignal(); // trigger } - CCallsignCompleter::~CCallsignCompleter() {} + CCallsignCompleter::~CCallsignCompleter() = default; CCallsign CCallsignCompleter::getCallsign(bool onlyKnownCallsign) const { diff --git a/src/gui/components/callsigncompleter.h b/src/gui/components/callsigncompleter.h index 49f0083d9..bef993652 100644 --- a/src/gui/components/callsigncompleter.h +++ b/src/gui/components/callsigncompleter.h @@ -35,7 +35,7 @@ namespace swift::gui::components explicit CCallsignCompleter(QWidget *parent = nullptr); //! Dtor - virtual ~CCallsignCompleter() override; + ~CCallsignCompleter() override; //! Get the entered callsign swift::misc::aviation::CCallsign getCallsign(bool onlyKnownCallsign = true) const; diff --git a/src/gui/components/cgsourceselector.cpp b/src/gui/components/cgsourceselector.cpp index 541cf8389..e7afa1d92 100644 --- a/src/gui/components/cgsourceselector.cpp +++ b/src/gui/components/cgsourceselector.cpp @@ -15,7 +15,7 @@ namespace swift::gui::components this->initComboBox(); } - CCGSourceSelector::~CCGSourceSelector() {} + CCGSourceSelector::~CCGSourceSelector() = default; CSimulatorSettings::CGSource CCGSourceSelector::getValue() const { diff --git a/src/gui/components/cgsourceselector.h b/src/gui/components/cgsourceselector.h index e4f4a5eac..2799c8f1e 100644 --- a/src/gui/components/cgsourceselector.h +++ b/src/gui/components/cgsourceselector.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CCGSourceSelector(QWidget *parent = nullptr); //! Dtor - virtual ~CCGSourceSelector() override; + ~CCGSourceSelector() override; //! @{ //! Get/set value diff --git a/src/gui/components/cockpitcomaudiodialog.cpp b/src/gui/components/cockpitcomaudiodialog.cpp index b692d8653..ee1cca432 100644 --- a/src/gui/components/cockpitcomaudiodialog.cpp +++ b/src/gui/components/cockpitcomaudiodialog.cpp @@ -14,6 +14,6 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CCockpitComAudioDialog::~CCockpitComAudioDialog() {} + CCockpitComAudioDialog::~CCockpitComAudioDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/cockpitcomaudiodialog.h b/src/gui/components/cockpitcomaudiodialog.h index b7c96f341..8ab73f5ae 100644 --- a/src/gui/components/cockpitcomaudiodialog.h +++ b/src/gui/components/cockpitcomaudiodialog.h @@ -26,7 +26,7 @@ namespace swift::gui::components explicit CCockpitComAudioDialog(QWidget *parent = nullptr); //! Dtor - virtual ~CCockpitComAudioDialog() override; + ~CCockpitComAudioDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/cockpitcomcomponent.cpp b/src/gui/components/cockpitcomcomponent.cpp index 864b958da..e75b0c507 100644 --- a/src/gui/components/cockpitcomcomponent.cpp +++ b/src/gui/components/cockpitcomcomponent.cpp @@ -93,7 +93,7 @@ namespace swift::gui::components } } - CCockpitComComponent::~CCockpitComComponent() {} + CCockpitComComponent::~CCockpitComComponent() = default; void CCockpitComComponent::setTransponderModeStateIdent() { ui->editor_Com->setTransponderModeStateIdent(); } diff --git a/src/gui/components/cockpitcomcomponent.h b/src/gui/components/cockpitcomcomponent.h index 12dcfc3fe..8847f249e 100644 --- a/src/gui/components/cockpitcomcomponent.h +++ b/src/gui/components/cockpitcomcomponent.h @@ -43,7 +43,7 @@ namespace swift::gui::components explicit CCockpitComComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CCockpitComComponent() override; + ~CCockpitComComponent() override; //! Set to swift::misc::aviation::CTransponder::StateIdent void setTransponderModeStateIdent(); @@ -63,7 +63,7 @@ namespace swift::gui::components protected: //! \copydoc QWidget::paintEvent - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; private: //! Cockpit values have been changed in GUI diff --git a/src/gui/components/cockpitcomponent.cpp b/src/gui/components/cockpitcomponent.cpp index fae351886..95b9ac3e1 100644 --- a/src/gui/components/cockpitcomponent.cpp +++ b/src/gui/components/cockpitcomponent.cpp @@ -30,7 +30,7 @@ namespace swift::gui::components &CCockpitComponent::onRequestTextMessageCom2, Qt::QueuedConnection); } - CCockpitComponent::~CCockpitComponent() {} + CCockpitComponent::~CCockpitComponent() = default; bool CCockpitComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) { diff --git a/src/gui/components/cockpitcomponent.h b/src/gui/components/cockpitcomponent.h index 10d8aae89..a5df57db0 100644 --- a/src/gui/components/cockpitcomponent.h +++ b/src/gui/components/cockpitcomponent.h @@ -34,10 +34,10 @@ namespace swift::gui explicit CCockpitComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CCockpitComponent() override; + ~CCockpitComponent() override; //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; //! Is the info area shown? bool isInfoAreaShown() const; @@ -50,7 +50,7 @@ namespace swift::gui protected: //! \copydoc QWidget::mouseDoubleClickEvent - virtual void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; private: //! Show or hide cockpit details diff --git a/src/gui/components/cockpitcomtransmissioncomponent.cpp b/src/gui/components/cockpitcomtransmissioncomponent.cpp index cfe6ba6d6..8239702a8 100644 --- a/src/gui/components/cockpitcomtransmissioncomponent.cpp +++ b/src/gui/components/cockpitcomtransmissioncomponent.cpp @@ -18,10 +18,7 @@ namespace swift::gui::components connect(ui->pb_Com2Save, &QPushButton::released, this, &CCockpitComTransmissionComponent::onSave); } - CCockpitComTransmissionComponent::~CCockpitComTransmissionComponent() - { - // void - } + CCockpitComTransmissionComponent::~CCockpitComTransmissionComponent() = default; void CCockpitComTransmissionComponent::updateComSystem(CComSystem &comSystem, CComSystem::ComUnit comUnit) const { diff --git a/src/gui/components/cockpitcomtransmissioncomponent.h b/src/gui/components/cockpitcomtransmissioncomponent.h index 5d0fed428..688e845b9 100644 --- a/src/gui/components/cockpitcomtransmissioncomponent.h +++ b/src/gui/components/cockpitcomtransmissioncomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CCockpitComTransmissionComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CCockpitComTransmissionComponent() override; + ~CCockpitComTransmissionComponent() override; //! Update given COM system void updateComSystem(swift::misc::aviation::CComSystem &comSystem, diff --git a/src/gui/components/cockpitinfoareacomponent.cpp b/src/gui/components/cockpitinfoareacomponent.cpp index 44da84adf..4c9c137a9 100644 --- a/src/gui/components/cockpitinfoareacomponent.cpp +++ b/src/gui/components/cockpitinfoareacomponent.cpp @@ -24,7 +24,7 @@ namespace swift::gui::components this->toggleTabBarLocked(true); } - CCockpitInfoAreaComponent::~CCockpitInfoAreaComponent() {} + CCockpitInfoAreaComponent::~CCockpitInfoAreaComponent() = default; QSize CCockpitInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const { diff --git a/src/gui/components/cockpitinfoareacomponent.h b/src/gui/components/cockpitinfoareacomponent.h index 8d077f6b0..e927b0cba 100644 --- a/src/gui/components/cockpitinfoareacomponent.h +++ b/src/gui/components/cockpitinfoareacomponent.h @@ -33,7 +33,7 @@ namespace swift::gui::components explicit CCockpitInfoAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CCockpitInfoAreaComponent() override; + ~CCockpitInfoAreaComponent() override; //! Info areas enum InfoArea @@ -54,10 +54,10 @@ namespace swift::gui::components protected: //! \copydoc CInfoArea::getPreferredSizeWhenFloating - virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; + QSize getPreferredSizeWhenFloating(int areaIndex) const override; //! \copydoc CInfoArea::indexToPixmap - virtual const QPixmap &indexToPixmap(int areaIndex) const override; + const QPixmap &indexToPixmap(int areaIndex) const override; private: QScopedPointer ui; diff --git a/src/gui/components/colorselector.cpp b/src/gui/components/colorselector.cpp index ff23543eb..9d75b0871 100644 --- a/src/gui/components/colorselector.cpp +++ b/src/gui/components/colorselector.cpp @@ -51,7 +51,7 @@ namespace swift::gui::components connect(completer, qOverload(&QCompleter::activated), this, &CColorSelector::setColorByName); } - CColorSelector::~CColorSelector() {} + CColorSelector::~CColorSelector() = default; void CColorSelector::setColor(const swift::misc::CRgbColor &color) { diff --git a/src/gui/components/colorselector.h b/src/gui/components/colorselector.h index 5049d71aa..b6cd6748d 100644 --- a/src/gui/components/colorselector.h +++ b/src/gui/components/colorselector.h @@ -64,19 +64,19 @@ namespace swift::gui::components protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; //! For dragging the color - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; private: //! Open up a color dilaog diff --git a/src/gui/components/configsimulatorcomponent.cpp b/src/gui/components/configsimulatorcomponent.cpp index e7dcbb9b4..2c875470f 100644 --- a/src/gui/components/configsimulatorcomponent.cpp +++ b/src/gui/components/configsimulatorcomponent.cpp @@ -24,7 +24,7 @@ namespace swift::gui::components this->preselectSimulators(); } - CConfigSimulatorComponent::~CConfigSimulatorComponent() {} + CConfigSimulatorComponent::~CConfigSimulatorComponent() = default; void CConfigSimulatorComponent::save() { diff --git a/src/gui/components/configsimulatorcomponent.h b/src/gui/components/configsimulatorcomponent.h index dfd4a9043..54289593e 100644 --- a/src/gui/components/configsimulatorcomponent.h +++ b/src/gui/components/configsimulatorcomponent.h @@ -31,7 +31,7 @@ namespace swift::gui::components explicit CConfigSimulatorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CConfigSimulatorComponent(); + ~CConfigSimulatorComponent() override; //! Save data void save(); @@ -69,10 +69,10 @@ namespace swift::gui::components void setConfigComponent(CConfigSimulatorComponent *config) { m_config = config; } //! \copydoc QWizardPage::initializePage - virtual void initializePage() override; + void initializePage() override; //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CConfigSimulatorComponent *m_config = nullptr; diff --git a/src/gui/components/configurationwizard.cpp b/src/gui/components/configurationwizard.cpp index 29c6cb470..ddb00b251 100644 --- a/src/gui/components/configurationwizard.cpp +++ b/src/gui/components/configurationwizard.cpp @@ -61,7 +61,7 @@ namespace swift::gui::components CGuiUtility::setWizardButtonWidths(this); } - CConfigurationWizard::~CConfigurationWizard() {} + CConfigurationWizard::~CConfigurationWizard() = default; bool CConfigurationWizard::lastStepSkipped() const { return m_skipped; } diff --git a/src/gui/components/configurationwizard.h b/src/gui/components/configurationwizard.h index 711d93cd6..d20cd60b9 100644 --- a/src/gui/components/configurationwizard.h +++ b/src/gui/components/configurationwizard.h @@ -42,7 +42,7 @@ namespace swift::gui::components explicit CConfigurationWizard(QWidget *parent = nullptr); //! Destructor - virtual ~CConfigurationWizard() override; + ~CConfigurationWizard() override; //! Was the last step skipped? bool lastStepSkipped() const; diff --git a/src/gui/components/coordinatedialog.cpp b/src/gui/components/coordinatedialog.cpp index 6756382cc..ea43e14ab 100644 --- a/src/gui/components/coordinatedialog.cpp +++ b/src/gui/components/coordinatedialog.cpp @@ -22,7 +22,7 @@ namespace swift::gui::components connect(this, &QDialog::accepted, this, &CCoordinateDialog::changedCoordinate); } - CCoordinateDialog::~CCoordinateDialog() {} + CCoordinateDialog::~CCoordinateDialog() = default; CCoordinateGeodetic CCoordinateDialog::getCoordinate() const { return ui->editor_Coordinate->getCoordinate(); } diff --git a/src/gui/components/coordinatedialog.h b/src/gui/components/coordinatedialog.h index a6c932d5c..67b4cb1d9 100644 --- a/src/gui/components/coordinatedialog.h +++ b/src/gui/components/coordinatedialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CCoordinateDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CCoordinateDialog(); + ~CCoordinateDialog() override; //! \copydoc swift::gui::editors::CCoordinateForm::getCoordinate swift::misc::geo::CCoordinateGeodetic getCoordinate() const; diff --git a/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp b/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp index 6d68dc748..539709648 100644 --- a/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp +++ b/src/gui/components/copymodelsfromotherswiftversionscomponent.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components &CCopyModelsFromOtherSwiftVersionsComponent::onVersionChanged); } - CCopyModelsFromOtherSwiftVersionsComponent::~CCopyModelsFromOtherSwiftVersionsComponent() {} + CCopyModelsFromOtherSwiftVersionsComponent::~CCopyModelsFromOtherSwiftVersionsComponent() = default; void CCopyModelsFromOtherSwiftVersionsComponent::copy() { diff --git a/src/gui/components/copymodelsfromotherswiftversionscomponent.h b/src/gui/components/copymodelsfromotherswiftversionscomponent.h index deb552dba..ef1917a1a 100644 --- a/src/gui/components/copymodelsfromotherswiftversionscomponent.h +++ b/src/gui/components/copymodelsfromotherswiftversionscomponent.h @@ -32,7 +32,7 @@ namespace swift::gui::components explicit CCopyModelsFromOtherSwiftVersionsComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CCopyModelsFromOtherSwiftVersionsComponent(); + ~CCopyModelsFromOtherSwiftVersionsComponent() override; //! Reload other versions void reloadOtherVersions(int deferMs = -1); @@ -74,10 +74,10 @@ namespace swift::gui::components void setConfigComponent(CCopyModelsFromOtherSwiftVersionsComponent *config) { m_copyModels = config; } //! \copydoc QWizardPage::initializePage - virtual void initializePage() override; + void initializePage() override; //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CCopyModelsFromOtherSwiftVersionsComponent *m_copyModels = nullptr; diff --git a/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp b/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp index bdab6c152..2f553ffc5 100644 --- a/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp +++ b/src/gui/components/copymodelsfromotherswiftversionsdialog.cpp @@ -14,5 +14,5 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CCopyModelsFromOtherSwiftVersionsDialog::~CCopyModelsFromOtherSwiftVersionsDialog() {} + CCopyModelsFromOtherSwiftVersionsDialog::~CCopyModelsFromOtherSwiftVersionsDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/copymodelsfromotherswiftversionsdialog.h b/src/gui/components/copymodelsfromotherswiftversionsdialog.h index 42377abb4..9f2f17c08 100644 --- a/src/gui/components/copymodelsfromotherswiftversionsdialog.h +++ b/src/gui/components/copymodelsfromotherswiftversionsdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CCopyModelsFromOtherSwiftVersionsDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CCopyModelsFromOtherSwiftVersionsDialog(); + ~CCopyModelsFromOtherSwiftVersionsDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/copysettingsandcachescomponent.cpp b/src/gui/components/copysettingsandcachescomponent.cpp index ee927bc3c..413449e37 100644 --- a/src/gui/components/copysettingsandcachescomponent.cpp +++ b/src/gui/components/copysettingsandcachescomponent.cpp @@ -44,7 +44,7 @@ namespace swift::gui::components &CCopySettingsAndCachesComponent::onOtherVersionChanged); } - CCopySettingsAndCachesComponent::~CCopySettingsAndCachesComponent() {} + CCopySettingsAndCachesComponent::~CCopySettingsAndCachesComponent() = default; void CCopySettingsAndCachesComponent::reloadOtherVersions(int deferMs) { diff --git a/src/gui/components/copysettingsandcachescomponent.h b/src/gui/components/copysettingsandcachescomponent.h index 30dffad27..1a3869f32 100644 --- a/src/gui/components/copysettingsandcachescomponent.h +++ b/src/gui/components/copysettingsandcachescomponent.h @@ -50,7 +50,7 @@ namespace swift::gui::components explicit CCopySettingsAndCachesComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CCopySettingsAndCachesComponent(); + ~CCopySettingsAndCachesComponent() override; //! Reload other versions void reloadOtherVersions(int deferMs = -1); @@ -169,10 +169,10 @@ namespace swift::gui::components void setConfigComponent(CCopySettingsAndCachesComponent *config) { m_copyCachesAndSettings = config; } //! \copydoc QWizardPage::initializePage - virtual void initializePage() override; + void initializePage() override; //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CCopySettingsAndCachesComponent *m_copyCachesAndSettings = nullptr; diff --git a/src/gui/components/coreinfoareacomponent.cpp b/src/gui/components/coreinfoareacomponent.cpp index 8e3bc7ebe..d401599e2 100644 --- a/src/gui/components/coreinfoareacomponent.cpp +++ b/src/gui/components/coreinfoareacomponent.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components toggleTabBarLocked(true); } - CCoreInfoAreaComponent::~CCoreInfoAreaComponent() {} + CCoreInfoAreaComponent::~CCoreInfoAreaComponent() = default; CLogComponent *CCoreInfoAreaComponent::getLogComponent() { return ui->comp_Log; } diff --git a/src/gui/components/coreinfoareacomponent.h b/src/gui/components/coreinfoareacomponent.h index ccf8973e0..97bc63c08 100644 --- a/src/gui/components/coreinfoareacomponent.h +++ b/src/gui/components/coreinfoareacomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CCoreInfoAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CCoreInfoAreaComponent() override; + ~CCoreInfoAreaComponent() override; //! Info areas enum InfoArea @@ -62,10 +62,10 @@ namespace swift::gui::components protected: //! \copydoc CInfoArea::getPreferredSizeWhenFloating - virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; + QSize getPreferredSizeWhenFloating(int areaIndex) const override; //! \copydoc CInfoArea::indexToPixmap - virtual const QPixmap &indexToPixmap(int areaIndex) const override; + const QPixmap &indexToPixmap(int areaIndex) const override; private: QScopedPointer ui; diff --git a/src/gui/components/coresettingsdialog.cpp b/src/gui/components/coresettingsdialog.cpp index 2986faf70..60064bab2 100644 --- a/src/gui/components/coresettingsdialog.cpp +++ b/src/gui/components/coresettingsdialog.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components connect(overview, &QPushButton::released, this, &CCoreSettingsDialog::showOverview); } - CCoreSettingsDialog::~CCoreSettingsDialog() {} + CCoreSettingsDialog::~CCoreSettingsDialog() = default; void CCoreSettingsDialog::showOverview() { ui->comp_SettingsComponent->setSettingsOverviewTab(); } } // namespace swift::gui::components diff --git a/src/gui/components/coresettingsdialog.h b/src/gui/components/coresettingsdialog.h index 764c63d46..a71fbe651 100644 --- a/src/gui/components/coresettingsdialog.h +++ b/src/gui/components/coresettingsdialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CCoreSettingsDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CCoreSettingsDialog(); + ~CCoreSettingsDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/corestatuscomponent.cpp b/src/gui/components/corestatuscomponent.cpp index 2bc1ad95f..9778f2e8b 100644 --- a/src/gui/components/corestatuscomponent.cpp +++ b/src/gui/components/corestatuscomponent.cpp @@ -14,6 +14,6 @@ namespace swift::gui::components ui->setupUi(this); } - CCoreStatusComponent::~CCoreStatusComponent() {} + CCoreStatusComponent::~CCoreStatusComponent() = default; } // namespace swift::gui::components diff --git a/src/gui/components/corestatuscomponent.h b/src/gui/components/corestatuscomponent.h index f0765062d..c05dd6f9d 100644 --- a/src/gui/components/corestatuscomponent.h +++ b/src/gui/components/corestatuscomponent.h @@ -31,7 +31,7 @@ namespace swift::gui::components explicit CCoreStatusComponent(QWidget *parent = nullptr); //! Destructor - ~CCoreStatusComponent(); + ~CCoreStatusComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/countryselector.cpp b/src/gui/components/countryselector.cpp index df3f9b6a9..895d73fce 100644 --- a/src/gui/components/countryselector.cpp +++ b/src/gui/components/countryselector.cpp @@ -31,7 +31,7 @@ namespace swift::gui::components this->onCountriesLoaded(); } - CCountrySelector::~CCountrySelector() {} + CCountrySelector::~CCountrySelector() = default; void CCountrySelector::setCountry(const CCountry &country) { diff --git a/src/gui/components/countryselector.h b/src/gui/components/countryselector.h index a35aec5b7..e7b285a30 100644 --- a/src/gui/components/countryselector.h +++ b/src/gui/components/countryselector.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CCountrySelector(QWidget *parent = nullptr); //! Destructor - virtual ~CCountrySelector(); + ~CCountrySelector() override; //! Set country void setCountry(const swift::misc::CCountry &country); diff --git a/src/gui/components/datainfoareacomponent.cpp b/src/gui/components/datainfoareacomponent.cpp index 1127115d9..55c4919df 100644 --- a/src/gui/components/datainfoareacomponent.cpp +++ b/src/gui/components/datainfoareacomponent.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components this->setTabBarPosition(QTabWidget::North); } - CDataInfoAreaComponent::~CDataInfoAreaComponent() {} + CDataInfoAreaComponent::~CDataInfoAreaComponent() = default; CDbModelComponent *CDataInfoAreaComponent::getModelComponent() const { return ui->comp_DbModels; } diff --git a/src/gui/components/datainfoareacomponent.h b/src/gui/components/datainfoareacomponent.h index 23d4f8fe1..83a3a766a 100644 --- a/src/gui/components/datainfoareacomponent.h +++ b/src/gui/components/datainfoareacomponent.h @@ -57,7 +57,7 @@ namespace swift::gui::components explicit CDataInfoAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDataInfoAreaComponent() override; + ~CDataInfoAreaComponent() override; //! DB model component CDbModelComponent *getModelComponent() const; @@ -95,10 +95,10 @@ namespace swift::gui::components protected: //! \copydoc CInfoArea::getPreferredSizeWhenFloating - virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; + QSize getPreferredSizeWhenFloating(int areaIndex) const override; //! \copydoc CInfoArea::indexToPixmap - virtual const QPixmap &indexToPixmap(int areaIndex) const override; + const QPixmap &indexToPixmap(int areaIndex) const override; private: QScopedPointer ui; diff --git a/src/gui/components/datamaininfoareacomponent.cpp b/src/gui/components/datamaininfoareacomponent.cpp index 45da54171..9d3867272 100644 --- a/src/gui/components/datamaininfoareacomponent.cpp +++ b/src/gui/components/datamaininfoareacomponent.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components ui->comp_Log->showFilterBar(); } - CDataMainInfoAreaComponent::~CDataMainInfoAreaComponent() {} + CDataMainInfoAreaComponent::~CDataMainInfoAreaComponent() = default; CLogComponent *CDataMainInfoAreaComponent::getLogComponent() const { return ui->comp_Log; } diff --git a/src/gui/components/datamaininfoareacomponent.h b/src/gui/components/datamaininfoareacomponent.h index b82ed0a98..2f28f2290 100644 --- a/src/gui/components/datamaininfoareacomponent.h +++ b/src/gui/components/datamaininfoareacomponent.h @@ -50,7 +50,7 @@ namespace swift::gui::components explicit CDataMainInfoAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDataMainInfoAreaComponent() override; + ~CDataMainInfoAreaComponent() override; //! Log component CLogComponent *getLogComponent() const; @@ -73,10 +73,10 @@ namespace swift::gui::components protected: //! \copydoc CInfoArea::getPreferredSizeWhenFloating - virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; + QSize getPreferredSizeWhenFloating(int areaIndex) const override; //! \copydoc CInfoArea::indexToPixmap - virtual const QPixmap &indexToPixmap(int areaIndex) const override; + const QPixmap &indexToPixmap(int areaIndex) const override; private: QScopedPointer ui; diff --git a/src/gui/components/datasettingscomponent.cpp b/src/gui/components/datasettingscomponent.cpp index e6c789699..69c0f3f7b 100644 --- a/src/gui/components/datasettingscomponent.cpp +++ b/src/gui/components/datasettingscomponent.cpp @@ -17,7 +17,7 @@ namespace swift::gui::components ui->comp_GuiSettings->hideOpacity(true); } - CDataSettingsComponent::~CDataSettingsComponent() {} + CDataSettingsComponent::~CDataSettingsComponent() = default; void CDataSettingsComponent::setBackgroundUpdater(const CBackgroundDataUpdater *updater) { diff --git a/src/gui/components/datasettingscomponent.h b/src/gui/components/datasettingscomponent.h index bd13b464d..a00b7e3bc 100644 --- a/src/gui/components/datasettingscomponent.h +++ b/src/gui/components/datasettingscomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CDataSettingsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDataSettingsComponent(); + ~CDataSettingsComponent() override; //! Background updater void setBackgroundUpdater(const swift::core::db::CBackgroundDataUpdater *updater); diff --git a/src/gui/components/dbaircraftcategorycomponent.cpp b/src/gui/components/dbaircraftcategorycomponent.cpp index 940bed500..4147ae448 100644 --- a/src/gui/components/dbaircraftcategorycomponent.cpp +++ b/src/gui/components/dbaircraftcategorycomponent.cpp @@ -38,7 +38,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getAircraftCategoriesCount()); } - CDbAircraftCategoryComponent::~CDbAircraftCategoryComponent() {} + CDbAircraftCategoryComponent::~CDbAircraftCategoryComponent() = default; void CDbAircraftCategoryComponent::onCategoryRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count) diff --git a/src/gui/components/dbaircraftcategorycomponent.h b/src/gui/components/dbaircraftcategorycomponent.h index d0ee069c9..181e465f6 100644 --- a/src/gui/components/dbaircraftcategorycomponent.h +++ b/src/gui/components/dbaircraftcategorycomponent.h @@ -35,7 +35,7 @@ namespace swift::gui::components explicit CDbAircraftCategoryComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAircraftCategoryComponent(); + ~CDbAircraftCategoryComponent() override; private: //! ICAO codes have been read diff --git a/src/gui/components/dbaircrafticaocomponent.cpp b/src/gui/components/dbaircrafticaocomponent.cpp index 12cc51e2b..9cff35193 100644 --- a/src/gui/components/dbaircrafticaocomponent.cpp +++ b/src/gui/components/dbaircrafticaocomponent.cpp @@ -44,7 +44,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getAircraftIcaoCodesCount()); } - CDbAircraftIcaoComponent::~CDbAircraftIcaoComponent() {} + CDbAircraftIcaoComponent::~CDbAircraftIcaoComponent() = default; swift::gui::views::CAircraftIcaoCodeView *CDbAircraftIcaoComponent::view() const { return ui->tvp_AircraftIcao; } diff --git a/src/gui/components/dbaircrafticaocomponent.h b/src/gui/components/dbaircrafticaocomponent.h index 1b34e86c4..9246608a6 100644 --- a/src/gui/components/dbaircrafticaocomponent.h +++ b/src/gui/components/dbaircrafticaocomponent.h @@ -46,7 +46,7 @@ namespace swift::gui explicit CDbAircraftIcaoComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAircraftIcaoComponent() override; + ~CDbAircraftIcaoComponent() override; //! Get the view swift::gui::views::CAircraftIcaoCodeView *view() const; diff --git a/src/gui/components/dbaircrafticaoselectorcomponent.cpp b/src/gui/components/dbaircrafticaoselectorcomponent.cpp index a89c972d8..bb47986ac 100644 --- a/src/gui/components/dbaircrafticaoselectorcomponent.cpp +++ b/src/gui/components/dbaircrafticaoselectorcomponent.cpp @@ -54,7 +54,7 @@ namespace swift::gui::components } } - CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent() {} + CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent() = default; bool CDbAircraftIcaoSelectorComponent::setAircraftIcao(const CAircraftIcaoCode &icao) { diff --git a/src/gui/components/dbaircrafticaoselectorcomponent.h b/src/gui/components/dbaircrafticaoselectorcomponent.h index 061539282..7925e4abb 100644 --- a/src/gui/components/dbaircrafticaoselectorcomponent.h +++ b/src/gui/components/dbaircrafticaoselectorcomponent.h @@ -47,7 +47,7 @@ namespace swift::gui::components explicit CDbAircraftIcaoSelectorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAircraftIcaoSelectorComponent() override; + ~CDbAircraftIcaoSelectorComponent() override; //! Current aircraft ICAO //! \return changed @@ -84,16 +84,16 @@ namespace swift::gui::components protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; private: //! Distributors have been read diff --git a/src/gui/components/dbairlineicaocomponent.cpp b/src/gui/components/dbairlineicaocomponent.cpp index 0c88554db..cfad98dc5 100644 --- a/src/gui/components/dbairlineicaocomponent.cpp +++ b/src/gui/components/dbairlineicaocomponent.cpp @@ -45,7 +45,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getAirlineIcaoCodesCount(), {}); } - CDbAirlineIcaoComponent::~CDbAirlineIcaoComponent() {} + CDbAirlineIcaoComponent::~CDbAirlineIcaoComponent() = default; swift::gui::views::CAirlineIcaoCodeView *CDbAirlineIcaoComponent::view() const { return ui->tvp_AirlineIcao; } diff --git a/src/gui/components/dbairlineicaocomponent.h b/src/gui/components/dbairlineicaocomponent.h index 8ea1584f3..f5c8026bc 100644 --- a/src/gui/components/dbairlineicaocomponent.h +++ b/src/gui/components/dbairlineicaocomponent.h @@ -43,7 +43,7 @@ namespace swift::gui explicit CDbAirlineIcaoComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAirlineIcaoComponent(); + ~CDbAirlineIcaoComponent() override; //! Get the view swift::gui::views::CAirlineIcaoCodeView *view() const; diff --git a/src/gui/components/dbairlineicaoselectorbase.cpp b/src/gui/components/dbairlineicaoselectorbase.cpp index 3ea43da8b..7adf26d4e 100644 --- a/src/gui/components/dbairlineicaoselectorbase.cpp +++ b/src/gui/components/dbairlineicaoselectorbase.cpp @@ -52,7 +52,7 @@ namespace swift::gui::components } } - CDbAirlineIcaoSelectorBase::~CDbAirlineIcaoSelectorBase() {} + CDbAirlineIcaoSelectorBase::~CDbAirlineIcaoSelectorBase() = default; bool CDbAirlineIcaoSelectorBase::setAirlineIcao(const CAirlineIcaoCode &icao) { diff --git a/src/gui/components/dbairlineicaoselectorbase.h b/src/gui/components/dbairlineicaoselectorbase.h index 6ab6c53f3..87d9f1786 100644 --- a/src/gui/components/dbairlineicaoselectorbase.h +++ b/src/gui/components/dbairlineicaoselectorbase.h @@ -34,7 +34,7 @@ namespace swift::gui::components public: //! Destructor - virtual ~CDbAirlineIcaoSelectorBase() override; + ~CDbAirlineIcaoSelectorBase() override; //! Current airline ICAO virtual bool setAirlineIcao(const swift::misc::aviation::CAirlineIcaoCode &icao); @@ -66,16 +66,16 @@ namespace swift::gui::components virtual QCompleter *createCompleter() = 0; //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; QScopedPointer m_completer; //!< completer used swift::misc::aviation::CAirlineIcaoCode m_currentIcao; //!< current ICAO object diff --git a/src/gui/components/dbairlineicaoselectorcomponent.cpp b/src/gui/components/dbairlineicaoselectorcomponent.cpp index 0c1efd373..16685ae68 100644 --- a/src/gui/components/dbairlineicaoselectorcomponent.cpp +++ b/src/gui/components/dbairlineicaoselectorcomponent.cpp @@ -35,7 +35,7 @@ namespace swift::gui::components connect(ui->le_Airline, &QLineEdit::editingFinished, this, &CDbAirlineIcaoSelectorComponent::onDataChanged); } - CDbAirlineIcaoSelectorComponent::~CDbAirlineIcaoSelectorComponent() {} + CDbAirlineIcaoSelectorComponent::~CDbAirlineIcaoSelectorComponent() = default; void CDbAirlineIcaoSelectorComponent::setReadOnly(bool readOnly) { ui->le_Airline->setReadOnly(readOnly); } diff --git a/src/gui/components/dbairlineicaoselectorcomponent.h b/src/gui/components/dbairlineicaoselectorcomponent.h index 0344ed270..740aa0cd9 100644 --- a/src/gui/components/dbairlineicaoselectorcomponent.h +++ b/src/gui/components/dbairlineicaoselectorcomponent.h @@ -43,13 +43,13 @@ namespace swift::gui::components //! Destructor //! \note needed for forward declared QScopedPointer and needs to be in .cpp - virtual ~CDbAirlineIcaoSelectorComponent() override; + ~CDbAirlineIcaoSelectorComponent() override; //! \name Base class overrides //! @{ - virtual void setReadOnly(bool readOnly) override; - virtual bool setAirlineIcao(const swift::misc::aviation::CAirlineIcaoCode &icao) override; - virtual void clear() override; + void setReadOnly(bool readOnly) override; + bool setAirlineIcao(const swift::misc::aviation::CAirlineIcaoCode &icao) override; + void clear() override; //! @} //! Raw text designator @@ -63,7 +63,7 @@ namespace swift::gui::components protected: //! \copydoc CDbAirlineIcaoSelectorBase::createCompleter - virtual QCompleter *createCompleter() override; + QCompleter *createCompleter() override; private: //! Get the completer strings diff --git a/src/gui/components/dbairlinenameselectorcomponent.cpp b/src/gui/components/dbairlinenameselectorcomponent.cpp index 87de02469..ea749697c 100644 --- a/src/gui/components/dbairlinenameselectorcomponent.cpp +++ b/src/gui/components/dbairlinenameselectorcomponent.cpp @@ -32,10 +32,7 @@ namespace swift::gui::components &CDbAirlineNameSelectorComponent::ps_dataChanged); } - CDbAirlineNameSelectorComponent::~CDbAirlineNameSelectorComponent() - { - // no inline destructor, read QScopedPointer Forward Declared Pointers - } + CDbAirlineNameSelectorComponent::~CDbAirlineNameSelectorComponent() = default; bool CDbAirlineNameSelectorComponent::setAirlineIcao(const CAirlineIcaoCode &icao) { diff --git a/src/gui/components/dbairlinenameselectorcomponent.h b/src/gui/components/dbairlinenameselectorcomponent.h index 5a8046d42..877651ca1 100644 --- a/src/gui/components/dbairlinenameselectorcomponent.h +++ b/src/gui/components/dbairlinenameselectorcomponent.h @@ -35,18 +35,18 @@ namespace swift::gui::components //! Destructor //! \note needed for forward declared QScopedPointer and needs to be in .cpp - virtual ~CDbAirlineNameSelectorComponent() override; + ~CDbAirlineNameSelectorComponent() override; //! \name Base class overrides //! @{ - virtual void setReadOnly(bool readOnly) override; - virtual bool setAirlineIcao(const swift::misc::aviation::CAirlineIcaoCode &icao) override; - virtual void clear() override; + void setReadOnly(bool readOnly) override; + bool setAirlineIcao(const swift::misc::aviation::CAirlineIcaoCode &icao) override; + void clear() override; //! @} protected: //! \copydoc CDbAirlineIcaoSelectorBase::createCompleter - virtual QCompleter *createCompleter() override; + QCompleter *createCompleter() override; private: QScopedPointer ui; diff --git a/src/gui/components/dbautosimulatorstashingcomponent.cpp b/src/gui/components/dbautosimulatorstashingcomponent.cpp index e0abfa23c..56c9442a2 100644 --- a/src/gui/components/dbautosimulatorstashingcomponent.cpp +++ b/src/gui/components/dbautosimulatorstashingcomponent.cpp @@ -61,7 +61,7 @@ namespace swift::gui::components } } - CDbAutoSimulatorStashingComponent::~CDbAutoSimulatorStashingComponent() {} + CDbAutoSimulatorStashingComponent::~CDbAutoSimulatorStashingComponent() = default; void CDbAutoSimulatorStashingComponent::updateProgressIndicator(int percent) { diff --git a/src/gui/components/dbautosimulatorstashingcomponent.h b/src/gui/components/dbautosimulatorstashingcomponent.h index dc9b5df4b..dfcfdaba1 100644 --- a/src/gui/components/dbautosimulatorstashingcomponent.h +++ b/src/gui/components/dbautosimulatorstashingcomponent.h @@ -47,20 +47,20 @@ namespace swift::gui::components explicit CDbAutoSimulatorStashingComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAutoSimulatorStashingComponent() override; + ~CDbAutoSimulatorStashingComponent() override; //! At least run once and completed bool isCompleted() const { return m_state == Completed; } //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator - virtual void updateProgressIndicator(int percent) override; + void updateProgressIndicator(int percent) override; public slots: //! \copydoc QDialog::accept - virtual void accept() override; + void accept() override; //! \copydoc QDialog::exec - virtual int exec() override; + int exec() override; private: //! Init the GUI diff --git a/src/gui/components/dbautostashingcomponent.cpp b/src/gui/components/dbautostashingcomponent.cpp index 5c21680a3..fe449f5ca 100644 --- a/src/gui/components/dbautostashingcomponent.cpp +++ b/src/gui/components/dbautostashingcomponent.cpp @@ -62,7 +62,7 @@ namespace swift::gui::components this->resetDescription(); } - CDbAutoStashingComponent::~CDbAutoStashingComponent() {} + CDbAutoStashingComponent::~CDbAutoStashingComponent() = default; void CDbAutoStashingComponent::accept() { diff --git a/src/gui/components/dbautostashingcomponent.h b/src/gui/components/dbautostashingcomponent.h index 5b1671bd7..40aaf053c 100644 --- a/src/gui/components/dbautostashingcomponent.h +++ b/src/gui/components/dbautostashingcomponent.h @@ -64,20 +64,20 @@ namespace swift::gui explicit CDbAutoStashingComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbAutoStashingComponent() override; + ~CDbAutoStashingComponent() override; //! At least run once and completed bool isCompleted() const { return m_state == Completed; } //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator - virtual void updateProgressIndicator(int percent) override; + void updateProgressIndicator(int percent) override; public slots: //! \copydoc QDialog::accept - virtual void accept() override; + void accept() override; //! \copydoc QDialog::exec - virtual int exec() override; + int exec() override; //! Show last result void showLastResults(); diff --git a/src/gui/components/dbcountrycomponent.cpp b/src/gui/components/dbcountrycomponent.cpp index b7a609df7..5daceb1b2 100644 --- a/src/gui/components/dbcountrycomponent.cpp +++ b/src/gui/components/dbcountrycomponent.cpp @@ -37,7 +37,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getCountriesCount(), {}); } - CDbCountryComponent::~CDbCountryComponent() {} + CDbCountryComponent::~CDbCountryComponent() = default; void CDbCountryComponent::onCountriesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count, const QUrl &url) diff --git a/src/gui/components/dbcountrycomponent.h b/src/gui/components/dbcountrycomponent.h index 883ea42f9..55773a1ac 100644 --- a/src/gui/components/dbcountrycomponent.h +++ b/src/gui/components/dbcountrycomponent.h @@ -38,7 +38,7 @@ namespace swift::gui::components explicit CDbCountryComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbCountryComponent() override; + ~CDbCountryComponent() override; private: //! Countries have been read diff --git a/src/gui/components/dbcountryselectorcomponent.cpp b/src/gui/components/dbcountryselectorcomponent.cpp index c51819e55..71bd9dbd6 100644 --- a/src/gui/components/dbcountryselectorcomponent.cpp +++ b/src/gui/components/dbcountryselectorcomponent.cpp @@ -51,7 +51,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getCountriesCount()); } - CDbCountrySelectorComponent::~CDbCountrySelectorComponent() {} + CDbCountrySelectorComponent::~CDbCountrySelectorComponent() = default; void CDbCountrySelectorComponent::setCountry(const swift::misc::CCountry &country) { diff --git a/src/gui/components/dbcountryselectorcomponent.h b/src/gui/components/dbcountryselectorcomponent.h index 89f9c058c..1fbdf2248 100644 --- a/src/gui/components/dbcountryselectorcomponent.h +++ b/src/gui/components/dbcountryselectorcomponent.h @@ -67,16 +67,16 @@ namespace swift::gui::components protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; private: //! Countries have been read diff --git a/src/gui/components/dbdistributorcomponent.cpp b/src/gui/components/dbdistributorcomponent.cpp index 35442b7b2..3c92f0d66 100644 --- a/src/gui/components/dbdistributorcomponent.cpp +++ b/src/gui/components/dbdistributorcomponent.cpp @@ -45,7 +45,7 @@ namespace swift::gui::components } } - CDbDistributorComponent::~CDbDistributorComponent() {} + CDbDistributorComponent::~CDbDistributorComponent() = default; CDistributorView *CDbDistributorComponent::view() const { return ui->tvp_Distributors; } diff --git a/src/gui/components/dbdistributorcomponent.h b/src/gui/components/dbdistributorcomponent.h index 8f5805683..3e46743ae 100644 --- a/src/gui/components/dbdistributorcomponent.h +++ b/src/gui/components/dbdistributorcomponent.h @@ -47,7 +47,7 @@ namespace swift::gui explicit CDbDistributorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbDistributorComponent() override; + ~CDbDistributorComponent() override; //! Get the view swift::gui::views::CDistributorView *view() const; diff --git a/src/gui/components/dbdistributorselectorcomponent.cpp b/src/gui/components/dbdistributorselectorcomponent.cpp index e06495989..f91c62c1b 100644 --- a/src/gui/components/dbdistributorselectorcomponent.cpp +++ b/src/gui/components/dbdistributorselectorcomponent.cpp @@ -59,10 +59,7 @@ namespace swift::gui::components sApp->getWebDataServices()->getDistributorsCount()); } - CDbDistributorSelectorComponent::~CDbDistributorSelectorComponent() - { - // void - } + CDbDistributorSelectorComponent::~CDbDistributorSelectorComponent() = default; void CDbDistributorSelectorComponent::setDistributor(const CDistributor &distributor) { diff --git a/src/gui/components/dbdistributorselectorcomponent.h b/src/gui/components/dbdistributorselectorcomponent.h index 5bdc9a46f..9f5d94874 100644 --- a/src/gui/components/dbdistributorselectorcomponent.h +++ b/src/gui/components/dbdistributorselectorcomponent.h @@ -42,7 +42,7 @@ namespace swift::gui::components explicit CDbDistributorSelectorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbDistributorSelectorComponent() override; + ~CDbDistributorSelectorComponent() override; //! Current distributor void setDistributor(const swift::misc::simulation::CDistributor &distributor); @@ -71,16 +71,16 @@ namespace swift::gui::components protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; private: //! Distributors have been read diff --git a/src/gui/components/dbliverycolorsearch.cpp b/src/gui/components/dbliverycolorsearch.cpp index 269eccb23..7ac2cbff5 100644 --- a/src/gui/components/dbliverycolorsearch.cpp +++ b/src/gui/components/dbliverycolorsearch.cpp @@ -20,7 +20,7 @@ namespace swift::gui::components this->setFocusProxy(ui->comp_FuselageSelector); } - CDbLiveryColorSearch::~CDbLiveryColorSearch() {} + CDbLiveryColorSearch::~CDbLiveryColorSearch() = default; CLivery CDbLiveryColorSearch::getLivery() const { diff --git a/src/gui/components/dbliverycolorsearch.h b/src/gui/components/dbliverycolorsearch.h index d747218aa..f03167dda 100644 --- a/src/gui/components/dbliverycolorsearch.h +++ b/src/gui/components/dbliverycolorsearch.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CDbLiveryColorSearch(QWidget *parent = nullptr); //! Destructor - ~CDbLiveryColorSearch(); + ~CDbLiveryColorSearch() override; //! Found livery if any, otherwise default swift::misc::aviation::CLivery getLivery() const; diff --git a/src/gui/components/dbliverycolorsearchdialog.cpp b/src/gui/components/dbliverycolorsearchdialog.cpp index 4403a844f..852162dcd 100644 --- a/src/gui/components/dbliverycolorsearchdialog.cpp +++ b/src/gui/components/dbliverycolorsearchdialog.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components connect(this, &CDbLiveryColorSearchDialog::accepted, this, &CDbLiveryColorSearchDialog::onAccepted); } - CDbLiveryColorSearchDialog::~CDbLiveryColorSearchDialog() {} + CDbLiveryColorSearchDialog::~CDbLiveryColorSearchDialog() = default; const CLivery &CDbLiveryColorSearchDialog::getLivery() const { return m_foundLivery; } diff --git a/src/gui/components/dbliverycolorsearchdialog.h b/src/gui/components/dbliverycolorsearchdialog.h index eba1aab55..d90dd94d9 100644 --- a/src/gui/components/dbliverycolorsearchdialog.h +++ b/src/gui/components/dbliverycolorsearchdialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CDbLiveryColorSearchDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLiveryColorSearchDialog(); + ~CDbLiveryColorSearchDialog() override; //! Found livery if any, otherwise default const swift::misc::aviation::CLivery &getLivery() const; diff --git a/src/gui/components/dbliverycomponent.cpp b/src/gui/components/dbliverycomponent.cpp index 17f26e8ea..95e3b25e0 100644 --- a/src/gui/components/dbliverycomponent.cpp +++ b/src/gui/components/dbliverycomponent.cpp @@ -40,7 +40,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getLiveriesCount()); } - CDbLiveryComponent::~CDbLiveryComponent() {} + CDbLiveryComponent::~CDbLiveryComponent() = default; CLiveryView *CDbLiveryComponent::view() { return ui->tvp_Liveries; } diff --git a/src/gui/components/dbliverycomponent.h b/src/gui/components/dbliverycomponent.h index e9fee75ad..a62034eb8 100644 --- a/src/gui/components/dbliverycomponent.h +++ b/src/gui/components/dbliverycomponent.h @@ -48,7 +48,7 @@ namespace swift::gui explicit CDbLiveryComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLiveryComponent(); + ~CDbLiveryComponent() override; //! The livery view swift::gui::views::CLiveryView *view(); diff --git a/src/gui/components/dbliveryselectorcomponent.cpp b/src/gui/components/dbliveryselectorcomponent.cpp index 076e74309..c988d2b5a 100644 --- a/src/gui/components/dbliveryselectorcomponent.cpp +++ b/src/gui/components/dbliveryselectorcomponent.cpp @@ -55,10 +55,7 @@ namespace swift::gui::components sGui->getWebDataServices()->getLiveriesCount(), {}); } - CDbLiverySelectorComponent::~CDbLiverySelectorComponent() - { - // void - } + CDbLiverySelectorComponent::~CDbLiverySelectorComponent() = default; void CDbLiverySelectorComponent::setLivery(const CLivery &livery) { diff --git a/src/gui/components/dbliveryselectorcomponent.h b/src/gui/components/dbliveryselectorcomponent.h index 291d5b172..20a6fa372 100644 --- a/src/gui/components/dbliveryselectorcomponent.h +++ b/src/gui/components/dbliveryselectorcomponent.h @@ -43,7 +43,7 @@ namespace swift::gui::components explicit CDbLiverySelectorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLiverySelectorComponent(); + ~CDbLiverySelectorComponent() override; //! Current livery void setLivery(const swift::misc::aviation::CLivery &livery); @@ -75,16 +75,16 @@ namespace swift::gui::components protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; private: //! Data have been changed diff --git a/src/gui/components/dbloaddatadialog.cpp b/src/gui/components/dbloaddatadialog.cpp index 3376e2c13..d87b3a0c5 100644 --- a/src/gui/components/dbloaddatadialog.cpp +++ b/src/gui/components/dbloaddatadialog.cpp @@ -46,7 +46,7 @@ namespace swift::gui::components connect(this, &CDbLoadDataDialog::rejected, this, &CDbLoadDataDialog::onRejected); } - CDbLoadDataDialog::~CDbLoadDataDialog() {} + CDbLoadDataDialog::~CDbLoadDataDialog() = default; bool CDbLoadDataDialog::newerOrEmptyEntitiesDetected(CEntityFlags::Entity loadEntities) { diff --git a/src/gui/components/dbloaddatadialog.h b/src/gui/components/dbloaddatadialog.h index 10f90b957..c4e515c89 100644 --- a/src/gui/components/dbloaddatadialog.h +++ b/src/gui/components/dbloaddatadialog.h @@ -34,7 +34,7 @@ namespace swift::gui::components explicit CDbLoadDataDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLoadDataDialog(); + ~CDbLoadDataDialog() override; //! Newer or empty entities detected bool newerOrEmptyEntitiesDetected(swift::misc::network::CEntityFlags::Entity loadEntities); diff --git a/src/gui/components/dbloadoverviewcomponent.cpp b/src/gui/components/dbloadoverviewcomponent.cpp index 746a43fa7..eb935263b 100644 --- a/src/gui/components/dbloadoverviewcomponent.cpp +++ b/src/gui/components/dbloadoverviewcomponent.cpp @@ -84,7 +84,7 @@ namespace swift::gui::components } } - CDbLoadOverviewComponent::~CDbLoadOverviewComponent() {} + CDbLoadOverviewComponent::~CDbLoadOverviewComponent() = default; void CDbLoadOverviewComponent::display() { m_dsTriggerGuiUpdate.inputSignal(); } diff --git a/src/gui/components/dbloadoverviewcomponent.h b/src/gui/components/dbloadoverviewcomponent.h index 55856a81c..f79511bb0 100644 --- a/src/gui/components/dbloadoverviewcomponent.h +++ b/src/gui/components/dbloadoverviewcomponent.h @@ -32,7 +32,7 @@ namespace swift::gui::components explicit CDbLoadOverviewComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLoadOverviewComponent() override; + ~CDbLoadOverviewComponent() override; //! Initialize void display(); @@ -60,7 +60,7 @@ namespace swift::gui::components protected: //! \copydoc QWidget::resizeEvent - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; private: QScopedPointer ui; diff --git a/src/gui/components/dblogincomponent.cpp b/src/gui/components/dblogincomponent.cpp index d640d3aa2..89f7deac1 100644 --- a/src/gui/components/dblogincomponent.cpp +++ b/src/gui/components/dblogincomponent.cpp @@ -72,7 +72,7 @@ namespace swift::gui::components this->setUserInfo(this->getDbUser()); } - CDbLoginComponent::~CDbLoginComponent() {} + CDbLoginComponent::~CDbLoginComponent() = default; CAuthenticatedUser CDbLoginComponent::getDbUser() const { return m_loginService.getDbUser(); } diff --git a/src/gui/components/dblogincomponent.h b/src/gui/components/dblogincomponent.h index 72eda3871..f31a0e081 100644 --- a/src/gui/components/dblogincomponent.h +++ b/src/gui/components/dblogincomponent.h @@ -39,7 +39,7 @@ namespace swift::gui::components explicit CDbLoginComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbLoginComponent() override; + ~CDbLoginComponent() override; //! DB user swift::misc::network::CAuthenticatedUser getDbUser() const; diff --git a/src/gui/components/dbmappingcomponent.h b/src/gui/components/dbmappingcomponent.h index 85e416c85..4889be02c 100644 --- a/src/gui/components/dbmappingcomponent.h +++ b/src/gui/components/dbmappingcomponent.h @@ -87,7 +87,7 @@ namespace swift::gui explicit CDbMappingComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbMappingComponent() override; + ~CDbMappingComponent() override; //! Graceful shutdown void gracefulShutdown(); @@ -375,7 +375,7 @@ namespace swift::gui CMappingVPilotMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent) {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Mapping component @@ -398,7 +398,7 @@ namespace swift::gui CStashToolsMenu(CDbMappingComponent *mappingComponent); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Mapping component @@ -421,7 +421,7 @@ namespace swift::gui COwnModelSetMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent) {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Mapping component @@ -439,7 +439,7 @@ namespace swift::gui CRemovedModelsMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent) {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Mapping component @@ -457,7 +457,7 @@ namespace swift::gui CApplyDbDataMenu(CDbMappingComponent *mappingComponent) : menus::IMenuDelegate(mappingComponent) {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Mapping component @@ -476,7 +476,7 @@ namespace swift::gui CMergeWithVPilotMenu(CDbMappingComponent *mappingComponent); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; //! Mapping component CDbMappingComponent *mappingComponent() const; diff --git a/src/gui/components/dbmappingcomponentaware.h b/src/gui/components/dbmappingcomponentaware.h index dee6baabe..9ba1560e7 100644 --- a/src/gui/components/dbmappingcomponentaware.h +++ b/src/gui/components/dbmappingcomponentaware.h @@ -30,7 +30,7 @@ namespace swift::gui::components CDbMappingComponentAware(QObject *parent); //! Destructor - virtual ~CDbMappingComponentAware() {} + virtual ~CDbMappingComponentAware() = default; //! Copy constructor CDbMappingComponentAware(const CDbMappingComponentAware &) = default; diff --git a/src/gui/components/dbmodelcomponent.cpp b/src/gui/components/dbmodelcomponent.cpp index fb28874d5..417053de6 100644 --- a/src/gui/components/dbmodelcomponent.cpp +++ b/src/gui/components/dbmodelcomponent.cpp @@ -56,10 +56,7 @@ namespace swift::gui::components sApp->getWebDataServices()->getModelsCount(), {}); } - CDbModelComponent::~CDbModelComponent() - { - // void - } + CDbModelComponent::~CDbModelComponent() = default; bool CDbModelComponent::hasModels() const { return !ui->tvp_AircraftModel->isEmpty(); } diff --git a/src/gui/components/dbmodelcomponent.h b/src/gui/components/dbmodelcomponent.h index bfae32819..3070554bb 100644 --- a/src/gui/components/dbmodelcomponent.h +++ b/src/gui/components/dbmodelcomponent.h @@ -40,7 +40,7 @@ namespace swift::gui::components explicit CDbModelComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbModelComponent(); + ~CDbModelComponent() override; //! Get latest model if any swift::misc::simulation::CAircraftModel getLatestModel() const; diff --git a/src/gui/components/dbmodelmappingmodifydialog.cpp b/src/gui/components/dbmodelmappingmodifydialog.cpp index 7f54351a8..4685b4dfb 100644 --- a/src/gui/components/dbmodelmappingmodifydialog.cpp +++ b/src/gui/components/dbmodelmappingmodifydialog.cpp @@ -21,10 +21,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CDbModelMappingModifyDialog::~CDbModelMappingModifyDialog() - { - // void - } + CDbModelMappingModifyDialog::~CDbModelMappingModifyDialog() = default; CPropertyIndexVariantMap CDbModelMappingModifyDialog::getValues() const { diff --git a/src/gui/components/dbmodelmappingmodifydialog.h b/src/gui/components/dbmodelmappingmodifydialog.h index 097fbbedd..f223c3595 100644 --- a/src/gui/components/dbmodelmappingmodifydialog.h +++ b/src/gui/components/dbmodelmappingmodifydialog.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CDbModelMappingModifyDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbModelMappingModifyDialog(); + ~CDbModelMappingModifyDialog() override; //! Get the values swift::misc::CPropertyIndexVariantMap getValues() const; diff --git a/src/gui/components/dbmodelworkbenchcomponent.cpp b/src/gui/components/dbmodelworkbenchcomponent.cpp index 2c804ad3d..499b47394 100644 --- a/src/gui/components/dbmodelworkbenchcomponent.cpp +++ b/src/gui/components/dbmodelworkbenchcomponent.cpp @@ -50,10 +50,7 @@ namespace swift::gui::components ui->tvp_Models->setCustomMenu(new CConsolidateWithDbDataMenu(ui->tvp_Models, this)); } - CDbModelWorkbenchComponent::~CDbModelWorkbenchComponent() - { - // void - } + CDbModelWorkbenchComponent::~CDbModelWorkbenchComponent() = default; const QStringList &CDbModelWorkbenchComponent::getLogCategories() { diff --git a/src/gui/components/dbmodelworkbenchcomponent.h b/src/gui/components/dbmodelworkbenchcomponent.h index 6c3192e42..b5b56514b 100644 --- a/src/gui/components/dbmodelworkbenchcomponent.h +++ b/src/gui/components/dbmodelworkbenchcomponent.h @@ -59,7 +59,7 @@ namespace swift::gui explicit CDbModelWorkbenchComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbModelWorkbenchComponent() override; + ~CDbModelWorkbenchComponent() override; //! Log categories static const QStringList &getLogCategories(); @@ -84,18 +84,18 @@ namespace swift::gui //! \name Implementations of the models interfaces //! @{ - virtual void setModels(const swift::misc::simulation::CAircraftModelList &models) override + void setModels(const swift::misc::simulation::CAircraftModelList &models) override { this->setModelsForSimulator(models, swift::misc::simulation::CSimulatorInfo()); } - virtual void setModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, - const swift::misc::simulation::CSimulatorInfo &simulator) override; - virtual int updateModels(const swift::misc::simulation::CAircraftModelList &models) override + void setModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, + const swift::misc::simulation::CSimulatorInfo &simulator) override; + int updateModels(const swift::misc::simulation::CAircraftModelList &models) override { return this->updateModelsForSimulator(models, swift::misc::simulation::CSimulatorInfo()); } - virtual int updateModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, - const swift::misc::simulation::CSimulatorInfo &simulator) override; + int updateModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, + const swift::misc::simulation::CSimulatorInfo &simulator) override; //! @} private: diff --git a/src/gui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp index 1a24f7f47..ba55a51d0 100644 --- a/src/gui/components/dbownmodelscomponent.cpp +++ b/src/gui/components/dbownmodelscomponent.cpp @@ -97,10 +97,7 @@ namespace swift::gui::components ui->tvp_OwnAircraftModels->setCustomMenu(new CConsolidateWithDbDataMenu(ui->tvp_OwnAircraftModels, this)); } - CDbOwnModelsComponent::~CDbOwnModelsComponent() - { - // void - } + CDbOwnModelsComponent::~CDbOwnModelsComponent() = default; const QStringList &CDbOwnModelsComponent::getLogCategories() { diff --git a/src/gui/components/dbownmodelscomponent.h b/src/gui/components/dbownmodelscomponent.h index b47051350..22f099d5b 100644 --- a/src/gui/components/dbownmodelscomponent.h +++ b/src/gui/components/dbownmodelscomponent.h @@ -71,7 +71,7 @@ namespace swift::gui explicit CDbOwnModelsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbOwnModelsComponent() override; + ~CDbOwnModelsComponent() override; //! Log categories static const QStringList &getLogCategories(); @@ -131,18 +131,18 @@ namespace swift::gui //! \name Implementations of the models interfaces //! @{ - virtual void setModels(const swift::misc::simulation::CAircraftModelList &models) override + void setModels(const swift::misc::simulation::CAircraftModelList &models) override { this->setModelsForSimulator(models, this->getOwnModelsSimulator()); } - virtual void setModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, - const swift::misc::simulation::CSimulatorInfo &simulator) override; - virtual int updateModels(const swift::misc::simulation::CAircraftModelList &models) override + void setModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, + const swift::misc::simulation::CSimulatorInfo &simulator) override; + int updateModels(const swift::misc::simulation::CAircraftModelList &models) override { return this->updateModelsForSimulator(models, this->getOwnModelsSimulator()); } - virtual int updateModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, - const swift::misc::simulation::CSimulatorInfo &simulator) override; + int updateModelsForSimulator(const swift::misc::simulation::CAircraftModelList &models, + const swift::misc::simulation::CSimulatorInfo &simulator) override; //! @} signals: @@ -240,7 +240,7 @@ namespace swift::gui {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: QAction *m_csl2xsbAction = nullptr; //!< run csl2xsb script diff --git a/src/gui/components/dbownmodelsdialog.cpp b/src/gui/components/dbownmodelsdialog.cpp index 48a1719b2..ed52b3bfe 100644 --- a/src/gui/components/dbownmodelsdialog.cpp +++ b/src/gui/components/dbownmodelsdialog.cpp @@ -20,7 +20,7 @@ namespace swift::gui::components &CDbOwnModelsDialog::successfullyLoadedModels); } - CDbOwnModelsDialog::~CDbOwnModelsDialog() {} + CDbOwnModelsDialog::~CDbOwnModelsDialog() = default; void CDbOwnModelsDialog::setSimulator(const CSimulatorInfo &simulator) { diff --git a/src/gui/components/dbownmodelsdialog.h b/src/gui/components/dbownmodelsdialog.h index 3f62cce87..232301e75 100644 --- a/src/gui/components/dbownmodelsdialog.h +++ b/src/gui/components/dbownmodelsdialog.h @@ -30,7 +30,7 @@ namespace swift::gui::components explicit CDbOwnModelsDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbOwnModelsDialog() override; + ~CDbOwnModelsDialog() override; //! \copydoc CDbOwnModelsComponent::setSimulator void setSimulator(const swift::misc::simulation::CSimulatorInfo &simulator); diff --git a/src/gui/components/dbownmodelsetcomponent.cpp b/src/gui/components/dbownmodelsetcomponent.cpp index 4c39cb7f0..d158ecf95 100644 --- a/src/gui/components/dbownmodelsetcomponent.cpp +++ b/src/gui/components/dbownmodelsetcomponent.cpp @@ -107,10 +107,7 @@ namespace swift::gui::components this->triggerSetSimulatorDeferred(simulator); } - CDbOwnModelSetComponent::~CDbOwnModelSetComponent() - { - // void - } + CDbOwnModelSetComponent::~CDbOwnModelSetComponent() = default; views::CAircraftModelView *CDbOwnModelSetComponent::view() const { return ui->tvp_OwnModelSet; } diff --git a/src/gui/components/dbownmodelsetcomponent.h b/src/gui/components/dbownmodelsetcomponent.h index 827cd7440..494dbe63b 100644 --- a/src/gui/components/dbownmodelsetcomponent.h +++ b/src/gui/components/dbownmodelsetcomponent.h @@ -75,7 +75,7 @@ namespace swift::gui explicit CDbOwnModelSetComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbOwnModelSetComponent() override; + ~CDbOwnModelSetComponent() override; //! Corresponding view views::CAircraftModelView *view() const; @@ -118,22 +118,22 @@ namespace swift::gui void setSimulatorSelectorMode(CSimulatorSelector::Mode mode); //! \copydoc CDbMappingComponentAware::setMappingComponent - virtual void setMappingComponent(CDbMappingComponent *component) override; + void setMappingComponent(CDbMappingComponent *component) override; //! Model set is for simulator swift::misc::simulation::CSimulatorInfo getModelSetSimulator() const { return m_simulator; } //! \name Implementations of the models interfaces //! @{ - virtual void setModels(const swift::misc::simulation::CAircraftModelList &models) override + void setModels(const swift::misc::simulation::CAircraftModelList &models) override { this->setModelSet(models, this->getModelSetSimulator()); } - virtual int updateModels(const swift::misc::simulation::CAircraftModelList &models) override + int updateModels(const swift::misc::simulation::CAircraftModelList &models) override { return this->replaceOrAddModelSet(models, this->getModelSetSimulator()); } - virtual swift::misc::simulation::CSimulatorInfo getSelectedSimulator() const override + swift::misc::simulation::CSimulatorInfo getSelectedSimulator() const override { return this->getModelSetSimulator(); } @@ -235,7 +235,7 @@ namespace swift::gui {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override; + void customMenu(swift::gui::menus::CMenuActions &menuActions) override; private: QList m_setActions; diff --git a/src/gui/components/dbownmodelsetdialog.cpp b/src/gui/components/dbownmodelsetdialog.cpp index c635fb550..c89111ef3 100644 --- a/src/gui/components/dbownmodelsetdialog.cpp +++ b/src/gui/components/dbownmodelsetdialog.cpp @@ -16,7 +16,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CDbOwnModelSetDialog::~CDbOwnModelSetDialog() {} + CDbOwnModelSetDialog::~CDbOwnModelSetDialog() = default; void CDbOwnModelSetDialog::setSimulator(const CSimulatorInfo &simulator) { diff --git a/src/gui/components/dbownmodelsetdialog.h b/src/gui/components/dbownmodelsetdialog.h index d8fe5374e..42a433b92 100644 --- a/src/gui/components/dbownmodelsetdialog.h +++ b/src/gui/components/dbownmodelsetdialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CDbOwnModelSetDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbOwnModelSetDialog() override; + ~CDbOwnModelSetDialog() override; //! \copydoc CDbOwnModelSetComponent::setSimulator void setSimulator(const swift::misc::simulation::CSimulatorInfo &simulator); diff --git a/src/gui/components/dbownmodelsetformdialog.cpp b/src/gui/components/dbownmodelsetformdialog.cpp index d5ac96d4b..d071c60c0 100644 --- a/src/gui/components/dbownmodelsetformdialog.cpp +++ b/src/gui/components/dbownmodelsetformdialog.cpp @@ -40,10 +40,7 @@ namespace swift::gui::components &CDbOwnModelSetFormDialog::simulatorChanged); } - CDbOwnModelSetFormDialog::~CDbOwnModelSetFormDialog() - { - // void - } + CDbOwnModelSetFormDialog::~CDbOwnModelSetFormDialog() = default; void CDbOwnModelSetFormDialog::reloadData() { diff --git a/src/gui/components/dbownmodelsetformdialog.h b/src/gui/components/dbownmodelsetformdialog.h index 02efb65c2..8a53d52c4 100644 --- a/src/gui/components/dbownmodelsetformdialog.h +++ b/src/gui/components/dbownmodelsetformdialog.h @@ -39,7 +39,7 @@ namespace swift::gui::components explicit CDbOwnModelSetFormDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDbOwnModelSetFormDialog() override; + ~CDbOwnModelSetFormDialog() override; //! Last build set const swift::misc::simulation::CAircraftModelList &getModelSet() const { return m_modelSet; } @@ -54,7 +54,7 @@ namespace swift::gui::components void reloadData(); //! Exec and display simulator - virtual int exec() override; + int exec() override; private: QScopedPointer ui; diff --git a/src/gui/components/dbquickmappingwizard.cpp b/src/gui/components/dbquickmappingwizard.cpp index b9c0257a6..ccf5e4091 100644 --- a/src/gui/components/dbquickmappingwizard.cpp +++ b/src/gui/components/dbquickmappingwizard.cpp @@ -67,7 +67,7 @@ namespace swift::gui::components this->onWebDataRead(); } - CDbQuickMappingWizard::~CDbQuickMappingWizard() {} + CDbQuickMappingWizard::~CDbQuickMappingWizard() = default; const QStringList &CDbQuickMappingWizard::getLogCategories() { diff --git a/src/gui/components/dbreducemodelduplicates.cpp b/src/gui/components/dbreducemodelduplicates.cpp index ec14d0874..6587f6a12 100644 --- a/src/gui/components/dbreducemodelduplicates.cpp +++ b/src/gui/components/dbreducemodelduplicates.cpp @@ -37,7 +37,7 @@ namespace swift::gui::components connect(this, &QDialog::finished, this, &CDbReduceModelDuplicates::stop); } - CDbReduceModelDuplicates::~CDbReduceModelDuplicates() {} + CDbReduceModelDuplicates::~CDbReduceModelDuplicates() = default; void CDbReduceModelDuplicates::setModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) { diff --git a/src/gui/components/dbreducemodelduplicates.h b/src/gui/components/dbreducemodelduplicates.h index 406dbaf3d..2a96258d5 100644 --- a/src/gui/components/dbreducemodelduplicates.h +++ b/src/gui/components/dbreducemodelduplicates.h @@ -30,7 +30,7 @@ namespace swift::gui::components explicit CDbReduceModelDuplicates(QWidget *parent = nullptr); //! Destructor - virtual ~CDbReduceModelDuplicates() override; + ~CDbReduceModelDuplicates() override; //! Set the models void setModels(const swift::misc::simulation::CAircraftModelList &models, @@ -40,7 +40,7 @@ namespace swift::gui::components void process(); //! \copydoc swift::core::IProgressIndicator::updateProgressIndicator - virtual void updateProgressIndicator(int percentage) override; + void updateProgressIndicator(int percentage) override; //! The models to be removed const swift::misc::simulation::CAircraftModelList &getRemoveCandidates() const { return m_removeCandidates; } diff --git a/src/gui/components/dbstashcomponent.cpp b/src/gui/components/dbstashcomponent.cpp index c1996bf6a..4876f48de 100644 --- a/src/gui/components/dbstashcomponent.cpp +++ b/src/gui/components/dbstashcomponent.cpp @@ -80,7 +80,7 @@ namespace swift::gui::components this->onUserChanged(); } - CDbStashComponent::~CDbStashComponent() {} + CDbStashComponent::~CDbStashComponent() = default; CStatusMessage CDbStashComponent::validateStashModel(const CAircraftModel &model, bool allowReplace) const { diff --git a/src/gui/components/dbstashcomponent.h b/src/gui/components/dbstashcomponent.h index d35709b39..5f8898791 100644 --- a/src/gui/components/dbstashcomponent.h +++ b/src/gui/components/dbstashcomponent.h @@ -69,7 +69,7 @@ namespace swift::gui explicit CDbStashComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDbStashComponent(); + ~CDbStashComponent() override; //! Test the given model if it can be stashed swift::misc::CStatusMessage validateStashModel(const swift::misc::simulation::CAircraftModel &model, diff --git a/src/gui/components/dbusserveraddressselector.cpp b/src/gui/components/dbusserveraddressselector.cpp index cb85c30a9..81306db57 100644 --- a/src/gui/components/dbusserveraddressselector.cpp +++ b/src/gui/components/dbusserveraddressselector.cpp @@ -39,7 +39,7 @@ namespace swift::gui::components &CDBusServerAddressSelector::editingFinished); } - CDBusServerAddressSelector::~CDBusServerAddressSelector() {} + CDBusServerAddressSelector::~CDBusServerAddressSelector() = default; QString CDBusServerAddressSelector::getP2PAddress() const { diff --git a/src/gui/components/dbusserveraddressselector.h b/src/gui/components/dbusserveraddressselector.h index a484d9e2a..9d6b35e78 100644 --- a/src/gui/components/dbusserveraddressselector.h +++ b/src/gui/components/dbusserveraddressselector.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CDBusServerAddressSelector(QWidget *parent = nullptr); //! Dtor - virtual ~CDBusServerAddressSelector() override; + ~CDBusServerAddressSelector() override; //! DBus address for P2P or empty QString getP2PAddress() const; diff --git a/src/gui/components/distributorpreferencescomponent.cpp b/src/gui/components/distributorpreferencescomponent.cpp index f9973f4ef..e45c3ded0 100644 --- a/src/gui/components/distributorpreferencescomponent.cpp +++ b/src/gui/components/distributorpreferencescomponent.cpp @@ -64,7 +64,7 @@ namespace swift::gui::components this->triggerDeferredSimulatorChange(); } - CDistributorPreferencesComponent::~CDistributorPreferencesComponent() {} + CDistributorPreferencesComponent::~CDistributorPreferencesComponent() = default; void CDistributorPreferencesComponent::onPreferencesChanged() { diff --git a/src/gui/components/distributorpreferencescomponent.h b/src/gui/components/distributorpreferencescomponent.h index 3f5d44975..3c013b857 100644 --- a/src/gui/components/distributorpreferencescomponent.h +++ b/src/gui/components/distributorpreferencescomponent.h @@ -36,7 +36,7 @@ namespace swift::gui explicit CDistributorPreferencesComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CDistributorPreferencesComponent(); + ~CDistributorPreferencesComponent() override; private: //! Changed preferences diff --git a/src/gui/components/downloadcomponent.cpp b/src/gui/components/downloadcomponent.cpp index 23fdc7f76..ea4a7d8e9 100644 --- a/src/gui/components/downloadcomponent.cpp +++ b/src/gui/components/downloadcomponent.cpp @@ -52,7 +52,7 @@ namespace swift::gui::components connect(ui->pb_Launch, &QPushButton::pressed, this, &CDownloadComponent::startDownloadedExecutable); } - CDownloadComponent::~CDownloadComponent() {} + CDownloadComponent::~CDownloadComponent() = default; bool CDownloadComponent::setDownloadFile(const CRemoteFile &remoteFile) { diff --git a/src/gui/components/downloadcomponent.h b/src/gui/components/downloadcomponent.h index 0fb351d81..3979e3a54 100644 --- a/src/gui/components/downloadcomponent.h +++ b/src/gui/components/downloadcomponent.h @@ -45,7 +45,7 @@ namespace swift::gui::components explicit CDownloadComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CDownloadComponent(); + ~CDownloadComponent() override; //! Set file to be downloaded bool setDownloadFile(const swift::misc::network::CRemoteFile &remoteFile); diff --git a/src/gui/components/downloaddialog.cpp b/src/gui/components/downloaddialog.cpp index 8807576fb..bec320e83 100644 --- a/src/gui/components/downloaddialog.cpp +++ b/src/gui/components/downloaddialog.cpp @@ -17,7 +17,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CDownloadDialog::~CDownloadDialog() {} + CDownloadDialog::~CDownloadDialog() = default; void CDownloadDialog::setDownloadFile(const CRemoteFile &remoteFile) { diff --git a/src/gui/components/downloaddialog.h b/src/gui/components/downloaddialog.h index 64ef97160..e8ff948b6 100644 --- a/src/gui/components/downloaddialog.h +++ b/src/gui/components/downloaddialog.h @@ -35,7 +35,7 @@ namespace swift::gui::components explicit CDownloadDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CDownloadDialog() override; + ~CDownloadDialog() override; //! \copydoc CDownloadComponent::setDownloadFile void setDownloadFile(const swift::misc::network::CRemoteFile &remoteFile); @@ -54,7 +54,7 @@ namespace swift::gui::components protected: //! \copydoc QDialog::accept - virtual void accept() override; + void accept() override; private: QScopedPointer ui; diff --git a/src/gui/components/firstmodelsetcomponent.cpp b/src/gui/components/firstmodelsetcomponent.cpp index 3deafc38e..49c54b537 100644 --- a/src/gui/components/firstmodelsetcomponent.cpp +++ b/src/gui/components/firstmodelsetcomponent.cpp @@ -66,7 +66,7 @@ namespace swift::gui::components connect(ui->pb_CreateModelSet, &QPushButton::clicked, this, &CFirstModelSetComponent::createModelSet); } - CFirstModelSetComponent::~CFirstModelSetComponent() {} + CFirstModelSetComponent::~CFirstModelSetComponent() = default; void CFirstModelSetComponent::onSimulatorChanged(const CSimulatorInfo &simulator) { diff --git a/src/gui/components/firstmodelsetcomponent.h b/src/gui/components/firstmodelsetcomponent.h index 62a3149f3..f898fc3c3 100644 --- a/src/gui/components/firstmodelsetcomponent.h +++ b/src/gui/components/firstmodelsetcomponent.h @@ -41,7 +41,7 @@ namespace swift::gui::components explicit CFirstModelSetComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CFirstModelSetComponent(); + ~CFirstModelSetComponent() override; private: QScopedPointer ui; @@ -99,7 +99,7 @@ namespace swift::gui::components void setFirstModelSet(CFirstModelSetComponent *firstModelSet) { m_firstModelSet = firstModelSet; } //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CFirstModelSetComponent *m_firstModelSet = nullptr; diff --git a/src/gui/components/firstmodelsetdialog.cpp b/src/gui/components/firstmodelsetdialog.cpp index 79a3c3f92..9ab7d672b 100644 --- a/src/gui/components/firstmodelsetdialog.cpp +++ b/src/gui/components/firstmodelsetdialog.cpp @@ -13,5 +13,5 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CFirstModelSetDialog::~CFirstModelSetDialog() {} + CFirstModelSetDialog::~CFirstModelSetDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/firstmodelsetdialog.h b/src/gui/components/firstmodelsetdialog.h index e08ed94f6..9430d4184 100644 --- a/src/gui/components/firstmodelsetdialog.h +++ b/src/gui/components/firstmodelsetdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CFirstModelSetDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CFirstModelSetDialog(); + ~CFirstModelSetDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/flightplancomponent.cpp b/src/gui/components/flightplancomponent.cpp index 053eedf78..bd5e7ca97 100644 --- a/src/gui/components/flightplancomponent.cpp +++ b/src/gui/components/flightplancomponent.cpp @@ -221,7 +221,7 @@ namespace swift::gui::components }); } - CFlightPlanComponent::~CFlightPlanComponent() {} + CFlightPlanComponent::~CFlightPlanComponent() = default; void CFlightPlanComponent::loginDataSet() { diff --git a/src/gui/components/flightplancomponent.h b/src/gui/components/flightplancomponent.h index 0d77aaa2b..aa45bc527 100644 --- a/src/gui/components/flightplancomponent.h +++ b/src/gui/components/flightplancomponent.h @@ -83,7 +83,7 @@ namespace swift::gui::components explicit CFlightPlanComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CFlightPlanComponent() override; + ~CFlightPlanComponent() override; //! Login data were set void loginDataSet(); diff --git a/src/gui/components/hotkeydialog.cpp b/src/gui/components/hotkeydialog.cpp index 02389b3f2..54fb0abf0 100644 --- a/src/gui/components/hotkeydialog.cpp +++ b/src/gui/components/hotkeydialog.cpp @@ -113,7 +113,7 @@ namespace swift::gui::components initStyleSheet(); } - CHotkeyDialog::~CHotkeyDialog() {} + CHotkeyDialog::~CHotkeyDialog() = default; CKeySelectionBox::CKeySelectionBox(QWidget *parent) : QComboBox(parent) { diff --git a/src/gui/components/hotkeydialog.h b/src/gui/components/hotkeydialog.h index 5f3b719d2..36cb88d7f 100644 --- a/src/gui/components/hotkeydialog.h +++ b/src/gui/components/hotkeydialog.h @@ -70,7 +70,7 @@ namespace swift::gui::components const swift::misc::CIdentifierList &identifiers, QWidget *parent = nullptr); //! Destructor - virtual ~CHotkeyDialog() override; + ~CHotkeyDialog() override; //! Get hotkey selected by user swift::misc::input::CActionHotkey getSelectedActionHotkey() const { return m_actionHotkey; } @@ -79,7 +79,7 @@ namespace swift::gui::components void initStyleSheet(); //! \copydoc QDialog::accept - virtual void accept() override; + void accept() override; //! Runs the hotkey dialog and returns the result static swift::misc::input::CActionHotkey getActionHotkey(const swift::misc::input::CActionHotkey &initial, diff --git a/src/gui/components/infobarstatuscomponent.cpp b/src/gui/components/infobarstatuscomponent.cpp index 81a957f99..411b8127e 100644 --- a/src/gui/components/infobarstatuscomponent.cpp +++ b/src/gui/components/infobarstatuscomponent.cpp @@ -96,7 +96,7 @@ namespace swift::gui::components }); } - CInfoBarStatusComponent::~CInfoBarStatusComponent() {} + CInfoBarStatusComponent::~CInfoBarStatusComponent() = default; void CInfoBarStatusComponent::initLeds() { diff --git a/src/gui/components/infobarstatuscomponent.h b/src/gui/components/infobarstatuscomponent.h index 367f242ef..6a8aec066 100644 --- a/src/gui/components/infobarstatuscomponent.h +++ b/src/gui/components/infobarstatuscomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CInfoBarStatusComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInfoBarStatusComponent() override; + ~CInfoBarStatusComponent() override; //! DBus used? void setDBusStatus(bool dbus); @@ -53,7 +53,7 @@ namespace swift::gui::components protected: //! \copydoc QWidget::resizeEvent - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; private: QScopedPointer ui; diff --git a/src/gui/components/infobarwebreadersstatuscomponent.cpp b/src/gui/components/infobarwebreadersstatuscomponent.cpp index 215266123..3d10a5dbb 100644 --- a/src/gui/components/infobarwebreadersstatuscomponent.cpp +++ b/src/gui/components/infobarwebreadersstatuscomponent.cpp @@ -165,7 +165,7 @@ namespace swift::gui::components this->init(); } - CInfoBarWebReadersStatusComponent::~CInfoBarWebReadersStatusComponent() {} + CInfoBarWebReadersStatusComponent::~CInfoBarWebReadersStatusComponent() = default; void CInfoBarWebReadersStatusComponent::showConsolidationStatus(bool show) { diff --git a/src/gui/components/infobarwebreadersstatuscomponent.h b/src/gui/components/infobarwebreadersstatuscomponent.h index 1d429599b..17daedaa7 100644 --- a/src/gui/components/infobarwebreadersstatuscomponent.h +++ b/src/gui/components/infobarwebreadersstatuscomponent.h @@ -33,7 +33,7 @@ namespace swift::gui public: //! Destructor - virtual ~CInfoBarWebReadersStatusBase(); + ~CInfoBarWebReadersStatusBase() override; //! Consolidation is running virtual void consolidationRunning(bool running); @@ -99,10 +99,10 @@ namespace swift::gui explicit CInfoBarWebReadersStatusComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInfoBarWebReadersStatusComponent() override; + ~CInfoBarWebReadersStatusComponent() override; //! Show the consolidation status - virtual void showConsolidationStatus(bool show) override; + void showConsolidationStatus(bool show) override; private: QScopedPointer ui; diff --git a/src/gui/components/infobarwebreadersstatussmallcomponent.cpp b/src/gui/components/infobarwebreadersstatussmallcomponent.cpp index 384c2a847..afcb3a69d 100644 --- a/src/gui/components/infobarwebreadersstatussmallcomponent.cpp +++ b/src/gui/components/infobarwebreadersstatussmallcomponent.cpp @@ -16,5 +16,5 @@ namespace swift::gui::components this->init(); } - CInfoBarWebReadersStatusSmallComponent::~CInfoBarWebReadersStatusSmallComponent() {} + CInfoBarWebReadersStatusSmallComponent::~CInfoBarWebReadersStatusSmallComponent() = default; } // namespace swift::gui::components diff --git a/src/gui/components/infobarwebreadersstatussmallcomponent.h b/src/gui/components/infobarwebreadersstatussmallcomponent.h index 13a37dbc8..d5d63d09b 100644 --- a/src/gui/components/infobarwebreadersstatussmallcomponent.h +++ b/src/gui/components/infobarwebreadersstatussmallcomponent.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CInfoBarWebReadersStatusSmallComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInfoBarWebReadersStatusSmallComponent() override; + ~CInfoBarWebReadersStatusSmallComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/initialdataloadcomponent.cpp b/src/gui/components/initialdataloadcomponent.cpp index b10c3eff1..2fc7316e7 100644 --- a/src/gui/components/initialdataloadcomponent.cpp +++ b/src/gui/components/initialdataloadcomponent.cpp @@ -14,7 +14,7 @@ namespace swift::gui::components ui->comp_DataUpdates->showVisibleLoadAllButtons(true, false, true); } - CInitialDataLoadComponent::~CInitialDataLoadComponent() {} + CInitialDataLoadComponent::~CInitialDataLoadComponent() = default; void CInitialDataLoadComponent::loadAllFromShared() { ui->comp_DataUpdates->loadAllFromShared(); } diff --git a/src/gui/components/initialdataloadcomponent.h b/src/gui/components/initialdataloadcomponent.h index 239e938c5..297d0a672 100644 --- a/src/gui/components/initialdataloadcomponent.h +++ b/src/gui/components/initialdataloadcomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CInitialDataLoadComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInitialDataLoadComponent(); + ~CInitialDataLoadComponent() override; //! \copydoc swift::gui::components::CDbLoadOverviewComponent::loadAllFromShared void loadAllFromShared(); @@ -59,10 +59,10 @@ namespace swift::gui::components void setConfigComponent(CInitialDataLoadComponent *config) { m_config = config; } //! \copydoc QWizardPage::initializePage - virtual void initializePage() override; + void initializePage() override; //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CInitialDataLoadComponent *m_config = nullptr; diff --git a/src/gui/components/installfsxterrainprobecomponent.cpp b/src/gui/components/installfsxterrainprobecomponent.cpp index 5de2af1ea..872311f77 100644 --- a/src/gui/components/installfsxterrainprobecomponent.cpp +++ b/src/gui/components/installfsxterrainprobecomponent.cpp @@ -47,7 +47,7 @@ namespace swift::gui::components }); } - CInstallFsxTerrainProbeComponent::~CInstallFsxTerrainProbeComponent() {} + CInstallFsxTerrainProbeComponent::~CInstallFsxTerrainProbeComponent() = default; void CInstallFsxTerrainProbeComponent::copyProbe() { diff --git a/src/gui/components/installfsxterrainprobecomponent.h b/src/gui/components/installfsxterrainprobecomponent.h index 5a38ccad3..749f17c2d 100644 --- a/src/gui/components/installfsxterrainprobecomponent.h +++ b/src/gui/components/installfsxterrainprobecomponent.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CInstallFsxTerrainProbeComponent(QWidget *parent = nullptr); //! Destructors - virtual ~CInstallFsxTerrainProbeComponent(); + ~CInstallFsxTerrainProbeComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/installsimulatorspecificwizardpage.h b/src/gui/components/installsimulatorspecificwizardpage.h index 254f49bda..c6b5cf9fe 100644 --- a/src/gui/components/installsimulatorspecificwizardpage.h +++ b/src/gui/components/installsimulatorspecificwizardpage.h @@ -34,7 +34,7 @@ namespace swift::gui::components } //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override { return true; } + bool validatePage() override { return true; } private: CInstallXSwiftBusComponent *m_xSwiftBusConfig = nullptr; diff --git a/src/gui/components/installxswiftbuscomponent.cpp b/src/gui/components/installxswiftbuscomponent.cpp index 40e9c3344..c6701a0d6 100644 --- a/src/gui/components/installxswiftbuscomponent.cpp +++ b/src/gui/components/installxswiftbuscomponent.cpp @@ -55,7 +55,7 @@ namespace swift::gui::components this->updatesChanged(); } - CInstallXSwiftBusComponent::~CInstallXSwiftBusComponent() {} + CInstallXSwiftBusComponent::~CInstallXSwiftBusComponent() = default; void CInstallXSwiftBusComponent::setDefaultDownloadName(const QString &defaultDownload) { diff --git a/src/gui/components/installxswiftbuscomponent.h b/src/gui/components/installxswiftbuscomponent.h index 33b563c53..273ce5f6c 100644 --- a/src/gui/components/installxswiftbuscomponent.h +++ b/src/gui/components/installxswiftbuscomponent.h @@ -37,7 +37,7 @@ namespace swift::gui::components explicit CInstallXSwiftBusComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CInstallXSwiftBusComponent(); + ~CInstallXSwiftBusComponent() override; //! Set a default name for download void setDefaultDownloadName(const QString &defaultDownload); @@ -120,7 +120,7 @@ namespace swift::gui::components void setConfigComponent(CInstallXSwiftBusComponent *config) { m_config = config; } //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CInstallXSwiftBusComponent *m_config = nullptr; diff --git a/src/gui/components/installxswiftbusdialog.cpp b/src/gui/components/installxswiftbusdialog.cpp index 12c0e0374..06e18ab8f 100644 --- a/src/gui/components/installxswiftbusdialog.cpp +++ b/src/gui/components/installxswiftbusdialog.cpp @@ -13,7 +13,7 @@ namespace swift::gui::components ui->setupUi(this); } - CInstallXSwiftBusDialog::~CInstallXSwiftBusDialog() {} + CInstallXSwiftBusDialog::~CInstallXSwiftBusDialog() = default; void CInstallXSwiftBusDialog::setDefaultDownloadName(const QString &defaultName) { diff --git a/src/gui/components/installxswiftbusdialog.h b/src/gui/components/installxswiftbusdialog.h index c6fc11c28..eff08e3ec 100644 --- a/src/gui/components/installxswiftbusdialog.h +++ b/src/gui/components/installxswiftbusdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CInstallXSwiftBusDialog(QWidget *parent = nullptr); //! Dtor - virtual ~CInstallXSwiftBusDialog() override; + ~CInstallXSwiftBusDialog() override; //! \copydoc CInstallXSwiftBusComponent::setDefaultDownloadName void setDefaultDownloadName(const QString &defaultName); diff --git a/src/gui/components/internalscomponent.cpp b/src/gui/components/internalscomponent.cpp index 503a27d43..31afa8857 100644 --- a/src/gui/components/internalscomponent.cpp +++ b/src/gui/components/internalscomponent.cpp @@ -95,7 +95,7 @@ namespace swift::gui::components this->contextFlagsToGui(); } - CInternalsComponent::~CInternalsComponent() {} + CInternalsComponent::~CInternalsComponent() = default; void CInternalsComponent::showEvent(QShowEvent *event) { diff --git a/src/gui/components/internalscomponent.h b/src/gui/components/internalscomponent.h index 5aaf1b426..3174b28f3 100644 --- a/src/gui/components/internalscomponent.h +++ b/src/gui/components/internalscomponent.h @@ -31,11 +31,11 @@ namespace swift::gui::components explicit CInternalsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInternalsComponent() override; + ~CInternalsComponent() override; protected: //! \copydoc QWidget::showEvent - virtual void showEvent(QShowEvent *event) override; + void showEvent(QShowEvent *event) override; private: //! Enable / disable debugging diff --git a/src/gui/components/interpolationcomponent.cpp b/src/gui/components/interpolationcomponent.cpp index 27a06c384..c139f3367 100644 --- a/src/gui/components/interpolationcomponent.cpp +++ b/src/gui/components/interpolationcomponent.cpp @@ -27,7 +27,7 @@ namespace swift::gui::components &CInterpolationComponent::displayInterpolationMessages); } - CInterpolationComponent::~CInterpolationComponent() {} + CInterpolationComponent::~CInterpolationComponent() = default; void CInterpolationComponent::displayInterpolationMessages() { diff --git a/src/gui/components/interpolationcomponent.h b/src/gui/components/interpolationcomponent.h index f10e8348a..9e829fc78 100644 --- a/src/gui/components/interpolationcomponent.h +++ b/src/gui/components/interpolationcomponent.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CInterpolationComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInterpolationComponent() override; + ~CInterpolationComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/interpolationlogdisplay.cpp b/src/gui/components/interpolationlogdisplay.cpp index 6d7bc1a2e..c08c9a01c 100644 --- a/src/gui/components/interpolationlogdisplay.cpp +++ b/src/gui/components/interpolationlogdisplay.cpp @@ -98,10 +98,7 @@ namespace swift::gui::components Qt::QueuedConnection); } - CInterpolationLogDisplay::~CInterpolationLogDisplay() - { - // void - } + CInterpolationLogDisplay::~CInterpolationLogDisplay() = default; void CInterpolationLogDisplay::setSimulator(ISimulator *simulator) { diff --git a/src/gui/components/interpolationlogdisplay.h b/src/gui/components/interpolationlogdisplay.h index 1e0b225e1..62b60fe6f 100644 --- a/src/gui/components/interpolationlogdisplay.h +++ b/src/gui/components/interpolationlogdisplay.h @@ -57,7 +57,7 @@ namespace swift::gui::components explicit CInterpolationLogDisplay(QWidget *parent = nullptr); //! Destructor - virtual ~CInterpolationLogDisplay() override; + ~CInterpolationLogDisplay() override; //! Set simulator void setSimulator(swift::core::ISimulator *simulator); diff --git a/src/gui/components/interpolationlogdisplaydialog.h b/src/gui/components/interpolationlogdisplaydialog.h index 42c1e62e6..e0815f179 100644 --- a/src/gui/components/interpolationlogdisplaydialog.h +++ b/src/gui/components/interpolationlogdisplaydialog.h @@ -36,7 +36,7 @@ namespace swift::gui::components QWidget *parent = nullptr); //! Destructor - virtual ~CInterpolationLogDisplayDialog() override; + ~CInterpolationLogDisplayDialog() override; //! Set simulator void setSimulator(swift::core::ISimulator *simulator); diff --git a/src/gui/components/interpolationsetupcomponent.cpp b/src/gui/components/interpolationsetupcomponent.cpp index 7769189b8..4b3adba96 100644 --- a/src/gui/components/interpolationsetupcomponent.cpp +++ b/src/gui/components/interpolationsetupcomponent.cpp @@ -64,7 +64,7 @@ namespace swift::gui::components }); } - CInterpolationSetupComponent::~CInterpolationSetupComponent() {} + CInterpolationSetupComponent::~CInterpolationSetupComponent() = default; CInterpolationSetupComponent::Mode CInterpolationSetupComponent::getSetupMode() const { diff --git a/src/gui/components/interpolationsetupcomponent.h b/src/gui/components/interpolationsetupcomponent.h index 9fba88935..3b95a4169 100644 --- a/src/gui/components/interpolationsetupcomponent.h +++ b/src/gui/components/interpolationsetupcomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CInterpolationSetupComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CInterpolationSetupComponent() override; + ~CInterpolationSetupComponent() override; //! Setup mode Mode getSetupMode() const; diff --git a/src/gui/components/legalinfocomponent.cpp b/src/gui/components/legalinfocomponent.cpp index ba192201b..863b6820c 100644 --- a/src/gui/components/legalinfocomponent.cpp +++ b/src/gui/components/legalinfocomponent.cpp @@ -34,7 +34,7 @@ namespace swift::gui::components connect(ui->cb_CrashDumps, &QCheckBox::toggled, this, &CLegalInfoComponent::onAllowCrashDumps); } - CLegalInfoComponent::~CLegalInfoComponent() {} + CLegalInfoComponent::~CLegalInfoComponent() = default; bool CLegalInfoComponent::isAgreedTo() const { return ui->cb_Agree->isChecked(); } diff --git a/src/gui/components/legalinfocomponent.h b/src/gui/components/legalinfocomponent.h index 5e099199f..706c618ac 100644 --- a/src/gui/components/legalinfocomponent.h +++ b/src/gui/components/legalinfocomponent.h @@ -31,7 +31,7 @@ namespace swift::gui::components explicit CLegalInfoComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CLegalInfoComponent(); + ~CLegalInfoComponent() override; //! Agreed with? bool isAgreedTo() const; @@ -65,7 +65,7 @@ namespace swift::gui::components void setConfigComponent(CLegalInfoComponent *config) { m_legalInfo = config; } //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; private: CLegalInfoComponent *m_legalInfo = nullptr; diff --git a/src/gui/components/logcomponent.cpp b/src/gui/components/logcomponent.cpp index 24d69545a..101b74a7e 100644 --- a/src/gui/components/logcomponent.cpp +++ b/src/gui/components/logcomponent.cpp @@ -62,7 +62,7 @@ namespace swift::gui::components m_history.initialize(sApp->getDataLinkDBus()); } - CLogComponent::~CLogComponent() {} + CLogComponent::~CLogComponent() = default; void CLogComponent::displayLog(bool attention) { diff --git a/src/gui/components/logcomponent.h b/src/gui/components/logcomponent.h index a91b617c4..70406ca94 100644 --- a/src/gui/components/logcomponent.h +++ b/src/gui/components/logcomponent.h @@ -50,7 +50,7 @@ namespace swift::gui::components explicit CLogComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CLogComponent(); + ~CLogComponent() override; //! Display log void displayLog(bool attention = false); diff --git a/src/gui/components/logincomponent.cpp b/src/gui/components/logincomponent.cpp index 8a083a58c..0daf2baf4 100644 --- a/src/gui/components/logincomponent.cpp +++ b/src/gui/components/logincomponent.cpp @@ -134,7 +134,7 @@ namespace swift::gui::components }); } - CLoginComponent::~CLoginComponent() {} + CLoginComponent::~CLoginComponent() = default; void CLoginComponent::mainInfoAreaChanged(const QWidget *currentWidget) { diff --git a/src/gui/components/logincomponent.h b/src/gui/components/logincomponent.h index d432dd3ac..e798f2237 100644 --- a/src/gui/components/logincomponent.h +++ b/src/gui/components/logincomponent.h @@ -63,7 +63,7 @@ namespace swift::gui::components explicit CLoginComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CLoginComponent() override; + ~CLoginComponent() override; //! Automatically popup void setAutoPopupWizad(bool autoPopup); diff --git a/src/gui/components/maininfoareacomponent.cpp b/src/gui/components/maininfoareacomponent.cpp index e07abca16..84ac64b92 100644 --- a/src/gui/components/maininfoareacomponent.cpp +++ b/src/gui/components/maininfoareacomponent.cpp @@ -27,7 +27,7 @@ namespace swift::gui::components connect(this->getLogComponent(), &CLogComponent::requestAttention, this, &CMainInfoAreaComponent::selectLog); } - CMainInfoAreaComponent::~CMainInfoAreaComponent() {} + CMainInfoAreaComponent::~CMainInfoAreaComponent() = default; CAtcStationComponent *CMainInfoAreaComponent::getAtcStationComponent() { return ui->comp_AtcStations; } diff --git a/src/gui/components/maininfoareacomponent.h b/src/gui/components/maininfoareacomponent.h index 703fbafe8..b4b577d8d 100644 --- a/src/gui/components/maininfoareacomponent.h +++ b/src/gui/components/maininfoareacomponent.h @@ -46,7 +46,7 @@ namespace swift::gui::components explicit CMainInfoAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CMainInfoAreaComponent() override; + ~CMainInfoAreaComponent() override; //! Info areas enum InfoArea @@ -123,8 +123,8 @@ namespace swift::gui::components protected: // CInfoArea overrides - virtual QSize getPreferredSizeWhenFloating(int areaIndex) const override; - virtual const QPixmap &indexToPixmap(int areaIndex) const override; + QSize getPreferredSizeWhenFloating(int areaIndex) const override; + const QPixmap &indexToPixmap(int areaIndex) const override; private: QScopedPointer ui; diff --git a/src/gui/components/mainkeypadareacomponent.cpp b/src/gui/components/mainkeypadareacomponent.cpp index 54573393c..3480d389f 100644 --- a/src/gui/components/mainkeypadareacomponent.cpp +++ b/src/gui/components/mainkeypadareacomponent.cpp @@ -79,7 +79,7 @@ namespace swift::gui::components }); } - CMainKeypadAreaComponent::~CMainKeypadAreaComponent() {} + CMainKeypadAreaComponent::~CMainKeypadAreaComponent() = default; void CMainKeypadAreaComponent::onMainInfoAreaChanged(int currentTabIndex, const QList &dockedIndexes, const QList &floatingIndexes) diff --git a/src/gui/components/mainkeypadareacomponent.h b/src/gui/components/mainkeypadareacomponent.h index 93aaa8986..d7f95bdc6 100644 --- a/src/gui/components/mainkeypadareacomponent.h +++ b/src/gui/components/mainkeypadareacomponent.h @@ -40,7 +40,7 @@ namespace swift::gui::components explicit CMainKeypadAreaComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CMainKeypadAreaComponent() override; + ~CMainKeypadAreaComponent() override; //! Main info area changed void onMainInfoAreaChanged(int currentTabIndex, const QList &dockedIndexes, diff --git a/src/gui/components/mappingcomponent.cpp b/src/gui/components/mappingcomponent.cpp index 6fc561cc8..ab20b2108 100644 --- a/src/gui/components/mappingcomponent.cpp +++ b/src/gui/components/mappingcomponent.cpp @@ -178,7 +178,7 @@ namespace swift::gui::components }); } - CMappingComponent::~CMappingComponent() {} + CMappingComponent::~CMappingComponent() = default; int CMappingComponent::countCurrentMappings() const { diff --git a/src/gui/components/mappingcomponent.h b/src/gui/components/mappingcomponent.h index 8e6a901be..f5ca6f1a3 100644 --- a/src/gui/components/mappingcomponent.h +++ b/src/gui/components/mappingcomponent.h @@ -79,7 +79,7 @@ namespace swift::gui explicit CMappingComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CMappingComponent() override; + ~CMappingComponent() override; //! Number of current mappings int countCurrentMappings() const; diff --git a/src/gui/components/marginsinput.cpp b/src/gui/components/marginsinput.cpp index 0b6f2f91b..8a9c298d2 100644 --- a/src/gui/components/marginsinput.cpp +++ b/src/gui/components/marginsinput.cpp @@ -28,7 +28,7 @@ namespace swift::gui::components this->setMargins(QMargins()); } - CMarginsInput::~CMarginsInput() {} + CMarginsInput::~CMarginsInput() = default; void CMarginsInput::setMargins(const QMargins &margins) { diff --git a/src/gui/components/marginsinput.h b/src/gui/components/marginsinput.h index 9cc7766ae..6d736e960 100644 --- a/src/gui/components/marginsinput.h +++ b/src/gui/components/marginsinput.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CMarginsInput(QWidget *parent = nullptr); //! Destructor - virtual ~CMarginsInput() override; + ~CMarginsInput() override; //! Set margins void setMargins(const QMargins &margins); diff --git a/src/gui/components/matchingstatisticscomponent.cpp b/src/gui/components/matchingstatisticscomponent.cpp index 91f59d13f..73fd2c107 100644 --- a/src/gui/components/matchingstatisticscomponent.cpp +++ b/src/gui/components/matchingstatisticscomponent.cpp @@ -25,7 +25,7 @@ namespace swift::gui::components &CMatchingStatisticsComponent::onGenerateClicked); } - CMatchingStatisticsComponent::~CMatchingStatisticsComponent() {} + CMatchingStatisticsComponent::~CMatchingStatisticsComponent() = default; void CMatchingStatisticsComponent::onGenerateClicked() { diff --git a/src/gui/components/matchingstatisticscomponent.h b/src/gui/components/matchingstatisticscomponent.h index af8a0e3ad..2a6b446a9 100644 --- a/src/gui/components/matchingstatisticscomponent.h +++ b/src/gui/components/matchingstatisticscomponent.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CMatchingStatisticsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CMatchingStatisticsComponent(); + ~CMatchingStatisticsComponent() override; private: //! Show statistics diff --git a/src/gui/components/modelbrowsercomponent.cpp b/src/gui/components/modelbrowsercomponent.cpp index b26841131..cc78d4dd6 100644 --- a/src/gui/components/modelbrowsercomponent.cpp +++ b/src/gui/components/modelbrowsercomponent.cpp @@ -56,10 +56,7 @@ namespace swift::gui::components this->onSetRelativePosition(); } - CModelBrowserComponent::~CModelBrowserComponent() - { - // void - } + CModelBrowserComponent::~CModelBrowserComponent() = default; void CModelBrowserComponent::close() { this->remove(); } diff --git a/src/gui/components/modelbrowsercomponent.h b/src/gui/components/modelbrowsercomponent.h index d938812d7..38e5aaaed 100644 --- a/src/gui/components/modelbrowsercomponent.h +++ b/src/gui/components/modelbrowsercomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CModelBrowserComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CModelBrowserComponent() override; + ~CModelBrowserComponent() override; //! Browser has been closed void close(); diff --git a/src/gui/components/modelbrowserdialog.cpp b/src/gui/components/modelbrowserdialog.cpp index afea73f83..f624d3003 100644 --- a/src/gui/components/modelbrowserdialog.cpp +++ b/src/gui/components/modelbrowserdialog.cpp @@ -14,10 +14,7 @@ namespace swift::gui::components ui->setupUi(this); } - CModelBrowserDialog::~CModelBrowserDialog() - { - // void; - } + CModelBrowserDialog::~CModelBrowserDialog() = default; void CModelBrowserDialog::done(int r) { diff --git a/src/gui/components/modelbrowserdialog.h b/src/gui/components/modelbrowserdialog.h index 0d4b0f0dd..4f2b089be 100644 --- a/src/gui/components/modelbrowserdialog.h +++ b/src/gui/components/modelbrowserdialog.h @@ -27,10 +27,10 @@ namespace swift::gui::components explicit CModelBrowserDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CModelBrowserDialog() override; + ~CModelBrowserDialog() override; //! \copydoc QDialog::closeEvent - virtual void done(int r) override; + void done(int r) override; private: QScopedPointer ui; diff --git a/src/gui/components/modelconverterxsetupcomponent.cpp b/src/gui/components/modelconverterxsetupcomponent.cpp index 69d348dd1..0cb513f8d 100644 --- a/src/gui/components/modelconverterxsetupcomponent.cpp +++ b/src/gui/components/modelconverterxsetupcomponent.cpp @@ -23,7 +23,7 @@ namespace swift::gui::components ui->le_McxBinary->setText(m_setting.get()); } - CModelConverterXSetupComponent::~CModelConverterXSetupComponent() {} + CModelConverterXSetupComponent::~CModelConverterXSetupComponent() = default; void CModelConverterXSetupComponent::selectBinary() { diff --git a/src/gui/components/modelconverterxsetupcomponent.h b/src/gui/components/modelconverterxsetupcomponent.h index c2dba3c2c..408fc2d16 100644 --- a/src/gui/components/modelconverterxsetupcomponent.h +++ b/src/gui/components/modelconverterxsetupcomponent.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CModelConverterXSetupComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CModelConverterXSetupComponent(); + ~CModelConverterXSetupComponent() override; private: //! File dialog diff --git a/src/gui/components/modelmatchercomponent.cpp b/src/gui/components/modelmatchercomponent.cpp index 0e1c443d1..7528e379b 100644 --- a/src/gui/components/modelmatchercomponent.cpp +++ b/src/gui/components/modelmatchercomponent.cpp @@ -85,7 +85,7 @@ namespace swift::gui::components ui->cb_UseWorkbench->setVisible(false); } - CModelMatcherComponent::~CModelMatcherComponent() {} + CModelMatcherComponent::~CModelMatcherComponent() = default; void CModelMatcherComponent::tabIndexChanged(int index) { diff --git a/src/gui/components/modelmatchercomponent.h b/src/gui/components/modelmatchercomponent.h index d2d000b82..1d754a2e1 100644 --- a/src/gui/components/modelmatchercomponent.h +++ b/src/gui/components/modelmatchercomponent.h @@ -46,7 +46,7 @@ namespace swift::gui explicit CModelMatcherComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CModelMatcherComponent() override; + ~CModelMatcherComponent() override; //! Tab (where this component is embedded) has been changed void tabIndexChanged(int index); diff --git a/src/gui/components/modelmatcherlogcomponent.cpp b/src/gui/components/modelmatcherlogcomponent.cpp index 30374f526..59793a2b1 100644 --- a/src/gui/components/modelmatcherlogcomponent.cpp +++ b/src/gui/components/modelmatcherlogcomponent.cpp @@ -31,7 +31,7 @@ namespace swift::gui::components &CModelMatcherLogComponent::callsignEntered); } - CModelMatcherLogComponent::~CModelMatcherLogComponent() {} + CModelMatcherLogComponent::~CModelMatcherLogComponent() = default; bool CModelMatcherLogComponent::hasContexts() const { diff --git a/src/gui/components/modelmatcherlogcomponent.h b/src/gui/components/modelmatcherlogcomponent.h index 86375840d..8d5a45c0c 100644 --- a/src/gui/components/modelmatcherlogcomponent.h +++ b/src/gui/components/modelmatcherlogcomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CModelMatcherLogComponent(QWidget *parent = nullptr); //! Constructor - virtual ~CModelMatcherLogComponent() override; + ~CModelMatcherLogComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/modelmatcherlogenable.cpp b/src/gui/components/modelmatcherlogenable.cpp index e5c51d49f..50c1e5363 100644 --- a/src/gui/components/modelmatcherlogenable.cpp +++ b/src/gui/components/modelmatcherlogenable.cpp @@ -46,7 +46,7 @@ namespace swift::gui::components }); } - CModelMatcherLogEnable::~CModelMatcherLogEnable() {} + CModelMatcherLogEnable::~CModelMatcherLogEnable() = default; bool CModelMatcherLogEnable::isReverseLookupLogEnabled() const { return ui->cb_LogReverseLookup->isChecked(); } diff --git a/src/gui/components/modelmatcherlogenable.h b/src/gui/components/modelmatcherlogenable.h index d531a3ec3..cb650ff5f 100644 --- a/src/gui/components/modelmatcherlogenable.h +++ b/src/gui/components/modelmatcherlogenable.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CModelMatcherLogEnable(QWidget *parent = nullptr); //! Destructor - virtual ~CModelMatcherLogEnable() override; + ~CModelMatcherLogEnable() override; //! Reverse lookup enabled? bool isReverseLookupLogEnabled() const; diff --git a/src/gui/components/modelmodeselector.cpp b/src/gui/components/modelmodeselector.cpp index 11593ddb7..a78636ad0 100644 --- a/src/gui/components/modelmodeselector.cpp +++ b/src/gui/components/modelmodeselector.cpp @@ -17,10 +17,7 @@ namespace swift::gui::components connect(ui->rb_Include, &QRadioButton::released, this, &CModelModeSelector::changed); } - CModelModeSelector::~CModelModeSelector() - { - // void - } + CModelModeSelector::~CModelModeSelector() = default; swift::misc::simulation::CAircraftModel::ModelMode CModelModeSelector::getMode() const { diff --git a/src/gui/components/modelmodeselector.h b/src/gui/components/modelmodeselector.h index c76e2f79d..82fe7b9e3 100644 --- a/src/gui/components/modelmodeselector.h +++ b/src/gui/components/modelmodeselector.h @@ -34,7 +34,7 @@ namespace swift::gui::components explicit CModelModeSelector(QWidget *parent = nullptr); //! Destructor - ~CModelModeSelector(); + ~CModelModeSelector() override; //! Get mode swift::misc::simulation::CAircraftModel::ModelMode getMode() const; diff --git a/src/gui/components/navigatordialog.cpp b/src/gui/components/navigatordialog.cpp index ff0825442..582ecd3d9 100644 --- a/src/gui/components/navigatordialog.cpp +++ b/src/gui/components/navigatordialog.cpp @@ -73,7 +73,7 @@ namespace swift::gui::components this->onStyleSheetsChanged(); } - CNavigatorDialog::~CNavigatorDialog() {} + CNavigatorDialog::~CNavigatorDialog() = default; void CNavigatorDialog::buildNavigator(int columns) { diff --git a/src/gui/components/navigatordialog.h b/src/gui/components/navigatordialog.h index 5bda7780e..bcb47b3ad 100644 --- a/src/gui/components/navigatordialog.h +++ b/src/gui/components/navigatordialog.h @@ -43,13 +43,13 @@ namespace swift::gui::components CNavigatorDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CNavigatorDialog() override; + ~CNavigatorDialog() override; //! Navigator void buildNavigator(int columns); //! Called when dialog is closed - virtual void reject() override; + void reject() override; //! Toggle frameless mode void toggleFrameless(); @@ -78,25 +78,25 @@ namespace swift::gui::components //! @{ //! \copydoc QDialog::mouseMoveEvent - virtual void mouseMoveEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; //! \copydoc QDialog::mousePressEvent - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; //! \copydoc QDialog::mouseReleaseEvent - virtual void mouseReleaseEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; //! \copydoc QDialog::changeEvent - virtual void changeEvent(QEvent *evt) override; + void changeEvent(QEvent *evt) override; //! \copydoc CEnableForFramelessWindow::windowFlagsChanged - virtual void windowFlagsChanged() override; + void windowFlagsChanged() override; //! \copydoc QDialog::paintEvent - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; //! \copydoc QDialog::enterEvent - virtual void enterEvent(QEnterEvent *event) override; + void enterEvent(QEnterEvent *event) override; //! @} private: diff --git a/src/gui/components/networkaircraftvaluescomponent.cpp b/src/gui/components/networkaircraftvaluescomponent.cpp index 2cea3a539..27e27be33 100644 --- a/src/gui/components/networkaircraftvaluescomponent.cpp +++ b/src/gui/components/networkaircraftvaluescomponent.cpp @@ -19,10 +19,7 @@ namespace swift::gui::components ui->setupUi(this); } - CNetworkAircraftValuesComponent::~CNetworkAircraftValuesComponent() - { - // void - } + CNetworkAircraftValuesComponent::~CNetworkAircraftValuesComponent() = default; void CNetworkAircraftValuesComponent::showValues() { diff --git a/src/gui/components/networkaircraftvaluescomponent.h b/src/gui/components/networkaircraftvaluescomponent.h index 8c9f5430d..a8e7a4356 100644 --- a/src/gui/components/networkaircraftvaluescomponent.h +++ b/src/gui/components/networkaircraftvaluescomponent.h @@ -25,7 +25,7 @@ namespace swift::gui::components explicit CNetworkAircraftValuesComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CNetworkAircraftValuesComponent() override; + ~CNetworkAircraftValuesComponent() override; //! Show the current values void showValues(); diff --git a/src/gui/components/networkdetailscomponent.cpp b/src/gui/components/networkdetailscomponent.cpp index f564da719..c94d687ef 100644 --- a/src/gui/components/networkdetailscomponent.cpp +++ b/src/gui/components/networkdetailscomponent.cpp @@ -63,7 +63,7 @@ namespace swift::gui::components this->onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1, {}); } - CNetworkDetailsComponent::~CNetworkDetailsComponent() {} + CNetworkDetailsComponent::~CNetworkDetailsComponent() = default; CLoginMode CNetworkDetailsComponent::getLoginMode() const { diff --git a/src/gui/components/networkdetailscomponent.h b/src/gui/components/networkdetailscomponent.h index 2ebd8b3d9..c3f71186a 100644 --- a/src/gui/components/networkdetailscomponent.h +++ b/src/gui/components/networkdetailscomponent.h @@ -37,7 +37,7 @@ namespace swift::gui::components explicit CNetworkDetailsComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CNetworkDetailsComponent() override; + ~CNetworkDetailsComponent() override; //! Login mode swift::misc::network::CLoginMode getLoginMode() const; diff --git a/src/gui/components/otherswiftversionscomponent.cpp b/src/gui/components/otherswiftversionscomponent.cpp index aac00a3e7..009caa15d 100644 --- a/src/gui/components/otherswiftversionscomponent.cpp +++ b/src/gui/components/otherswiftversionscomponent.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components &COtherSwiftVersionsComponent::reloadOtherVersions); } - COtherSwiftVersionsComponent::~COtherSwiftVersionsComponent() {} + COtherSwiftVersionsComponent::~COtherSwiftVersionsComponent() = default; bool COtherSwiftVersionsComponent::hasSelection() const { return (ui->tvp_ApplicationInfo->hasSelection()); } diff --git a/src/gui/components/otherswiftversionscomponent.h b/src/gui/components/otherswiftversionscomponent.h index f59c6903e..2019c995b 100644 --- a/src/gui/components/otherswiftversionscomponent.h +++ b/src/gui/components/otherswiftversionscomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit COtherSwiftVersionsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~COtherSwiftVersionsComponent(); + ~COtherSwiftVersionsComponent() override; //! Any version selected? bool hasSelection() const; diff --git a/src/gui/components/otherswiftversionsdialog.cpp b/src/gui/components/otherswiftversionsdialog.cpp index cd46e4a7c..c2f389316 100644 --- a/src/gui/components/otherswiftversionsdialog.cpp +++ b/src/gui/components/otherswiftversionsdialog.cpp @@ -13,5 +13,5 @@ namespace swift::gui::components ui->setupUi(this); } - COtherSwiftVersionsDialog::~COtherSwiftVersionsDialog() {} + COtherSwiftVersionsDialog::~COtherSwiftVersionsDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/otherswiftversionsdialog.h b/src/gui/components/otherswiftversionsdialog.h index 9dfa1fbe8..01bc52d98 100644 --- a/src/gui/components/otherswiftversionsdialog.h +++ b/src/gui/components/otherswiftversionsdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit COtherSwiftVersionsDialog(QWidget *parent = nullptr); //! Destructor - virtual ~COtherSwiftVersionsDialog(); + ~COtherSwiftVersionsDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/ownaircraftcomponent.cpp b/src/gui/components/ownaircraftcomponent.cpp index 87be26428..2a9f40c14 100644 --- a/src/gui/components/ownaircraftcomponent.cpp +++ b/src/gui/components/ownaircraftcomponent.cpp @@ -82,7 +82,7 @@ namespace swift::gui::components } } - COwnAircraftComponent::~COwnAircraftComponent() {} + COwnAircraftComponent::~COwnAircraftComponent() = default; void COwnAircraftComponent::setUser(const CUser &user) { diff --git a/src/gui/components/ownaircraftcomponent.h b/src/gui/components/ownaircraftcomponent.h index 1f2900933..999a62f90 100644 --- a/src/gui/components/ownaircraftcomponent.h +++ b/src/gui/components/ownaircraftcomponent.h @@ -46,7 +46,7 @@ namespace swift::gui::components explicit COwnAircraftComponent(QWidget *parent = nullptr); //! Destructor - virtual ~COwnAircraftComponent() override; + ~COwnAircraftComponent() override; //! Validate aircaft swift::misc::CStatusMessageList validate() const; diff --git a/src/gui/components/radarcomponent.cpp b/src/gui/components/radarcomponent.cpp index 975f2b9d1..893ba6d64 100644 --- a/src/gui/components/radarcomponent.cpp +++ b/src/gui/components/radarcomponent.cpp @@ -58,7 +58,7 @@ namespace swift::gui::components m_headingTimer.start(50); } - CRadarComponent::~CRadarComponent() {} + CRadarComponent::~CRadarComponent() = default; bool CRadarComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) { diff --git a/src/gui/components/radarcomponent.h b/src/gui/components/radarcomponent.h index 63cdb0b97..40e798fdb 100644 --- a/src/gui/components/radarcomponent.h +++ b/src/gui/components/radarcomponent.h @@ -33,10 +33,10 @@ namespace swift::gui::components explicit CRadarComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CRadarComponent() override; + ~CRadarComponent() override; //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; private: void prepareScene(); diff --git a/src/gui/components/rawfsdmessagescomponent.cpp b/src/gui/components/rawfsdmessagescomponent.cpp index fbd02fddf..96a668ea8 100644 --- a/src/gui/components/rawfsdmessagescomponent.cpp +++ b/src/gui/components/rawfsdmessagescomponent.cpp @@ -44,7 +44,7 @@ namespace swift::gui::components expandWritingToFile(false); } - CRawFsdMessagesComponent::~CRawFsdMessagesComponent() {} + CRawFsdMessagesComponent::~CRawFsdMessagesComponent() = default; void CRawFsdMessagesComponent::setupConnections() { diff --git a/src/gui/components/rawfsdmessagescomponent.h b/src/gui/components/rawfsdmessagescomponent.h index f91ca4527..e1225aff2 100644 --- a/src/gui/components/rawfsdmessagescomponent.h +++ b/src/gui/components/rawfsdmessagescomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CRawFsdMessagesComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CRawFsdMessagesComponent(); + ~CRawFsdMessagesComponent() override; private: void setupConnections(); diff --git a/src/gui/components/rawfsdmessagesdialog.cpp b/src/gui/components/rawfsdmessagesdialog.cpp index 4147f0206..29cda0a01 100644 --- a/src/gui/components/rawfsdmessagesdialog.cpp +++ b/src/gui/components/rawfsdmessagesdialog.cpp @@ -12,5 +12,5 @@ namespace swift::gui::components ui->setupUi(this); } - CRawFsdMessagesDialog::~CRawFsdMessagesDialog() {} + CRawFsdMessagesDialog::~CRawFsdMessagesDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/rawfsdmessagesdialog.h b/src/gui/components/rawfsdmessagesdialog.h index 40ce2e255..af33b5750 100644 --- a/src/gui/components/rawfsdmessagesdialog.h +++ b/src/gui/components/rawfsdmessagesdialog.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CRawFsdMessagesDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CRawFsdMessagesDialog(); + ~CRawFsdMessagesDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/registercomponent.cpp b/src/gui/components/registercomponent.cpp index 2bf111bfe..7628d61c4 100644 --- a/src/gui/components/registercomponent.cpp +++ b/src/gui/components/registercomponent.cpp @@ -35,7 +35,7 @@ namespace swift::gui::components m_updateTimer.start(); } - CRegisterComponent::~CRegisterComponent() {} + CRegisterComponent::~CRegisterComponent() = default; void CRegisterComponent::update() { diff --git a/src/gui/components/registercomponent.h b/src/gui/components/registercomponent.h index f29e3583f..027b90427 100644 --- a/src/gui/components/registercomponent.h +++ b/src/gui/components/registercomponent.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CRegisterComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CRegisterComponent(); + ~CRegisterComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/remoteaircraftselector.cpp b/src/gui/components/remoteaircraftselector.cpp index 08d612a2f..3f102ce39 100644 --- a/src/gui/components/remoteaircraftselector.cpp +++ b/src/gui/components/remoteaircraftselector.cpp @@ -41,7 +41,7 @@ namespace swift::gui::components Q_UNUSED(s); } - CRemoteAircraftSelector::~CRemoteAircraftSelector() {} + CRemoteAircraftSelector::~CRemoteAircraftSelector() = default; swift::misc::aviation::CCallsign CRemoteAircraftSelector::getSelectedCallsign() const { diff --git a/src/gui/components/remoteaircraftselector.h b/src/gui/components/remoteaircraftselector.h index 41b0a9bd8..e6e0bed6b 100644 --- a/src/gui/components/remoteaircraftselector.h +++ b/src/gui/components/remoteaircraftselector.h @@ -40,7 +40,7 @@ namespace swift::gui::components explicit CRemoteAircraftSelector(QWidget *parent = nullptr); //! Destructor - virtual ~CRemoteAircraftSelector() override; + ~CRemoteAircraftSelector() override; //! Selected callsign swift::misc::aviation::CCallsign getSelectedCallsign() const; @@ -54,7 +54,7 @@ namespace swift::gui::components protected: //! \copydoc QWidget::showEvent - virtual void showEvent(QShowEvent *event) override; + void showEvent(QShowEvent *event) override; private: //! Added aircraft, change content of combobox diff --git a/src/gui/components/selcalcodeselector.cpp b/src/gui/components/selcalcodeselector.cpp index c86bd3db9..fb7f27874 100644 --- a/src/gui/components/selcalcodeselector.cpp +++ b/src/gui/components/selcalcodeselector.cpp @@ -34,7 +34,7 @@ namespace swift::gui::components &CSelcalCodeSelector::selcalIndexChanged); } - CSelcalCodeSelector::~CSelcalCodeSelector() {} + CSelcalCodeSelector::~CSelcalCodeSelector() = default; QString CSelcalCodeSelector::getSelcalCode() const { diff --git a/src/gui/components/selcalcodeselector.h b/src/gui/components/selcalcodeselector.h index ad356c0bb..966cab425 100644 --- a/src/gui/components/selcalcodeselector.h +++ b/src/gui/components/selcalcodeselector.h @@ -32,7 +32,7 @@ namespace swift::gui::components explicit CSelcalCodeSelector(QWidget *parent = nullptr); //! Destructor - virtual ~CSelcalCodeSelector(); + ~CSelcalCodeSelector() override; //! SELCAL code QString getSelcalCode() const; diff --git a/src/gui/components/settingsadvancedcomponent.cpp b/src/gui/components/settingsadvancedcomponent.cpp index 00e339d10..c9a7b57cf 100644 --- a/src/gui/components/settingsadvancedcomponent.cpp +++ b/src/gui/components/settingsadvancedcomponent.cpp @@ -20,7 +20,7 @@ namespace swift::gui::components &CSettingsAdvancedComponent::crashDumpUploadEnabledChanged); } - CSettingsAdvancedComponent::~CSettingsAdvancedComponent() {} + CSettingsAdvancedComponent::~CSettingsAdvancedComponent() = default; void CSettingsAdvancedComponent::crashDumpUploadEnabledChanged(Qt::CheckState state) { diff --git a/src/gui/components/settingsadvancedcomponent.h b/src/gui/components/settingsadvancedcomponent.h index b38284a5b..778b763e8 100644 --- a/src/gui/components/settingsadvancedcomponent.h +++ b/src/gui/components/settingsadvancedcomponent.h @@ -30,7 +30,7 @@ namespace swift::gui::components CSettingsAdvancedComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsAdvancedComponent(); + ~CSettingsAdvancedComponent() override; private: void crashDumpUploadEnabledChanged(Qt::CheckState state); diff --git a/src/gui/components/settingsfontcomponent.cpp b/src/gui/components/settingsfontcomponent.cpp index ea512824f..f18642f65 100644 --- a/src/gui/components/settingsfontcomponent.cpp +++ b/src/gui/components/settingsfontcomponent.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components connect(sGui, &CGuiApplication::startUpCompleted, this, &CSettingsFontComponent::initValues); } - CSettingsFontComponent::~CSettingsFontComponent() {} + CSettingsFontComponent::~CSettingsFontComponent() = default; void CSettingsFontComponent::setMode(CSettingsFontComponent::Mode m) { diff --git a/src/gui/components/settingsfontcomponent.h b/src/gui/components/settingsfontcomponent.h index 2356f7bd2..03db0e21a 100644 --- a/src/gui/components/settingsfontcomponent.h +++ b/src/gui/components/settingsfontcomponent.h @@ -33,7 +33,7 @@ namespace swift::gui::components explicit CSettingsFontComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsFontComponent() override; + ~CSettingsFontComponent() override; //! Set mode void setMode(Mode m); diff --git a/src/gui/components/settingsfontdialog.cpp b/src/gui/components/settingsfontdialog.cpp index 2ba8ce609..26af138e3 100644 --- a/src/gui/components/settingsfontdialog.cpp +++ b/src/gui/components/settingsfontdialog.cpp @@ -17,7 +17,7 @@ namespace swift::gui::components connect(ui->comp_FontSettings, &CSettingsFontComponent::reject, this, &CSettingsFontDialog::reject); } - CSettingsFontDialog::~CSettingsFontDialog() {} + CSettingsFontDialog::~CSettingsFontDialog() = default; const QString &CSettingsFontDialog::getQss() const { return ui->comp_FontSettings->getQss(); } diff --git a/src/gui/components/settingsfontdialog.h b/src/gui/components/settingsfontdialog.h index e256d2d49..4be4116f8 100644 --- a/src/gui/components/settingsfontdialog.h +++ b/src/gui/components/settingsfontdialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsFontDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsFontDialog() override; + ~CSettingsFontDialog() override; //! Get stylesheet const QString &getQss() const; diff --git a/src/gui/components/settingsguicomponent.cpp b/src/gui/components/settingsguicomponent.cpp index 0eef9bb7b..da697662a 100644 --- a/src/gui/components/settingsguicomponent.cpp +++ b/src/gui/components/settingsguicomponent.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components this->guiSettingsChanged(); } - CSettingsGuiComponent::~CSettingsGuiComponent() {} + CSettingsGuiComponent::~CSettingsGuiComponent() = default; void CSettingsGuiComponent::hideOpacity(bool hide) { diff --git a/src/gui/components/settingsguicomponent.h b/src/gui/components/settingsguicomponent.h index 68eaa1685..c4733b978 100644 --- a/src/gui/components/settingsguicomponent.h +++ b/src/gui/components/settingsguicomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsGuiComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsGuiComponent(); + ~CSettingsGuiComponent() override; //! Hide opacity elements void hideOpacity(bool hide); diff --git a/src/gui/components/settingshotkeycomponent.cpp b/src/gui/components/settingshotkeycomponent.cpp index 92f263072..63aaf0494 100644 --- a/src/gui/components/settingshotkeycomponent.cpp +++ b/src/gui/components/settingshotkeycomponent.cpp @@ -51,7 +51,7 @@ namespace swift::gui::components ui->tv_Hotkeys->selectRow(0); } - CSettingsHotkeyComponent::~CSettingsHotkeyComponent() {} + CSettingsHotkeyComponent::~CSettingsHotkeyComponent() = default; void CSettingsHotkeyComponent::saveSettings() { diff --git a/src/gui/components/settingshotkeycomponent.h b/src/gui/components/settingshotkeycomponent.h index 41a111ca5..75bdacdeb 100644 --- a/src/gui/components/settingshotkeycomponent.h +++ b/src/gui/components/settingshotkeycomponent.h @@ -35,7 +35,7 @@ namespace swift::gui::components CSettingsHotkeyComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsHotkeyComponent() override; + ~CSettingsHotkeyComponent() override; //! Save settings void saveSettings(); @@ -84,10 +84,10 @@ namespace swift::gui::components void setConfigComponent(CSettingsHotkeyComponent *config) { m_config = config; } //! \copydoc QWizardPage::validatePage - virtual bool validatePage() override; + bool validatePage() override; //! \copydoc QWizardPage::initializePage - virtual void initializePage() override; + void initializePage() override; private: CSettingsHotkeyComponent *m_config = nullptr; diff --git a/src/gui/components/settingsmatchingcomponent.cpp b/src/gui/components/settingsmatchingcomponent.cpp index 036bd8caa..aa5a0738e 100644 --- a/src/gui/components/settingsmatchingcomponent.cpp +++ b/src/gui/components/settingsmatchingcomponent.cpp @@ -38,7 +38,7 @@ namespace swift::gui::components else { this->showButtons(false); } } - CSettingsMatchingComponent::~CSettingsMatchingComponent() {} + CSettingsMatchingComponent::~CSettingsMatchingComponent() = default; CAircraftMatcherSetup CSettingsMatchingComponent::getMatchingSetup() const { return ui->form_Matching->value(); } diff --git a/src/gui/components/settingsmatchingcomponent.h b/src/gui/components/settingsmatchingcomponent.h index 84a3035a6..f2dda8501 100644 --- a/src/gui/components/settingsmatchingcomponent.h +++ b/src/gui/components/settingsmatchingcomponent.h @@ -31,7 +31,7 @@ namespace swift::gui::components explicit CSettingsMatchingComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsMatchingComponent() override; + ~CSettingsMatchingComponent() override; //! Get setup swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const; diff --git a/src/gui/components/settingsmatchingdialog.cpp b/src/gui/components/settingsmatchingdialog.cpp index 02f963463..c77b6e553 100644 --- a/src/gui/components/settingsmatchingdialog.cpp +++ b/src/gui/components/settingsmatchingdialog.cpp @@ -15,7 +15,7 @@ namespace swift::gui::components ui->setupUi(this); } - CSettingsMatchingDialog::~CSettingsMatchingDialog() {} + CSettingsMatchingDialog::~CSettingsMatchingDialog() = default; CAircraftMatcherSetup CSettingsMatchingDialog::getMatchingSetup() const { diff --git a/src/gui/components/settingsmatchingdialog.h b/src/gui/components/settingsmatchingdialog.h index 8ad88150a..f2b57bb66 100644 --- a/src/gui/components/settingsmatchingdialog.h +++ b/src/gui/components/settingsmatchingdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CSettingsMatchingDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsMatchingDialog(); + ~CSettingsMatchingDialog() override; //! Get setup swift::misc::simulation::CAircraftMatcherSetup getMatchingSetup() const; diff --git a/src/gui/components/settingsmodelcomponent.cpp b/src/gui/components/settingsmodelcomponent.cpp index 3a2d4d283..703c76b87 100644 --- a/src/gui/components/settingsmodelcomponent.cpp +++ b/src/gui/components/settingsmodelcomponent.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components }); } - CSettingsModelComponent::~CSettingsModelComponent() {} + CSettingsModelComponent::~CSettingsModelComponent() = default; int CSettingsModelComponent::getBackgroundUpdaterIntervallSecs() const { diff --git a/src/gui/components/settingsmodelcomponent.h b/src/gui/components/settingsmodelcomponent.h index 84bc59d34..14e1a88f8 100644 --- a/src/gui/components/settingsmodelcomponent.h +++ b/src/gui/components/settingsmodelcomponent.h @@ -33,7 +33,7 @@ namespace swift::gui::components explicit CSettingsModelComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsModelComponent(); + ~CSettingsModelComponent() override; //! Interval, -1 for disabled int getBackgroundUpdaterIntervallSecs() const; diff --git a/src/gui/components/settingsnetworkcomponent.cpp b/src/gui/components/settingsnetworkcomponent.cpp index 6aea9b328..626a2c0f3 100644 --- a/src/gui/components/settingsnetworkcomponent.cpp +++ b/src/gui/components/settingsnetworkcomponent.cpp @@ -20,5 +20,5 @@ namespace swift::gui::components ui->setupUi(this); } - CSettingsNetworkComponent::~CSettingsNetworkComponent() {} + CSettingsNetworkComponent::~CSettingsNetworkComponent() = default; } // namespace swift::gui::components diff --git a/src/gui/components/settingsnetworkcomponent.h b/src/gui/components/settingsnetworkcomponent.h index 95e416f5e..96e4759e7 100644 --- a/src/gui/components/settingsnetworkcomponent.h +++ b/src/gui/components/settingsnetworkcomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsNetworkComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsNetworkComponent(); + ~CSettingsNetworkComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/settingsnetworkserverscomponent.cpp b/src/gui/components/settingsnetworkserverscomponent.cpp index b3c19c1cc..79503a2fa 100644 --- a/src/gui/components/settingsnetworkserverscomponent.cpp +++ b/src/gui/components/settingsnetworkserverscomponent.cpp @@ -44,7 +44,7 @@ namespace swift::gui::components this->reloadSettings(); } - CSettingsNetworkServersComponent::~CSettingsNetworkServersComponent() {} + CSettingsNetworkServersComponent::~CSettingsNetworkServersComponent() = default; void CSettingsNetworkServersComponent::reloadSettings() { diff --git a/src/gui/components/settingsnetworkserverscomponent.h b/src/gui/components/settingsnetworkserverscomponent.h index ff03b4de4..11cf347e7 100644 --- a/src/gui/components/settingsnetworkserverscomponent.h +++ b/src/gui/components/settingsnetworkserverscomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsNetworkServersComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsNetworkServersComponent(); + ~CSettingsNetworkServersComponent() override; private: //! Reload settings diff --git a/src/gui/components/settingssimulatorbasicscomponent.cpp b/src/gui/components/settingssimulatorbasicscomponent.cpp index 44577e175..d3f012a31 100644 --- a/src/gui/components/settingssimulatorbasicscomponent.cpp +++ b/src/gui/components/settingssimulatorbasicscomponent.cpp @@ -58,7 +58,7 @@ namespace swift::gui::components this->onSimulatorChanged(); } - CSettingsSimulatorBasicsComponent::~CSettingsSimulatorBasicsComponent() {} + CSettingsSimulatorBasicsComponent::~CSettingsSimulatorBasicsComponent() = default; void CSettingsSimulatorBasicsComponent::hideSelector(bool show) { ui->comp_SimulatorSelector->setVisible(show); } diff --git a/src/gui/components/settingssimulatorbasicscomponent.h b/src/gui/components/settingssimulatorbasicscomponent.h index 9385c0fee..fffacc031 100644 --- a/src/gui/components/settingssimulatorbasicscomponent.h +++ b/src/gui/components/settingssimulatorbasicscomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CSettingsSimulatorBasicsComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsSimulatorBasicsComponent() override; + ~CSettingsSimulatorBasicsComponent() override; //! Show / hide selector void hideSelector(bool show); diff --git a/src/gui/components/settingssimulatorcomponent.cpp b/src/gui/components/settingssimulatorcomponent.cpp index 6d04a9580..c2f4c8c24 100644 --- a/src/gui/components/settingssimulatorcomponent.cpp +++ b/src/gui/components/settingssimulatorcomponent.cpp @@ -120,7 +120,7 @@ namespace swift::gui::components } } - CSettingsSimulatorComponent::~CSettingsSimulatorComponent() {} + CSettingsSimulatorComponent::~CSettingsSimulatorComponent() = default; void CSettingsSimulatorComponent::setGuiValues() { diff --git a/src/gui/components/settingssimulatorcomponent.h b/src/gui/components/settingssimulatorcomponent.h index 6ea9acf4a..a533df38c 100644 --- a/src/gui/components/settingssimulatorcomponent.h +++ b/src/gui/components/settingssimulatorcomponent.h @@ -41,7 +41,7 @@ namespace swift::gui::components explicit CSettingsSimulatorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsSimulatorComponent() override; + ~CSettingsSimulatorComponent() override; private: //! Driver plugin enabled/disabled diff --git a/src/gui/components/settingssimulatormessagescomponent.cpp b/src/gui/components/settingssimulatormessagescomponent.cpp index 6b851449b..8648f59b8 100644 --- a/src/gui/components/settingssimulatormessagescomponent.cpp +++ b/src/gui/components/settingssimulatormessagescomponent.cpp @@ -25,7 +25,7 @@ namespace swift::gui::components this->load(); } - CSettingsSimulatorMessagesComponent::~CSettingsSimulatorMessagesComponent() {} + CSettingsSimulatorMessagesComponent::~CSettingsSimulatorMessagesComponent() = default; void CSettingsSimulatorMessagesComponent::save() { diff --git a/src/gui/components/settingssimulatormessagescomponent.h b/src/gui/components/settingssimulatormessagescomponent.h index e905630f2..6b82b33dd 100644 --- a/src/gui/components/settingssimulatormessagescomponent.h +++ b/src/gui/components/settingssimulatormessagescomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsSimulatorMessagesComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsSimulatorMessagesComponent() override; + ~CSettingsSimulatorMessagesComponent() override; private: //! Save the data diff --git a/src/gui/components/settingsswiftplugin.cpp b/src/gui/components/settingsswiftplugin.cpp index b3a002263..0bec9e94b 100644 --- a/src/gui/components/settingsswiftplugin.cpp +++ b/src/gui/components/settingsswiftplugin.cpp @@ -22,7 +22,7 @@ namespace swift::gui::components connect(ui->pb_Save, &QPushButton::clicked, this, &CSettingsSwiftPlugin::save); } - CSettingsSwiftPlugin::~CSettingsSwiftPlugin() {} + CSettingsSwiftPlugin::~CSettingsSwiftPlugin() = default; swift::misc::simulation::settings::CSwiftPluginSettings CSettingsSwiftPlugin::getPluginSettings() const { diff --git a/src/gui/components/settingsswiftplugin.h b/src/gui/components/settingsswiftplugin.h index 5ff2287e3..1a5ee303f 100644 --- a/src/gui/components/settingsswiftplugin.h +++ b/src/gui/components/settingsswiftplugin.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsSwiftPlugin(QWidget *parent = nullptr); //! Dtor - virtual ~CSettingsSwiftPlugin(); + ~CSettingsSwiftPlugin() override; //! Get the plugin settings swift::misc::simulation::settings::CSwiftPluginSettings getPluginSettings() const; diff --git a/src/gui/components/settingstextmessageinlinecomponent.cpp b/src/gui/components/settingstextmessageinlinecomponent.cpp index 22a866abc..c6885e8f8 100644 --- a/src/gui/components/settingstextmessageinlinecomponent.cpp +++ b/src/gui/components/settingstextmessageinlinecomponent.cpp @@ -34,7 +34,7 @@ namespace swift::gui::components this->settingsChanged(); } - CSettingsTextMessageInlineComponent::~CSettingsTextMessageInlineComponent() {} + CSettingsTextMessageInlineComponent::~CSettingsTextMessageInlineComponent() = default; void CSettingsTextMessageInlineComponent::settingsChanged() { diff --git a/src/gui/components/settingstextmessageinlinecomponent.h b/src/gui/components/settingstextmessageinlinecomponent.h index 3c7d17f07..e1a21c724 100644 --- a/src/gui/components/settingstextmessageinlinecomponent.h +++ b/src/gui/components/settingstextmessageinlinecomponent.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsTextMessageInlineComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsTextMessageInlineComponent(); + ~CSettingsTextMessageInlineComponent() override; private: //! Settings have been changed diff --git a/src/gui/components/settingstextmessagestyle.cpp b/src/gui/components/settingstextmessagestyle.cpp index 47d839cbb..615eb281e 100644 --- a/src/gui/components/settingstextmessagestyle.cpp +++ b/src/gui/components/settingstextmessagestyle.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components // &CSettingsTextMessageStyle::fontSizePlus); } - CSettingsTextMessageStyle::~CSettingsTextMessageStyle() {} + CSettingsTextMessageStyle::~CSettingsTextMessageStyle() = default; QStringList CSettingsTextMessageStyle::getFamilySizeStyle() const { diff --git a/src/gui/components/settingstextmessagestyle.h b/src/gui/components/settingstextmessagestyle.h index 806f9ab38..5f6d36200 100644 --- a/src/gui/components/settingstextmessagestyle.h +++ b/src/gui/components/settingstextmessagestyle.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CSettingsTextMessageStyle(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsTextMessageStyle() override; + ~CSettingsTextMessageStyle() override; //! Fmily, size and style QStringList getFamilySizeStyle() const; diff --git a/src/gui/components/settingsvatsimreaderscomponent.cpp b/src/gui/components/settingsvatsimreaderscomponent.cpp index bcc142cd7..4af8103d3 100644 --- a/src/gui/components/settingsvatsimreaderscomponent.cpp +++ b/src/gui/components/settingsvatsimreaderscomponent.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components this->initValues(); } - CSettingsVatsimReadersComponent::~CSettingsVatsimReadersComponent() {} + CSettingsVatsimReadersComponent::~CSettingsVatsimReadersComponent() = default; void CSettingsVatsimReadersComponent::onSettingsChanged() { this->initValues(); } diff --git a/src/gui/components/settingsvatsimreaderscomponent.h b/src/gui/components/settingsvatsimreaderscomponent.h index 6e761707e..37054f2ec 100644 --- a/src/gui/components/settingsvatsimreaderscomponent.h +++ b/src/gui/components/settingsvatsimreaderscomponent.h @@ -30,7 +30,7 @@ namespace swift::gui::components explicit CSettingsVatsimReadersComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsVatsimReadersComponent(); + ~CSettingsVatsimReadersComponent() override; private: void onSettingsChanged(); diff --git a/src/gui/components/settingsviewupdatetimes.cpp b/src/gui/components/settingsviewupdatetimes.cpp index 341705984..3127819cb 100644 --- a/src/gui/components/settingsviewupdatetimes.cpp +++ b/src/gui/components/settingsviewupdatetimes.cpp @@ -24,7 +24,7 @@ namespace swift::gui::components this->ps_settingsChanged(); } - CSettingsViewUpdateTimes::~CSettingsViewUpdateTimes() {} + CSettingsViewUpdateTimes::~CSettingsViewUpdateTimes() = default; void CSettingsViewUpdateTimes::ps_sliderChanged() { diff --git a/src/gui/components/settingsviewupdatetimes.h b/src/gui/components/settingsviewupdatetimes.h index fc8bfba0e..dea20a88b 100644 --- a/src/gui/components/settingsviewupdatetimes.h +++ b/src/gui/components/settingsviewupdatetimes.h @@ -28,7 +28,7 @@ namespace swift::gui::components explicit CSettingsViewUpdateTimes(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsViewUpdateTimes(); + ~CSettingsViewUpdateTimes() override; private slots: //! Slider changed diff --git a/src/gui/components/settingsxswiftbuscomponent.cpp b/src/gui/components/settingsxswiftbuscomponent.cpp index 245aec21d..a8c592572 100644 --- a/src/gui/components/settingsxswiftbuscomponent.cpp +++ b/src/gui/components/settingsxswiftbuscomponent.cpp @@ -36,7 +36,7 @@ namespace swift::gui::components ui->comp_DBusServer->set(dBusAddress); } - CSettingsXSwiftBusComponent::~CSettingsXSwiftBusComponent() {} + CSettingsXSwiftBusComponent::~CSettingsXSwiftBusComponent() = default; void CSettingsXSwiftBusComponent::resetServer() { diff --git a/src/gui/components/settingsxswiftbuscomponent.h b/src/gui/components/settingsxswiftbuscomponent.h index d58c6ad05..9a699d70d 100644 --- a/src/gui/components/settingsxswiftbuscomponent.h +++ b/src/gui/components/settingsxswiftbuscomponent.h @@ -35,7 +35,7 @@ namespace swift::gui::components explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CSettingsXSwiftBusComponent() override; + ~CSettingsXSwiftBusComponent() override; private: QScopedPointer ui; diff --git a/src/gui/components/setuploadingdialog.cpp b/src/gui/components/setuploadingdialog.cpp index 198467429..a1816fef9 100644 --- a/src/gui/components/setuploadingdialog.cpp +++ b/src/gui/components/setuploadingdialog.cpp @@ -40,5 +40,5 @@ namespace swift::gui::components ui->comp_Messages->appendStatusMessagesToList(msgs); } - CSetupLoadingDialog::~CSetupLoadingDialog() {} + CSetupLoadingDialog::~CSetupLoadingDialog() = default; } // namespace swift::gui::components diff --git a/src/gui/components/setuploadingdialog.h b/src/gui/components/setuploadingdialog.h index 64af8dc12..122f23b30 100644 --- a/src/gui/components/setuploadingdialog.h +++ b/src/gui/components/setuploadingdialog.h @@ -28,7 +28,7 @@ namespace swift::gui::components CSetupLoadingDialog(const swift::misc::CStatusMessageList &msgs, QWidget *parent = nullptr); //! Dtor - virtual ~CSetupLoadingDialog(); + ~CSetupLoadingDialog() override; private: QScopedPointer ui; diff --git a/src/gui/components/simbriefdownloaddialog.cpp b/src/gui/components/simbriefdownloaddialog.cpp index 4256dbf75..e4f0de699 100644 --- a/src/gui/components/simbriefdownloaddialog.cpp +++ b/src/gui/components/simbriefdownloaddialog.cpp @@ -16,7 +16,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CSimBriefDownloadDialog::~CSimBriefDownloadDialog() {} + CSimBriefDownloadDialog::~CSimBriefDownloadDialog() = default; CSimBriefData CSimBriefDownloadDialog::getSimBriefData() const { diff --git a/src/gui/components/simbriefdownloaddialog.h b/src/gui/components/simbriefdownloaddialog.h index f358cf197..bf0c005d2 100644 --- a/src/gui/components/simbriefdownloaddialog.h +++ b/src/gui/components/simbriefdownloaddialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CSimBriefDownloadDialog(QWidget *parent = nullptr); //! Dtor - virtual ~CSimBriefDownloadDialog() override; + ~CSimBriefDownloadDialog() override; //! SimBrief data swift::misc::aviation::CSimBriefData getSimBriefData() const; @@ -36,7 +36,7 @@ namespace swift::gui::components void setSimBriefData(const swift::misc::aviation::CSimBriefData &data); //! \copydoc QDialog::exec - virtual int exec() override; + int exec() override; private: QScopedPointer ui; diff --git a/src/gui/components/simulatorcomponent.cpp b/src/gui/components/simulatorcomponent.cpp index 332d3c158..7a38bc8e5 100644 --- a/src/gui/components/simulatorcomponent.cpp +++ b/src/gui/components/simulatorcomponent.cpp @@ -71,7 +71,7 @@ namespace swift::gui::components this->onSimulatorStatusChanged(sGui->getIContextSimulator()->getSimulatorStatus()); } - CSimulatorComponent::~CSimulatorComponent() {} + CSimulatorComponent::~CSimulatorComponent() = default; void CSimulatorComponent::addOrUpdateLiveDataByName(const QString &name, const QString &value, const CIcon &icon) { diff --git a/src/gui/components/simulatorcomponent.h b/src/gui/components/simulatorcomponent.h index 733f50c7d..0a10bacff 100644 --- a/src/gui/components/simulatorcomponent.h +++ b/src/gui/components/simulatorcomponent.h @@ -47,7 +47,7 @@ namespace swift::gui::components explicit CSimulatorComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSimulatorComponent(); + ~CSimulatorComponent() override; //! Number of entries int rowCount() const; diff --git a/src/gui/components/simulatorselector.cpp b/src/gui/components/simulatorselector.cpp index 5377ed2ba..a96a5ecfa 100644 --- a/src/gui/components/simulatorselector.cpp +++ b/src/gui/components/simulatorselector.cpp @@ -51,7 +51,7 @@ namespace swift::gui::components connect(ui->cb_Simulators, &QComboBox::currentTextChanged, this, &CSimulatorSelector::comboBoxChanged); } - CSimulatorSelector::~CSimulatorSelector() {} + CSimulatorSelector::~CSimulatorSelector() = default; void CSimulatorSelector::setMode(CSimulatorSelector::Mode mode, bool forced) { diff --git a/src/gui/components/simulatorselector.h b/src/gui/components/simulatorselector.h index a9fff16b1..ceabdc3cb 100644 --- a/src/gui/components/simulatorselector.h +++ b/src/gui/components/simulatorselector.h @@ -41,7 +41,7 @@ namespace swift::gui::components explicit CSimulatorSelector(QWidget *parent = nullptr); //! Destructor - virtual ~CSimulatorSelector() override; + ~CSimulatorSelector() override; //! How to display void setMode(Mode mode, bool forced = false); diff --git a/src/gui/components/statusmessageform.cpp b/src/gui/components/statusmessageform.cpp index e5f9eac07..dc3d47704 100644 --- a/src/gui/components/statusmessageform.cpp +++ b/src/gui/components/statusmessageform.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components ui->setupUi(this); } - CStatusMessageForm::~CStatusMessageForm() {} + CStatusMessageForm::~CStatusMessageForm() = default; void CStatusMessageForm::setVariant(const CVariant &messageVariant) { diff --git a/src/gui/components/statusmessageform.h b/src/gui/components/statusmessageform.h index 79c548ead..70dd1d415 100644 --- a/src/gui/components/statusmessageform.h +++ b/src/gui/components/statusmessageform.h @@ -34,7 +34,7 @@ namespace swift::gui::components explicit CStatusMessageForm(QWidget *parent = nullptr); //! Destructor - virtual ~CStatusMessageForm(); + ~CStatusMessageForm() override; //! Set message void setVariant(const swift::misc::CVariant &messageVariant); diff --git a/src/gui/components/statusmessageformsmall.cpp b/src/gui/components/statusmessageformsmall.cpp index ae8c48352..0c7edb4de 100644 --- a/src/gui/components/statusmessageformsmall.cpp +++ b/src/gui/components/statusmessageformsmall.cpp @@ -21,7 +21,7 @@ namespace swift::gui::components ui->setupUi(this); } - CStatusMessageFormSmall::~CStatusMessageFormSmall() {} + CStatusMessageFormSmall::~CStatusMessageFormSmall() = default; void CStatusMessageFormSmall::setVariant(const CVariant &messageVariant) { diff --git a/src/gui/components/statusmessageformsmall.h b/src/gui/components/statusmessageformsmall.h index 4c27a4d55..f45816e46 100644 --- a/src/gui/components/statusmessageformsmall.h +++ b/src/gui/components/statusmessageformsmall.h @@ -32,7 +32,7 @@ namespace swift::gui::components explicit CStatusMessageFormSmall(QWidget *parent = nullptr); //! Destructor - virtual ~CStatusMessageFormSmall(); + ~CStatusMessageFormSmall() override; //! Set message void setVariant(const swift::misc::CVariant &messageVariant); diff --git a/src/gui/components/statusmessagesdetail.cpp b/src/gui/components/statusmessagesdetail.cpp index 355decb53..338fd92f2 100644 --- a/src/gui/components/statusmessagesdetail.cpp +++ b/src/gui/components/statusmessagesdetail.cpp @@ -33,7 +33,7 @@ namespace swift::gui::components }); } - CStatusMessagesDetail::~CStatusMessagesDetail() {} + CStatusMessagesDetail::~CStatusMessagesDetail() = default; void CStatusMessagesDetail::appendStatusMessageToList(const CStatusMessage &message) { diff --git a/src/gui/components/statusmessagesdetail.h b/src/gui/components/statusmessagesdetail.h index abe699065..e334de250 100644 --- a/src/gui/components/statusmessagesdetail.h +++ b/src/gui/components/statusmessagesdetail.h @@ -32,7 +32,7 @@ namespace swift::gui::components explicit CStatusMessagesDetail(QWidget *parent = nullptr); //! Destructor - virtual ~CStatusMessagesDetail() override; + ~CStatusMessagesDetail() override; //! Add message void appendStatusMessageToList(const swift::misc::CStatusMessage &message); @@ -97,7 +97,7 @@ namespace swift::gui::components CMessageMenu(CStatusMessagesDetail *parent) : IMenuDelegate(parent) {} //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: QAction *m_action = nullptr; diff --git a/src/gui/components/stringlistdialog.cpp b/src/gui/components/stringlistdialog.cpp index abd9d7288..a2db013d5 100644 --- a/src/gui/components/stringlistdialog.cpp +++ b/src/gui/components/stringlistdialog.cpp @@ -14,7 +14,7 @@ namespace swift::gui::components ui->lw_StringList->setSelectionMode(QAbstractItemView::SingleSelection); } - CStringListDialog::~CStringListDialog() {} + CStringListDialog::~CStringListDialog() = default; void CStringListDialog::setStrings(const QStringList &strings) { diff --git a/src/gui/components/stringlistdialog.h b/src/gui/components/stringlistdialog.h index 39d66d5be..9f7ad69a8 100644 --- a/src/gui/components/stringlistdialog.h +++ b/src/gui/components/stringlistdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::components explicit CStringListDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CStringListDialog() override; + ~CStringListDialog() override; //! Strings void setStrings(const QStringList &strings); diff --git a/src/gui/components/texteditdialog.cpp b/src/gui/components/texteditdialog.cpp index aa05e962d..51296dab2 100644 --- a/src/gui/components/texteditdialog.cpp +++ b/src/gui/components/texteditdialog.cpp @@ -13,7 +13,7 @@ namespace swift::gui::components this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); } - CTextEditDialog::~CTextEditDialog() {} + CTextEditDialog::~CTextEditDialog() = default; QTextEdit *CTextEditDialog::textEdit() const { return ui->te_TextEdit; } diff --git a/src/gui/components/texteditdialog.h b/src/gui/components/texteditdialog.h index f08353e22..06a4ad0cd 100644 --- a/src/gui/components/texteditdialog.h +++ b/src/gui/components/texteditdialog.h @@ -29,7 +29,7 @@ namespace swift::gui::components explicit CTextEditDialog(QWidget *parent = nullptr); //! Dtor - virtual ~CTextEditDialog() override; + ~CTextEditDialog() override; //! Access to text edit QTextEdit *textEdit() const; diff --git a/src/gui/components/textmessagecomponent.cpp b/src/gui/components/textmessagecomponent.cpp index 87c24172c..5e2cc00c3 100644 --- a/src/gui/components/textmessagecomponent.cpp +++ b/src/gui/components/textmessagecomponent.cpp @@ -125,7 +125,7 @@ namespace swift::gui::components }); } - CTextMessageComponent::~CTextMessageComponent() {} + CTextMessageComponent::~CTextMessageComponent() = default; bool CTextMessageComponent::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) { diff --git a/src/gui/components/textmessagecomponent.h b/src/gui/components/textmessagecomponent.h index 6ec78e6cc..dac152a46 100644 --- a/src/gui/components/textmessagecomponent.h +++ b/src/gui/components/textmessagecomponent.h @@ -43,10 +43,10 @@ namespace swift::gui explicit CTextMessageComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CTextMessageComponent() override; + ~CTextMessageComponent() override; //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) override; //! Used to allow direct input from global command line when visible //! \remark takes the messages, turns it into a ".msg" command, and emits it diff --git a/src/gui/components/transpondercodespinbox.h b/src/gui/components/transpondercodespinbox.h index e02b8ba24..c5c192f2f 100644 --- a/src/gui/components/transpondercodespinbox.h +++ b/src/gui/components/transpondercodespinbox.h @@ -23,7 +23,7 @@ namespace swift::gui::components explicit CTransponderCodeSpinBox(QWidget *parent = nullptr); //! \copydoc QDoubleSpinBox::textFromValue - virtual QString textFromValue(int value) const override; + QString textFromValue(int value) const override; }; } // namespace swift::gui::components diff --git a/src/gui/components/transpondermodecomponent.cpp b/src/gui/components/transpondermodecomponent.cpp index 9efcd0364..577fdcafb 100644 --- a/src/gui/components/transpondermodecomponent.cpp +++ b/src/gui/components/transpondermodecomponent.cpp @@ -42,7 +42,7 @@ namespace swift::gui::components }); } - CTransponderModeComponent::~CTransponderModeComponent() {} + CTransponderModeComponent::~CTransponderModeComponent() = default; void CTransponderModeComponent::init() { diff --git a/src/gui/components/transpondermodecomponent.h b/src/gui/components/transpondermodecomponent.h index 219083d30..693af3370 100644 --- a/src/gui/components/transpondermodecomponent.h +++ b/src/gui/components/transpondermodecomponent.h @@ -38,7 +38,7 @@ namespace swift::gui::components explicit CTransponderModeComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CTransponderModeComponent() override; + ~CTransponderModeComponent() override; signals: //! value has been changed diff --git a/src/gui/components/updateinfocomponent.cpp b/src/gui/components/updateinfocomponent.cpp index cc8f4fac8..02f89df92 100644 --- a/src/gui/components/updateinfocomponent.cpp +++ b/src/gui/components/updateinfocomponent.cpp @@ -43,7 +43,7 @@ namespace swift::gui::components if (!m_updateInfo.get().isEmpty()) { this->changedUpdateInfo(); } } - CUpdateInfoComponent::~CUpdateInfoComponent() {} + CUpdateInfoComponent::~CUpdateInfoComponent() = default; CArtifact CUpdateInfoComponent::getLatestAvailablePilotClientArtifactForSelection() const { diff --git a/src/gui/components/updateinfocomponent.h b/src/gui/components/updateinfocomponent.h index 92147126e..9d75f2994 100644 --- a/src/gui/components/updateinfocomponent.h +++ b/src/gui/components/updateinfocomponent.h @@ -36,7 +36,7 @@ namespace swift::gui::components explicit CUpdateInfoComponent(QWidget *parent = nullptr); //! Dtor - virtual ~CUpdateInfoComponent() override; + ~CUpdateInfoComponent() override; //! Is there a new version available return version, else empty string swift::misc::db::CArtifact getLatestAvailablePilotClientArtifactForSelection() const; diff --git a/src/gui/components/updateinfodialog.cpp b/src/gui/components/updateinfodialog.cpp index 0643ec32c..84e782b5e 100644 --- a/src/gui/components/updateinfodialog.cpp +++ b/src/gui/components/updateinfodialog.cpp @@ -25,7 +25,7 @@ namespace swift::gui::components connect(ui->cb_DontShowAgain, &QCheckBox::toggled, this, &CUpdateInfoDialog::onDontShowAgain); } - CUpdateInfoDialog::~CUpdateInfoDialog() {} + CUpdateInfoDialog::~CUpdateInfoDialog() = default; bool CUpdateInfoDialog::isNewVersionAvailable() const { diff --git a/src/gui/components/updateinfodialog.h b/src/gui/components/updateinfodialog.h index e5c7af1c4..0459f9494 100644 --- a/src/gui/components/updateinfodialog.h +++ b/src/gui/components/updateinfodialog.h @@ -29,13 +29,13 @@ namespace swift::gui::components explicit CUpdateInfoDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CUpdateInfoDialog() override; + ~CUpdateInfoDialog() override; //! A new version existing? bool isNewVersionAvailable() const; //! \copydoc QDialog::exec - virtual int exec() override; + int exec() override; private: QScopedPointer ui; diff --git a/src/gui/components/usercomponent.cpp b/src/gui/components/usercomponent.cpp index 9e01ab05a..612cf329e 100644 --- a/src/gui/components/usercomponent.cpp +++ b/src/gui/components/usercomponent.cpp @@ -42,7 +42,7 @@ namespace swift::gui::components this->onSettingsChanged(); } - CUserComponent::~CUserComponent() {} + CUserComponent::~CUserComponent() = default; int CUserComponent::countClients() const { diff --git a/src/gui/components/usercomponent.h b/src/gui/components/usercomponent.h index bc0cf6bb7..bb21631a9 100644 --- a/src/gui/components/usercomponent.h +++ b/src/gui/components/usercomponent.h @@ -34,7 +34,7 @@ namespace swift::gui::components explicit CUserComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CUserComponent() override; + ~CUserComponent() override; //! Number of clients int countClients() const; diff --git a/src/gui/dockwidget.h b/src/gui/dockwidget.h index cbb20f5ce..f42b89ae3 100644 --- a/src/gui/dockwidget.h +++ b/src/gui/dockwidget.h @@ -97,7 +97,7 @@ namespace swift::gui void setOffsetWhenFloating(const QPoint &point, bool frameless); //! \copydoc CEnableForFramelessWindow::setFrameless - virtual void setFrameless(bool frameless) override; + void setFrameless(bool frameless) override; //! Toggle floating void toggleFloating(); @@ -198,19 +198,19 @@ namespace swift::gui void setAlwaysOnTopFlag(bool onTop); //! \copydoc QWidget::closeEvent - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; //! \copydoc QWidget::paintEvent - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; //! \copydoc QWidget::mouseMoveEvent - virtual void mouseMoveEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; //! \copydoc QWidget::mouseMoveEvent - virtual void keyPressEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; //! \copydoc QWidget::mousePressEvent - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; //! Contribute to menu virtual void addToContextMenu(QMenu *contextMenu) const; diff --git a/src/gui/dockwidgetinfoarea.h b/src/gui/dockwidgetinfoarea.h index 6942f9689..17397ccbb 100644 --- a/src/gui/dockwidgetinfoarea.h +++ b/src/gui/dockwidgetinfoarea.h @@ -45,10 +45,10 @@ namespace swift::gui //! Contribute to menu //! \remarks made public so other classes can nest this submenu - virtual void addToContextMenu(QMenu *contextMenu) const override; + void addToContextMenu(QMenu *contextMenu) const override; //! \copydoc CDockWidget::initialFloating - virtual void initialFloating() override; + void initialFloating() override; private: //! Find all embedded dock widget components. These are components marked as CDockWidgetInfoAreaComponent diff --git a/src/gui/dockwidgetinfobar.h b/src/gui/dockwidgetinfobar.h index e88dcf873..705cbcf0b 100644 --- a/src/gui/dockwidgetinfobar.h +++ b/src/gui/dockwidgetinfobar.h @@ -31,15 +31,15 @@ namespace swift::gui //! \copydoc CDockWidget::initialFloating //! \remark special case to allow init - virtual void initialFloating() override { CDockWidget::initialFloating(); } + void initialFloating() override { CDockWidget::initialFloating(); } protected: //! Contribute to menu - virtual void addToContextMenu(QMenu *contextMenu) const override; + void addToContextMenu(QMenu *contextMenu) const override; protected: //! \copydoc CDockWidget::onStyleSheetsChanged - virtual void onStyleSheetsChanged() override; + void onStyleSheetsChanged() override; }; } // namespace swift::gui diff --git a/src/gui/dropbase.cpp b/src/gui/dropbase.cpp index 4f06ed112..5d73e4739 100644 --- a/src/gui/dropbase.cpp +++ b/src/gui/dropbase.cpp @@ -13,10 +13,6 @@ using namespace swift::misc; namespace swift::gui { - CDropBase::CDropBase() {} - - CDropBase::~CDropBase() {} - void CDropBase::setAcceptedMetaTypeIds(const QList &ids) { m_acceptedMetaTypes = ids; } void CDropBase::addAcceptedMetaTypeId(int id) { m_acceptedMetaTypes.append(id); } diff --git a/src/gui/dropbase.h b/src/gui/dropbase.h index a7af6c897..cf4e69910 100644 --- a/src/gui/dropbase.h +++ b/src/gui/dropbase.h @@ -19,7 +19,7 @@ namespace swift::gui { public: //! Dtor - virtual ~CDropBase(); + virtual ~CDropBase() = default; //! Accepted ids void setAcceptedMetaTypeIds(const QList &ids); @@ -47,7 +47,7 @@ namespace swift::gui protected: //! Ctor - CDropBase(); + CDropBase() = default; private: bool m_allowDrop = true; //!< dropping allowed? diff --git a/src/gui/dropsite.h b/src/gui/dropsite.h index 1949f847f..b986ef14b 100644 --- a/src/gui/dropsite.h +++ b/src/gui/dropsite.h @@ -48,16 +48,16 @@ namespace swift::gui protected: //! \copydoc QWidget::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QWidget::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QWidget::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QWidget::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; private: //! Style has been changed diff --git a/src/gui/ecosystemcombobox.h b/src/gui/ecosystemcombobox.h index 52fed5714..009885bdf 100644 --- a/src/gui/ecosystemcombobox.h +++ b/src/gui/ecosystemcombobox.h @@ -25,7 +25,7 @@ namespace swift::gui CEcosystemComboBox(const swift::misc::network::CEcosystemList &systems, QWidget *parent = nullptr); //! Destructor - virtual ~CEcosystemComboBox() {} + ~CEcosystemComboBox() override = default; //! The selected ecosystem swift::misc::network::CEcosystem getSelectedEcosystem() const; diff --git a/src/gui/editors/aircrafticaoform.cpp b/src/gui/editors/aircrafticaoform.cpp index d84eb5692..fbef4b9c8 100644 --- a/src/gui/editors/aircrafticaoform.cpp +++ b/src/gui/editors/aircrafticaoform.cpp @@ -54,7 +54,7 @@ namespace swift::gui::editors { qMetaTypeId(), qMetaTypeId() }); } - CAircraftIcaoForm::~CAircraftIcaoForm() {} + CAircraftIcaoForm::~CAircraftIcaoForm() = default; bool CAircraftIcaoForm::setValue(const swift::misc::aviation::CAircraftIcaoCode &icao) { diff --git a/src/gui/editors/aircrafticaoform.h b/src/gui/editors/aircrafticaoform.h index aa8497796..5df133b93 100644 --- a/src/gui/editors/aircrafticaoform.h +++ b/src/gui/editors/aircrafticaoform.h @@ -33,7 +33,7 @@ namespace swift::gui::editors explicit CAircraftIcaoForm(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftIcaoForm() override; + ~CAircraftIcaoForm() override; //! Get value swift::misc::aviation::CAircraftIcaoCode getValue() const; @@ -46,9 +46,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Clear @@ -63,7 +63,7 @@ namespace swift::gui::editors protected: //! \copydoc CForm::jsonPasted - virtual void jsonPasted(const QString &json) override; + void jsonPasted(const QString &json) override; private: QScopedPointer ui; diff --git a/src/gui/editors/aircraftmodelform.cpp b/src/gui/editors/aircraftmodelform.cpp index 52bf3dd1e..aca9c7e53 100644 --- a/src/gui/editors/aircraftmodelform.cpp +++ b/src/gui/editors/aircraftmodelform.cpp @@ -15,7 +15,7 @@ namespace swift::gui::editors this->setFocusProxy(ui->editor_AircraftIcao); } - CAircraftModelForm::~CAircraftModelForm() {} + CAircraftModelForm::~CAircraftModelForm() = default; void CAircraftModelForm::setReadOnly(bool readOnly) { diff --git a/src/gui/editors/aircraftmodelform.h b/src/gui/editors/aircraftmodelform.h index 2e573c386..02935a859 100644 --- a/src/gui/editors/aircraftmodelform.h +++ b/src/gui/editors/aircraftmodelform.h @@ -29,19 +29,19 @@ namespace swift::gui::editors explicit CAircraftModelForm(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelForm() override; + ~CAircraftModelForm() override; //! Allow to drop data void allowDrop(bool allowDrop); //! \copydoc swift::gui::editors::CForm::setReadOnly - virtual void setReadOnly(bool readOnly) override; + void setReadOnly(bool readOnly) override; //! \copydoc swift::gui::editors::CForm::setSelectOnly - virtual void setSelectOnly() override; + void setSelectOnly() override; //! \copydoc swift::gui::editors::CForm::validate - virtual swift::misc::CStatusMessageList validate(bool withNestedForms = true) const override; + swift::misc::CStatusMessageList validate(bool withNestedForms = true) const override; //! \copydoc swift::gui::editors::CForm::validate virtual swift::misc::CStatusMessageList validateLivery(bool withNestedForms = true) const; diff --git a/src/gui/editors/aircraftpartsform.cpp b/src/gui/editors/aircraftpartsform.cpp index bbaae9615..889d90a8f 100644 --- a/src/gui/editors/aircraftpartsform.cpp +++ b/src/gui/editors/aircraftpartsform.cpp @@ -32,7 +32,7 @@ namespace swift::gui::editors &CAircraftPartsForm::changeAircraftParts); // force change signal } - CAircraftPartsForm::~CAircraftPartsForm() {} + CAircraftPartsForm::~CAircraftPartsForm() = default; void CAircraftPartsForm::setReadOnly(bool readonly) { diff --git a/src/gui/editors/aircraftpartsform.h b/src/gui/editors/aircraftpartsform.h index f26f48f16..9b879552d 100644 --- a/src/gui/editors/aircraftpartsform.h +++ b/src/gui/editors/aircraftpartsform.h @@ -31,13 +31,13 @@ namespace swift::gui::editors explicit CAircraftPartsForm(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftPartsForm() override; + ~CAircraftPartsForm() override; //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Get the parts diff --git a/src/gui/editors/airlineicaoform.cpp b/src/gui/editors/airlineicaoform.cpp index 83c73651c..e4aa5887d 100644 --- a/src/gui/editors/airlineicaoform.cpp +++ b/src/gui/editors/airlineicaoform.cpp @@ -53,7 +53,7 @@ namespace swift::gui::editors { qMetaTypeId(), qMetaTypeId() }); } - CAirlineIcaoForm::~CAirlineIcaoForm() {} + CAirlineIcaoForm::~CAirlineIcaoForm() = default; void CAirlineIcaoForm::setValue(const CAirlineIcaoCode &icao) { diff --git a/src/gui/editors/airlineicaoform.h b/src/gui/editors/airlineicaoform.h index 4ef7271b6..0d9c88304 100644 --- a/src/gui/editors/airlineicaoform.h +++ b/src/gui/editors/airlineicaoform.h @@ -34,7 +34,7 @@ namespace swift::gui::editors explicit CAirlineIcaoForm(QWidget *parent = nullptr); //! Destructor - virtual ~CAirlineIcaoForm() override; + ~CAirlineIcaoForm() override; //! Set value void setValue(const swift::misc::aviation::CAirlineIcaoCode &icao = swift::misc::aviation::CAirlineIcaoCode()); @@ -50,9 +50,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Clear @@ -70,7 +70,7 @@ namespace swift::gui::editors protected: //! \copydoc CForm::jsonPasted - virtual void jsonPasted(const QString &json) override; + void jsonPasted(const QString &json) override; //! Variant has been dropped void onDroppedCode(const swift::misc::CVariant &variantDropped); diff --git a/src/gui/editors/cockpitcomform.cpp b/src/gui/editors/cockpitcomform.cpp index b9e6896e1..ea2d4d1d3 100644 --- a/src/gui/editors/cockpitcomform.cpp +++ b/src/gui/editors/cockpitcomform.cpp @@ -66,7 +66,7 @@ namespace swift::gui::editors this->initLeds(); } - CCockpitComForm::~CCockpitComForm() {} + CCockpitComForm::~CCockpitComForm() = default; void CCockpitComForm::setReadOnly(bool readonly) { diff --git a/src/gui/editors/cockpitcomform.h b/src/gui/editors/cockpitcomform.h index 089298a3a..8b6c052e1 100644 --- a/src/gui/editors/cockpitcomform.h +++ b/src/gui/editors/cockpitcomform.h @@ -32,7 +32,7 @@ namespace swift::gui::editors explicit CCockpitComForm(QWidget *parent = nullptr); //! Destrutor - virtual ~CCockpitComForm() override; + ~CCockpitComForm() override; //! COM frequencies displayed void setFrequencies(const swift::misc::aviation::CComSystem &com1, @@ -55,9 +55,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} signals: diff --git a/src/gui/editors/coordinateform.cpp b/src/gui/editors/coordinateform.cpp index 7106c45cf..0780b77f1 100644 --- a/src/gui/editors/coordinateform.cpp +++ b/src/gui/editors/coordinateform.cpp @@ -62,7 +62,7 @@ namespace swift::gui::editors this->setCoordinate(c); } - CCoordinateForm::~CCoordinateForm() {} + CCoordinateForm::~CCoordinateForm() = default; bool CCoordinateForm::setCoordinate(const ICoordinateGeodetic &coordinate) { diff --git a/src/gui/editors/coordinateform.h b/src/gui/editors/coordinateform.h index e05f0775a..fda932adb 100644 --- a/src/gui/editors/coordinateform.h +++ b/src/gui/editors/coordinateform.h @@ -29,7 +29,7 @@ namespace swift::gui::editors explicit CCoordinateForm(QWidget *parent = nullptr); //! Dtor - virtual ~CCoordinateForm() override; + ~CCoordinateForm() override; //! Get the coordinate swift::misc::geo::CCoordinateGeodetic getCoordinate() const { return m_coordinate; } @@ -39,8 +39,8 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Set button visible diff --git a/src/gui/editors/distributorform.cpp b/src/gui/editors/distributorform.cpp index 6abb1220b..bcb93d979 100644 --- a/src/gui/editors/distributorform.cpp +++ b/src/gui/editors/distributorform.cpp @@ -41,7 +41,7 @@ namespace swift::gui::editors ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId(), qMetaTypeId() }); } - CDistributorForm::~CDistributorForm() {} + CDistributorForm::~CDistributorForm() = default; bool CDistributorForm::setValue(const swift::misc::simulation::CDistributor &distributor) { diff --git a/src/gui/editors/distributorform.h b/src/gui/editors/distributorform.h index ab9f1c9c7..3bdf0b349 100644 --- a/src/gui/editors/distributorform.h +++ b/src/gui/editors/distributorform.h @@ -33,7 +33,7 @@ namespace swift::gui::editors explicit CDistributorForm(QWidget *parent = nullptr); //! Destructor - virtual ~CDistributorForm() override; + ~CDistributorForm() override; //! Get value swift::misc::simulation::CDistributor getValue() const; @@ -46,9 +46,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Clear @@ -60,7 +60,7 @@ namespace swift::gui::editors protected: //! \copydoc CForm::jsonPasted - virtual void jsonPasted(const QString &json) override; + void jsonPasted(const QString &json) override; private: //! Variant has been dropped diff --git a/src/gui/editors/form.cpp b/src/gui/editors/form.cpp index 9d0ea1fdd..a7f661742 100644 --- a/src/gui/editors/form.cpp +++ b/src/gui/editors/form.cpp @@ -16,7 +16,7 @@ namespace swift::gui::editors { CForm::CForm(QWidget *parent) : COverlayMessagesFrame(parent) {} - CForm::~CForm() {} + CForm::~CForm() = default; void CForm::setSelectOnly() { this->setReadOnly(true); } @@ -48,7 +48,7 @@ namespace swift::gui::editors CFormDbUser::CFormDbUser(QWidget *parent) : CForm(parent) {} - CFormDbUser::~CFormDbUser() {} + CFormDbUser::~CFormDbUser() = default; CAuthenticatedUser CFormDbUser::getSwiftDbUser() const { return m_swiftDbUser.get(); } diff --git a/src/gui/editors/form.h b/src/gui/editors/form.h index abb2e1e41..0eb2e1f3c 100644 --- a/src/gui/editors/form.h +++ b/src/gui/editors/form.h @@ -32,7 +32,7 @@ namespace swift::gui::editors explicit CForm(QWidget *parent = nullptr); //! Destructor - virtual ~CForm() override; + ~CForm() override; //! Set editable virtual void setReadOnly(bool readOnly) = 0; @@ -77,7 +77,7 @@ namespace swift::gui::editors explicit CFormDbUser(QWidget *parent = nullptr); //! Destructor - virtual ~CFormDbUser() override; + ~CFormDbUser() override; //! Authenticated DB user swift::misc::network::CAuthenticatedUser getSwiftDbUser() const; diff --git a/src/gui/editors/fsdsetupform.h b/src/gui/editors/fsdsetupform.h index 3d1417359..8e85c5b9b 100644 --- a/src/gui/editors/fsdsetupform.h +++ b/src/gui/editors/fsdsetupform.h @@ -30,7 +30,7 @@ namespace swift::gui::editors explicit CFsdSetupForm(QWidget *parent = nullptr); //! Constructor - virtual ~CFsdSetupForm() override; + ~CFsdSetupForm() override; //! FSD setup from GUI swift::misc::network::CFsdSetup getValue() const; @@ -58,8 +58,8 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} private: diff --git a/src/gui/editors/interpolationsetupform.cpp b/src/gui/editors/interpolationsetupform.cpp index 316ddc0a6..8bd7fb8fd 100644 --- a/src/gui/editors/interpolationsetupform.cpp +++ b/src/gui/editors/interpolationsetupform.cpp @@ -30,7 +30,7 @@ namespace swift::gui::editors connect(ui->le_PitchOnGround, &QLineEdit::editingFinished, this, &CInterpolationSetupForm::onPitchChanged); } - CInterpolationSetupForm::~CInterpolationSetupForm() {} + CInterpolationSetupForm::~CInterpolationSetupForm() = default; void CInterpolationSetupForm::setValue(const CInterpolationAndRenderingSetupBase &setup) { diff --git a/src/gui/editors/interpolationsetupform.h b/src/gui/editors/interpolationsetupform.h index 6453b7148..b61d2a305 100644 --- a/src/gui/editors/interpolationsetupform.h +++ b/src/gui/editors/interpolationsetupform.h @@ -30,7 +30,7 @@ namespace swift::gui::editors explicit CInterpolationSetupForm(QWidget *parent = nullptr); //! Destructor - virtual ~CInterpolationSetupForm() override; + ~CInterpolationSetupForm() override; //! Set value void setValue(const swift::misc::simulation::CInterpolationAndRenderingSetupBase &setup); @@ -40,8 +40,8 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} signals: diff --git a/src/gui/editors/liveryform.cpp b/src/gui/editors/liveryform.cpp index 133ca4103..a26aebada 100644 --- a/src/gui/editors/liveryform.cpp +++ b/src/gui/editors/liveryform.cpp @@ -60,7 +60,7 @@ namespace swift::gui::editors connect(ui->pb_SearchColor, &QPushButton::pressed, this, &CLiveryForm::searchForColor); } - CLiveryForm::~CLiveryForm() {} + CLiveryForm::~CLiveryForm() = default; CLivery CLiveryForm::getValue() const { diff --git a/src/gui/editors/liveryform.h b/src/gui/editors/liveryform.h index b9da38b5d..b9b16cb37 100644 --- a/src/gui/editors/liveryform.h +++ b/src/gui/editors/liveryform.h @@ -37,7 +37,7 @@ namespace swift::gui::editors explicit CLiveryForm(QWidget *parent = nullptr); //! Destructor - virtual ~CLiveryForm() override; + ~CLiveryForm() override; //! Value swift::misc::aviation::CLivery getValue() const; @@ -56,9 +56,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool withNestedForms) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool withNestedForms) const override; //! @} //! Clear data @@ -72,7 +72,7 @@ namespace swift::gui::editors protected: //! \copydoc CForm::jsonPasted - virtual void jsonPasted(const QString &json) override; + void jsonPasted(const QString &json) override; private: //! Livery dropped diff --git a/src/gui/editors/matchingform.cpp b/src/gui/editors/matchingform.cpp index b2b65de0c..7468e7a06 100644 --- a/src/gui/editors/matchingform.cpp +++ b/src/gui/editors/matchingform.cpp @@ -41,7 +41,7 @@ namespace swift::gui::editors Qt::QueuedConnection); } - CMatchingForm::~CMatchingForm() {} + CMatchingForm::~CMatchingForm() = default; void CMatchingForm::setReadOnly(bool readonly) { diff --git a/src/gui/editors/matchingform.h b/src/gui/editors/matchingform.h index 9188f484a..49e8b0996 100644 --- a/src/gui/editors/matchingform.h +++ b/src/gui/editors/matchingform.h @@ -28,12 +28,12 @@ namespace swift::gui::editors explicit CMatchingForm(QWidget *parent = nullptr); //! Destructor - virtual ~CMatchingForm() override; + ~CMatchingForm() override; //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool withNestedForms) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool withNestedForms) const override; //! @} //! Set valued diff --git a/src/gui/editors/modelmappingform.cpp b/src/gui/editors/modelmappingform.cpp index d9f62362b..ae78c0763 100644 --- a/src/gui/editors/modelmappingform.cpp +++ b/src/gui/editors/modelmappingform.cpp @@ -43,7 +43,7 @@ namespace swift::gui::editors this->userChanged(); } - CModelMappingForm::~CModelMappingForm() {} + CModelMappingForm::~CModelMappingForm() = default; swift::misc::simulation::CAircraftModel CModelMappingForm::getValue() const { diff --git a/src/gui/editors/modelmappingform.h b/src/gui/editors/modelmappingform.h index 2c6a805f5..4efa23417 100644 --- a/src/gui/editors/modelmappingform.h +++ b/src/gui/editors/modelmappingform.h @@ -32,7 +32,7 @@ namespace swift::gui::editors explicit CModelMappingForm(QWidget *parent = nullptr); //! Destructor - virtual ~CModelMappingForm() override; + ~CModelMappingForm() override; //! Value swift::misc::simulation::CAircraftModel getValue() const; @@ -41,9 +41,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool withNestedObjects) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool withNestedObjects) const override; //! @} //! Set model @@ -55,7 +55,7 @@ namespace swift::gui::editors protected: //! \copydoc CFormDbUser::userChanged - virtual void userChanged() override; + void userChanged() override; private: //! CG (aka vertical offset) from UI diff --git a/src/gui/editors/modelmappingmodifyform.cpp b/src/gui/editors/modelmappingmodifyform.cpp index 947163b90..1a29d7672 100644 --- a/src/gui/editors/modelmappingmodifyform.cpp +++ b/src/gui/editors/modelmappingmodifyform.cpp @@ -46,10 +46,7 @@ namespace swift::gui::editors connect(ui->le_CG, &QLineEdit::editingFinished, this, &CModelMappingModifyForm::onCGEdited); } - CModelMappingModifyForm::~CModelMappingModifyForm() - { - // void - } + CModelMappingModifyForm::~CModelMappingModifyForm() = default; CPropertyIndexVariantMap CModelMappingModifyForm::getValues() const { diff --git a/src/gui/editors/modelmappingmodifyform.h b/src/gui/editors/modelmappingmodifyform.h index fe179dd42..70c5da5b6 100644 --- a/src/gui/editors/modelmappingmodifyform.h +++ b/src/gui/editors/modelmappingmodifyform.h @@ -38,7 +38,7 @@ namespace swift::gui::editors explicit CModelMappingModifyForm(QWidget *parent = nullptr); //! Destructor - virtual ~CModelMappingModifyForm() override; + ~CModelMappingModifyForm() override; //! Get the values swift::misc::CPropertyIndexVariantMap getValues() const; @@ -47,11 +47,11 @@ namespace swift::gui::editors void setValue(const swift::misc::simulation::CAircraftModel &model); //! \copydoc CForm::setReadOnly - virtual void setReadOnly(bool readOnly) override; + void setReadOnly(bool readOnly) override; protected: //! \copydoc CFormDbUser::userChanged - virtual void userChanged() override; + void userChanged() override; private: //! Return pressed diff --git a/src/gui/editors/ownmodelsetform.cpp b/src/gui/editors/ownmodelsetform.cpp index 71b69148f..052b5a7a3 100644 --- a/src/gui/editors/ownmodelsetform.cpp +++ b/src/gui/editors/ownmodelsetform.cpp @@ -44,10 +44,7 @@ namespace swift::gui::editors }); } - COwnModelSetForm::~COwnModelSetForm() - { - // void - } + COwnModelSetForm::~COwnModelSetForm() = default; void COwnModelSetForm::reloadData() { diff --git a/src/gui/editors/ownmodelsetform.h b/src/gui/editors/ownmodelsetform.h index 78d12a3cf..1a2336fa1 100644 --- a/src/gui/editors/ownmodelsetform.h +++ b/src/gui/editors/ownmodelsetform.h @@ -30,7 +30,7 @@ namespace swift::gui::editors explicit COwnModelSetForm(QWidget *parent = nullptr); //! Destructor - virtual ~COwnModelSetForm() override; + ~COwnModelSetForm() override; //! Reload data void reloadData(); @@ -79,7 +79,7 @@ namespace swift::gui::editors //! \name Form functions, here not used //! @{ - virtual void setReadOnly(bool readOnly) override { Q_UNUSED(readOnly); } + void setReadOnly(bool readOnly) override { Q_UNUSED(readOnly); } //! @} signals: diff --git a/src/gui/editors/pbhsform.cpp b/src/gui/editors/pbhsform.cpp index 0e3a6fd6a..54ffccc93 100644 --- a/src/gui/editors/pbhsform.cpp +++ b/src/gui/editors/pbhsform.cpp @@ -35,7 +35,7 @@ namespace swift::gui::editors connect(ui->pb_SetOwnAircraft, &QPushButton::released, this, &CPbhsForm::changeValues); } - CPbhsForm::~CPbhsForm() {} + CPbhsForm::~CPbhsForm() = default; CAngle CPbhsForm::getBankAngle() const { return CAngle(getBankAngleDegrees(), CAngleUnit::deg()); } diff --git a/src/gui/editors/pbhsform.h b/src/gui/editors/pbhsform.h index 70e8f7aa6..f72a70812 100644 --- a/src/gui/editors/pbhsform.h +++ b/src/gui/editors/pbhsform.h @@ -31,7 +31,7 @@ namespace swift::gui::editors explicit CPbhsForm(QWidget *parent = nullptr); //! Dtor - virtual ~CPbhsForm() override; + ~CPbhsForm() override; //! Get bank angle swift::misc::physical_quantities::CAngle getBankAngle() const; @@ -64,7 +64,7 @@ namespace swift::gui::editors void updateSituation(swift::misc::aviation::CAircraftSituation &situation); //! \copydoc CForm::setReadOnly - virtual void setReadOnly(bool readOnly) override; + void setReadOnly(bool readOnly) override; //! Show the "SET" button void showSetButton(bool visible); diff --git a/src/gui/editors/pilotform.cpp b/src/gui/editors/pilotform.cpp index 9f4e832ec..904007da7 100644 --- a/src/gui/editors/pilotform.cpp +++ b/src/gui/editors/pilotform.cpp @@ -39,7 +39,7 @@ namespace swift::gui::editors connect(ui->le_RealName, &QLineEdit::editingFinished, this, &CPilotForm::doValidation); } - CPilotForm::~CPilotForm() {} + CPilotForm::~CPilotForm() = default; void CPilotForm::setVatsimValidation(bool vatsim) { diff --git a/src/gui/editors/pilotform.h b/src/gui/editors/pilotform.h index 5a94804ea..d8d4a1625 100644 --- a/src/gui/editors/pilotform.h +++ b/src/gui/editors/pilotform.h @@ -31,7 +31,7 @@ namespace swift::gui::editors explicit CPilotForm(QWidget *parent = nullptr); //! Destructor - virtual ~CPilotForm() override; + ~CPilotForm() override; //! Set VATSIM validation mode void setVatsimValidation(bool vatsim); @@ -47,8 +47,8 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} private: diff --git a/src/gui/editors/relativeaircraftposition.cpp b/src/gui/editors/relativeaircraftposition.cpp index 426b6dedc..78c8bbee8 100644 --- a/src/gui/editors/relativeaircraftposition.cpp +++ b/src/gui/editors/relativeaircraftposition.cpp @@ -16,7 +16,7 @@ namespace swift::gui::editors ui->setupUi(this); } - CRelativeAircraftPosition::~CRelativeAircraftPosition() {} + CRelativeAircraftPosition::~CRelativeAircraftPosition() = default; void CRelativeAircraftPosition::setReadOnly(bool readOnly) { diff --git a/src/gui/editors/relativeaircraftposition.h b/src/gui/editors/relativeaircraftposition.h index cd3bec8e8..3626649e1 100644 --- a/src/gui/editors/relativeaircraftposition.h +++ b/src/gui/editors/relativeaircraftposition.h @@ -28,10 +28,10 @@ namespace swift::gui::editors explicit CRelativeAircraftPosition(QWidget *parent = nullptr); //! Destructor - virtual ~CRelativeAircraftPosition() override; + ~CRelativeAircraftPosition() override; //! \copydoc CForm::setReadOnly - virtual void setReadOnly(bool readOnly) override; + void setReadOnly(bool readOnly) override; //! Set origin coordinate void setOriginCoordinate(const swift::misc::geo::CCoordinateGeodetic &originCoordinate) diff --git a/src/gui/editors/serverform.cpp b/src/gui/editors/serverform.cpp index fe35a15da..37771fe1b 100644 --- a/src/gui/editors/serverform.cpp +++ b/src/gui/editors/serverform.cpp @@ -28,7 +28,7 @@ namespace swift::gui::editors connect(ui->tb_Unhide, &QToolButton::clicked, this, &CServerForm::tempUnhidePassword); } - CServerForm::~CServerForm() {} + CServerForm::~CServerForm() = default; void CServerForm::setServer(const CServer &server) { diff --git a/src/gui/editors/serverform.h b/src/gui/editors/serverform.h index af22b7abd..4bc1a84ae 100644 --- a/src/gui/editors/serverform.h +++ b/src/gui/editors/serverform.h @@ -32,7 +32,7 @@ namespace swift::gui::editors explicit CServerForm(QWidget *parent = nullptr); //! Destructor - virtual ~CServerForm() override; + ~CServerForm() override; //! Set server void setServer(const swift::misc::network::CServer &server); @@ -48,8 +48,8 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Show the password field diff --git a/src/gui/editors/situationform.cpp b/src/gui/editors/situationform.cpp index e41de5640..0d2d19dca 100644 --- a/src/gui/editors/situationform.cpp +++ b/src/gui/editors/situationform.cpp @@ -49,7 +49,7 @@ namespace swift::gui::editors connect(ui->comp_Coordinate, &CCoordinateForm::changedCoordinate, this, &CSituationForm::onCoordinateChanged); } - CSituationForm::~CSituationForm() {} + CSituationForm::~CSituationForm() = default; void CSituationForm::setSituation(const swift::misc::aviation::CAircraftSituation &situation) { diff --git a/src/gui/editors/situationform.h b/src/gui/editors/situationform.h index 21640a6fd..7bb65152c 100644 --- a/src/gui/editors/situationform.h +++ b/src/gui/editors/situationform.h @@ -31,7 +31,7 @@ namespace swift::gui::editors explicit CSituationForm(QWidget *parent = nullptr); //! Destructor - virtual ~CSituationForm() override; + ~CSituationForm() override; //! Set the situation void setSituation(const swift::misc::aviation::CAircraftSituation &situation); @@ -41,9 +41,9 @@ namespace swift::gui::editors //! \name Form class implementations //! @{ - virtual void setReadOnly(bool readonly) override; - virtual void setSelectOnly() override; - virtual swift::misc::CStatusMessageList validate(bool nested = false) const override; + void setReadOnly(bool readonly) override; + void setSelectOnly() override; + swift::misc::CStatusMessageList validate(bool nested = false) const override; //! @} //! Set button visible diff --git a/src/gui/editors/validationindicator.cpp b/src/gui/editors/validationindicator.cpp index 16df5406a..d768cc21b 100644 --- a/src/gui/editors/validationindicator.cpp +++ b/src/gui/editors/validationindicator.cpp @@ -30,7 +30,7 @@ namespace swift::gui::editors m_resetTimer.start(ResetInterval); } - CValidationIndicator::~CValidationIndicator() {} + CValidationIndicator::~CValidationIndicator() = default; void CValidationIndicator::passed() { diff --git a/src/gui/editors/validationindicator.h b/src/gui/editors/validationindicator.h index 98b7fc635..8699ad0dc 100644 --- a/src/gui/editors/validationindicator.h +++ b/src/gui/editors/validationindicator.h @@ -60,7 +60,7 @@ namespace swift::gui::editors protected: //! \copydoc QFrame::paintEvent - virtual void paintEvent(QPaintEvent *paintEvent) override; + void paintEvent(QPaintEvent *paintEvent) override; private: const int ResetInterval = 5000; diff --git a/src/gui/enablefordockwidgetinfoarea.h b/src/gui/enablefordockwidgetinfoarea.h index 0e6745d4d..39a323d1e 100644 --- a/src/gui/enablefordockwidgetinfoarea.h +++ b/src/gui/enablefordockwidgetinfoarea.h @@ -56,7 +56,7 @@ namespace swift::gui CEnableForDockWidgetInfoArea(CDockWidgetInfoArea *parentInfoArea = nullptr); //! Destructor - virtual ~CEnableForDockWidgetInfoArea() {} + virtual ~CEnableForDockWidgetInfoArea() = default; CDockWidgetInfoArea *m_parentDockableInfoArea = nullptr; //!< my parent dockable widget swift::misc::CConnectionGuard m_connections; //!< connections diff --git a/src/gui/enableforframelesswindow.h b/src/gui/enableforframelesswindow.h index 9d71a0a74..41b4c5103 100644 --- a/src/gui/enableforframelesswindow.h +++ b/src/gui/enableforframelesswindow.h @@ -48,7 +48,7 @@ namespace swift::gui QWidget *correspondingWidget); //! Destructor - virtual ~CEnableForFramelessWindow() {} + virtual ~CEnableForFramelessWindow() = default; //! Copy constructor CEnableForFramelessWindow(const CEnableForFramelessWindow &) = delete; diff --git a/src/gui/filters/aircrafticaofilterbar.cpp b/src/gui/filters/aircrafticaofilterbar.cpp index 59530ab9f..4bd7f59e1 100644 --- a/src/gui/filters/aircrafticaofilterbar.cpp +++ b/src/gui/filters/aircrafticaofilterbar.cpp @@ -52,7 +52,7 @@ namespace swift::gui::filters this->clearForm(); } - CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar() {} + CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar() = default; std::unique_ptr> CAircraftIcaoFilterBar::createModelFilter() const diff --git a/src/gui/filters/aircrafticaofilterbar.h b/src/gui/filters/aircrafticaofilterbar.h index a885ee59a..b2a7ca803 100644 --- a/src/gui/filters/aircrafticaofilterbar.h +++ b/src/gui/filters/aircrafticaofilterbar.h @@ -40,7 +40,7 @@ namespace swift::gui::filters explicit CAircraftIcaoFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftIcaoFilterBar() override; + ~CAircraftIcaoFilterBar() override; //! \copydoc models::IModelFilterProvider::createModelFilter std::unique_ptr> @@ -54,7 +54,7 @@ namespace swift::gui::filters public slots: //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! \copydoc CFilterWidget::clearForm diff --git a/src/gui/filters/aircraftmodelfilterbar.cpp b/src/gui/filters/aircraftmodelfilterbar.cpp index 0346b188d..e1c180868 100644 --- a/src/gui/filters/aircraftmodelfilterbar.cpp +++ b/src/gui/filters/aircraftmodelfilterbar.cpp @@ -60,7 +60,7 @@ namespace swift::gui::filters }); } - CAircraftModelFilterBar::~CAircraftModelFilterBar() {} + CAircraftModelFilterBar::~CAircraftModelFilterBar() = default; void CAircraftModelFilterBar::displayCount(bool show) { ui->filter_Buttons->displayCount(show); } diff --git a/src/gui/filters/aircraftmodelfilterbar.h b/src/gui/filters/aircraftmodelfilterbar.h index ee437b21d..d5d038d29 100644 --- a/src/gui/filters/aircraftmodelfilterbar.h +++ b/src/gui/filters/aircraftmodelfilterbar.h @@ -41,21 +41,21 @@ namespace swift::gui::filters explicit CAircraftModelFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelFilterBar() override; + ~CAircraftModelFilterBar() override; //! Show count void displayCount(bool show); //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! \copydoc CFilterWidget::clearForm - virtual void clearForm() override; + void clearForm() override; private: //! Simulator selection changed diff --git a/src/gui/filters/aircraftmodelfilterdialog.cpp b/src/gui/filters/aircraftmodelfilterdialog.cpp index f4f409681..16f74b07b 100644 --- a/src/gui/filters/aircraftmodelfilterdialog.cpp +++ b/src/gui/filters/aircraftmodelfilterdialog.cpp @@ -24,7 +24,7 @@ namespace swift::gui::filters connect(ui->filter_Models, &CAircraftModelFilterBar::rejectDialog, this, &CAircraftModelFilterDialog::reject); } - CAircraftModelFilterDialog::~CAircraftModelFilterDialog() {} + CAircraftModelFilterDialog::~CAircraftModelFilterDialog() = default; std::unique_ptr> CAircraftModelFilterDialog::createModelFilter() const { diff --git a/src/gui/filters/aircraftmodelfilterdialog.h b/src/gui/filters/aircraftmodelfilterdialog.h index 282556201..b800a58e4 100644 --- a/src/gui/filters/aircraftmodelfilterdialog.h +++ b/src/gui/filters/aircraftmodelfilterdialog.h @@ -40,10 +40,10 @@ namespace swift::gui::filters explicit CAircraftModelFilterDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelFilterDialog() override; + ~CAircraftModelFilterDialog() override; //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; private: diff --git a/src/gui/filters/airlineicaofilterbar.cpp b/src/gui/filters/airlineicaofilterbar.cpp index 765ada0bd..b10722495 100644 --- a/src/gui/filters/airlineicaofilterbar.cpp +++ b/src/gui/filters/airlineicaofilterbar.cpp @@ -43,7 +43,7 @@ namespace swift::gui::filters this->clearForm(); } - CAirlineIcaoFilterBar::~CAirlineIcaoFilterBar() {} + CAirlineIcaoFilterBar::~CAirlineIcaoFilterBar() = default; std::unique_ptr> CAirlineIcaoFilterBar::createModelFilter() const { diff --git a/src/gui/filters/airlineicaofilterbar.h b/src/gui/filters/airlineicaofilterbar.h index 48ecdf6e4..8e72fcdd3 100644 --- a/src/gui/filters/airlineicaofilterbar.h +++ b/src/gui/filters/airlineicaofilterbar.h @@ -41,10 +41,10 @@ namespace swift::gui::filters explicit CAirlineIcaoFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CAirlineIcaoFilterBar() override; + ~CAirlineIcaoFilterBar() override; //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; //! Filter default values by ICAO code @@ -52,7 +52,7 @@ namespace swift::gui::filters public slots: //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; private slots: //! Country has been changed @@ -60,7 +60,7 @@ namespace swift::gui::filters protected: //! Clear form - virtual void clearForm() override; + void clearForm() override; private: QScopedPointer ui; diff --git a/src/gui/filters/countryfilterbar.cpp b/src/gui/filters/countryfilterbar.cpp index bcadce068..d655637e3 100644 --- a/src/gui/filters/countryfilterbar.cpp +++ b/src/gui/filters/countryfilterbar.cpp @@ -32,7 +32,7 @@ namespace swift::gui::filters this->clearForm(); } - CCountryFilterBar::~CCountryFilterBar() {} + CCountryFilterBar::~CCountryFilterBar() = default; std::unique_ptr> CCountryFilterBar::createModelFilter() const { diff --git a/src/gui/filters/countryfilterbar.h b/src/gui/filters/countryfilterbar.h index a413aa2bb..bd5129813 100644 --- a/src/gui/filters/countryfilterbar.h +++ b/src/gui/filters/countryfilterbar.h @@ -41,19 +41,18 @@ namespace swift::gui::filters explicit CCountryFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CCountryFilterBar() override; + ~CCountryFilterBar() override; //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> - createModelFilter() const override; + std::unique_ptr> createModelFilter() const override; public slots: //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! Clear form - virtual void clearForm() override; + void clearForm() override; private: QScopedPointer ui; diff --git a/src/gui/filters/distributorfilterbar.cpp b/src/gui/filters/distributorfilterbar.cpp index 21c2ab125..a33fc2db7 100644 --- a/src/gui/filters/distributorfilterbar.cpp +++ b/src/gui/filters/distributorfilterbar.cpp @@ -41,7 +41,7 @@ namespace swift::gui::filters }); } - CDistributorFilterBar::~CDistributorFilterBar() {} + CDistributorFilterBar::~CDistributorFilterBar() = default; std::unique_ptr> CDistributorFilterBar::createModelFilter() const { diff --git a/src/gui/filters/distributorfilterbar.h b/src/gui/filters/distributorfilterbar.h index 0f6088d6d..32d687a08 100644 --- a/src/gui/filters/distributorfilterbar.h +++ b/src/gui/filters/distributorfilterbar.h @@ -40,21 +40,21 @@ namespace swift::gui::filters explicit CDistributorFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CDistributorFilterBar() override; + ~CDistributorFilterBar() override; //! Set simulator void setSimulator(const swift::misc::simulation::CSimulatorInfo &simulator); //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! Clear form - virtual void clearForm() override; + void clearForm() override; private: //! Trigger filter by changing a value diff --git a/src/gui/filters/filterbarbuttons.cpp b/src/gui/filters/filterbarbuttons.cpp index 9712e9e38..e36ea7c6d 100644 --- a/src/gui/filters/filterbarbuttons.cpp +++ b/src/gui/filters/filterbarbuttons.cpp @@ -20,7 +20,7 @@ namespace swift::gui::filters connect(ui->tb_New, &QToolButton::clicked, this, &CFilterBarButtons::ps_buttonClicked); } - CFilterBarButtons::~CFilterBarButtons() {} + CFilterBarButtons::~CFilterBarButtons() = default; void CFilterBarButtons::displayCount(bool show) { ui->le_Count->setVisible(show); } diff --git a/src/gui/filters/filterbarbuttons.h b/src/gui/filters/filterbarbuttons.h index fad5f3818..7f9999e21 100644 --- a/src/gui/filters/filterbarbuttons.h +++ b/src/gui/filters/filterbarbuttons.h @@ -41,7 +41,7 @@ namespace swift::gui::filters explicit CFilterBarButtons(QWidget *parent = nullptr); //! Destructor - virtual ~CFilterBarButtons(); + ~CFilterBarButtons() override; //! Show the counter void displayCount(bool show); diff --git a/src/gui/filters/filterdialog.cpp b/src/gui/filters/filterdialog.cpp index 633675351..810a08827 100644 --- a/src/gui/filters/filterdialog.cpp +++ b/src/gui/filters/filterdialog.cpp @@ -19,8 +19,6 @@ namespace swift::gui::filters Qt::QueuedConnection); } - CFilterDialog::~CFilterDialog() {} - void CFilterDialog::onStyleSheetChanged() { const QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameFilterDialog()); diff --git a/src/gui/filters/filterdialog.h b/src/gui/filters/filterdialog.h index 0cb0abbd7..d43592ca5 100644 --- a/src/gui/filters/filterdialog.h +++ b/src/gui/filters/filterdialog.h @@ -25,7 +25,7 @@ namespace swift::gui::filters CFilterDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CFilterDialog(); + ~CFilterDialog() override = default; private: //! Stylesheet changed diff --git a/src/gui/filters/filterwidget.cpp b/src/gui/filters/filterwidget.cpp index 5052bf542..c2478ea48 100644 --- a/src/gui/filters/filterwidget.cpp +++ b/src/gui/filters/filterwidget.cpp @@ -20,7 +20,7 @@ namespace swift::gui::filters Qt::QueuedConnection); } - CFilterWidget::~CFilterWidget() {} + CFilterWidget::~CFilterWidget() = default; void CFilterWidget::setButtonsAndCount(CFilterBarButtons *buttons) { diff --git a/src/gui/filters/filterwidget.h b/src/gui/filters/filterwidget.h index 12e84fd61..95837eb24 100644 --- a/src/gui/filters/filterwidget.h +++ b/src/gui/filters/filterwidget.h @@ -26,7 +26,7 @@ namespace swift::gui::filters CFilterWidget(QWidget *parent = nullptr); //! Destructor - virtual ~CFilterWidget(); + ~CFilterWidget() override; //! Row count has been changed virtual void onRowCountChanged(int count, bool withFilter) = 0; diff --git a/src/gui/filters/liveryfilterbar.cpp b/src/gui/filters/liveryfilterbar.cpp index 2b32c5848..f2d1d7982 100644 --- a/src/gui/filters/liveryfilterbar.cpp +++ b/src/gui/filters/liveryfilterbar.cpp @@ -46,7 +46,7 @@ namespace swift::gui::filters this->clearForm(); } - CLiveryFilterBar::~CLiveryFilterBar() {} + CLiveryFilterBar::~CLiveryFilterBar() = default; std::unique_ptr> CLiveryFilterBar::createModelFilter() const { diff --git a/src/gui/filters/liveryfilterbar.h b/src/gui/filters/liveryfilterbar.h index 88cbbd1a1..18603c464 100644 --- a/src/gui/filters/liveryfilterbar.h +++ b/src/gui/filters/liveryfilterbar.h @@ -41,10 +41,10 @@ namespace swift::gui::filters explicit CLiveryFilterBar(QWidget *parent = nullptr); //! Destructor - virtual ~CLiveryFilterBar() override; + ~CLiveryFilterBar() override; //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; //! Filter by livery values @@ -55,11 +55,11 @@ namespace swift::gui::filters public slots: //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! Clear form - virtual void clearForm() override; + void clearForm() override; private: //! Color changed diff --git a/src/gui/filters/statusmessagefilterbar.cpp b/src/gui/filters/statusmessagefilterbar.cpp index d6682f337..82dc8ef77 100644 --- a/src/gui/filters/statusmessagefilterbar.cpp +++ b/src/gui/filters/statusmessagefilterbar.cpp @@ -33,9 +33,9 @@ namespace swift::gui::filters this->clearForm(); } - void CStatusMessageFilterBar::displayCount(bool show) { ui->filter_Buttons->displayCount(show); } + CStatusMessageFilterBar::~CStatusMessageFilterBar() = default; - CStatusMessageFilterBar::~CStatusMessageFilterBar() {} + void CStatusMessageFilterBar::displayCount(bool show) { ui->filter_Buttons->displayCount(show); } void CStatusMessageFilterBar::useRadioButtonDescriptiveIcons(bool oneCharacterText) { diff --git a/src/gui/filters/statusmessagefilterbar.h b/src/gui/filters/statusmessagefilterbar.h index d42156dce..e59e1919c 100644 --- a/src/gui/filters/statusmessagefilterbar.h +++ b/src/gui/filters/statusmessagefilterbar.h @@ -33,22 +33,22 @@ namespace swift::gui::filters void displayCount(bool show); //! Destructor - virtual ~CStatusMessageFilterBar() override; + ~CStatusMessageFilterBar() override; //! Use icons with radio buttons void useRadioButtonDescriptiveIcons(bool oneCharacterText); //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; public slots: //! \copydoc CFilterWidget::onRowCountChanged - virtual void onRowCountChanged(int count, bool withFilter) override; + void onRowCountChanged(int count, bool withFilter) override; protected: //! \copydoc CFilterWidget::clearForm - virtual void clearForm() override; + void clearForm() override; private: QScopedPointer ui; diff --git a/src/gui/filters/statusmessagefilterdialog.cpp b/src/gui/filters/statusmessagefilterdialog.cpp index c3665c450..6939793d8 100644 --- a/src/gui/filters/statusmessagefilterdialog.cpp +++ b/src/gui/filters/statusmessagefilterdialog.cpp @@ -24,7 +24,7 @@ namespace swift::gui::filters connect(ui->filter_Messages, &CStatusMessageFilterBar::rejectDialog, this, &CStatusMessageFilterDialog::reject); } - CStatusMessageFilterDialog::~CStatusMessageFilterDialog() {} + CStatusMessageFilterDialog::~CStatusMessageFilterDialog() = default; std::unique_ptr> CStatusMessageFilterDialog::createModelFilter() const { diff --git a/src/gui/filters/statusmessagefilterdialog.h b/src/gui/filters/statusmessagefilterdialog.h index d19be6a60..423af5803 100644 --- a/src/gui/filters/statusmessagefilterdialog.h +++ b/src/gui/filters/statusmessagefilterdialog.h @@ -40,10 +40,10 @@ namespace swift::gui::filters explicit CStatusMessageFilterDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CStatusMessageFilterDialog() override; + ~CStatusMessageFilterDialog() override; //! \copydoc models::IModelFilterProvider::createModelFilter - virtual std::unique_ptr> + std::unique_ptr> createModelFilter() const override; private: diff --git a/src/gui/guiactionbind.cpp b/src/gui/guiactionbind.cpp index 9b3353685..750e3641e 100644 --- a/src/gui/guiactionbind.cpp +++ b/src/gui/guiactionbind.cpp @@ -23,8 +23,6 @@ namespace swift::gui connect(sApp, &CApplication::aboutToShutdown, this, &CGuiActionBindHandler::unbind); } - CGuiActionBindHandler::~CGuiActionBindHandler() {} - CActionBindings CGuiActionBindHandler::bindMenu(QMenu *menu, const QString &path) { Q_ASSERT(menu); diff --git a/src/gui/guiactionbind.h b/src/gui/guiactionbind.h index 1bb82e9c6..24e5abde8 100644 --- a/src/gui/guiactionbind.h +++ b/src/gui/guiactionbind.h @@ -23,7 +23,7 @@ namespace swift::gui public: //! Destructor - virtual ~CGuiActionBindHandler(); + ~CGuiActionBindHandler() override = default; //! Bound function for swift::core::CActionBind void boundFunction(bool enabled); diff --git a/src/gui/infoarea.cpp b/src/gui/infoarea.cpp index 51d83c958..c6343d41e 100644 --- a/src/gui/infoarea.cpp +++ b/src/gui/infoarea.cpp @@ -42,8 +42,6 @@ namespace swift::gui this->setWholeInfoAreaFloating(m_infoAreaFloating); } - CInfoArea::~CInfoArea() {} - void CInfoArea::initInfoArea() { // initInfoArea() needs be called after(!) GUI is setup diff --git a/src/gui/infoarea.h b/src/gui/infoarea.h index 7a8d5b377..8b34467e7 100644 --- a/src/gui/infoarea.h +++ b/src/gui/infoarea.h @@ -43,7 +43,7 @@ namespace swift::gui public: //! Destructor - virtual ~CInfoArea() override; + ~CInfoArea() override = default; //! Add items to context menu void addToContextMenu(QMenu *menu) const; @@ -165,14 +165,14 @@ namespace swift::gui explicit CInfoArea(QWidget *parent = nullptr); //! \copydoc QWidget::closeEvent - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; //! \copydoc QWidget::paintEvent - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; //! \copydoc QWidget::keyPressEvent //! \remarks nor fully sufficient, as the info area is hardly having focus - virtual void keyPressEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; //! Preferred size when floating (size hint) virtual QSize getPreferredSizeWhenFloating(int areaIndex) const = 0; diff --git a/src/gui/labelandicon.cpp b/src/gui/labelandicon.cpp index ee153e791..499308539 100644 --- a/src/gui/labelandicon.cpp +++ b/src/gui/labelandicon.cpp @@ -11,7 +11,7 @@ namespace swift::gui { CLabelAndIcon::CLabelAndIcon(QWidget *parent) : QFrame(parent), ui(new Ui::CLabelAndIcon) { ui->setupUi(this); } - CLabelAndIcon::~CLabelAndIcon() {} + CLabelAndIcon::~CLabelAndIcon() = default; void CLabelAndIcon::set(const QPixmap &pixmap, const QString &text) { diff --git a/src/gui/labelandicon.h b/src/gui/labelandicon.h index ef5f23cb5..a706cc365 100644 --- a/src/gui/labelandicon.h +++ b/src/gui/labelandicon.h @@ -33,7 +33,7 @@ namespace swift::gui explicit CLabelAndIcon(QWidget *parent = nullptr); //! Destructor - ~CLabelAndIcon(); + ~CLabelAndIcon() override; //! Set values (left to right) void set(const QPixmap &pixmap, const QString &text); diff --git a/src/gui/led.h b/src/gui/led.h index 3e4cc4dee..d7d943c5d 100644 --- a/src/gui/led.h +++ b/src/gui/led.h @@ -72,7 +72,7 @@ namespace swift::gui const QString &offName = "off", int targetWidth = -1, QWidget *parent = nullptr); //! Destructor - virtual ~CLedWidget() override; + ~CLedWidget() override; //! Value bool value() const { return m_blinkState; } @@ -188,10 +188,10 @@ namespace swift::gui void resetState(); //! Paint event - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; //! Mouse pressed - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; //! Set / init LED void setLed(LedColor ledColor = NoColor); diff --git a/src/gui/levelmeter.cpp b/src/gui/levelmeter.cpp index b538fdf80..792230e75 100644 --- a/src/gui/levelmeter.cpp +++ b/src/gui/levelmeter.cpp @@ -25,7 +25,7 @@ namespace swift::gui m_redrawTimer->setObjectName("CLevelMeter"); } - CLevelMeter::~CLevelMeter() {} + CLevelMeter::~CLevelMeter() = default; void CLevelMeter::reset() { diff --git a/src/gui/levelmeter.h b/src/gui/levelmeter.h index 638e876e3..524f9b1de 100644 --- a/src/gui/levelmeter.h +++ b/src/gui/levelmeter.h @@ -37,7 +37,7 @@ namespace swift::gui CLevelMeter(QWidget *parent = nullptr); //! Destructor - virtual ~CLevelMeter() override; + ~CLevelMeter() override; //! \copydoc QWidget::paintEvent void paintEvent(QPaintEvent *event) override; diff --git a/src/gui/lineedithistory.h b/src/gui/lineedithistory.h index 446622631..0813ec41f 100644 --- a/src/gui/lineedithistory.h +++ b/src/gui/lineedithistory.h @@ -41,10 +41,10 @@ namespace swift::gui protected: //! \copydoc QLineEdit::keyPressEvent - virtual void keyPressEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; //! \copydoc QLineEdit::keyPressEvent - virtual void contextMenuEvent(QContextMenuEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private: QStringList m_history; diff --git a/src/gui/loadindicator.h b/src/gui/loadindicator.h index f4508403e..d19e8490e 100644 --- a/src/gui/loadindicator.h +++ b/src/gui/loadindicator.h @@ -55,10 +55,10 @@ namespace swift::gui const QColor &color() const { return m_color; } //! \copydoc QWidget::sizeHint - virtual QSize sizeHint() const override; + QSize sizeHint() const override; //! \copydoc QWidget::heightForWidth - virtual int heightForWidth(int w) const override; + int heightForWidth(int w) const override; //! Paint to another painter void paint(QPainter &painter) const; @@ -96,10 +96,10 @@ namespace swift::gui protected: //! \copydoc QWidget::timerEvent - virtual void timerEvent(QTimerEvent *event) override; + void timerEvent(QTimerEvent *event) override; //! \copydoc QWidget::paintEvent - virtual void paintEvent(QPaintEvent *event) override; + void paintEvent(QPaintEvent *event) override; //! Is parent widget visible? bool isParentVisible() const; @@ -124,7 +124,7 @@ namespace swift::gui CLoadIndicatorEnabled(QWidget *usingWidget); //! Destructor - virtual ~CLoadIndicatorEnabled() {} + virtual ~CLoadIndicatorEnabled() = default; //! Copy constructor CLoadIndicatorEnabled(const CLoadIndicatorEnabled &) = delete; diff --git a/src/gui/mainwindowaccess.cpp b/src/gui/mainwindowaccess.cpp index 89d9310d5..709580156 100644 --- a/src/gui/mainwindowaccess.cpp +++ b/src/gui/mainwindowaccess.cpp @@ -11,10 +11,7 @@ using namespace swift::misc; namespace swift::gui { - IMainWindowAccess::~IMainWindowAccess() - { - // void - } + IMainWindowAccess::~IMainWindowAccess() = default; bool IMainWindowAccess::displayInStatusBar(const CStatusMessage &message) { diff --git a/src/gui/mainwindowaccess.h b/src/gui/mainwindowaccess.h index 11a9a6acd..1e586dda9 100644 --- a/src/gui/mainwindowaccess.h +++ b/src/gui/mainwindowaccess.h @@ -29,7 +29,7 @@ namespace swift::gui virtual ~IMainWindowAccess(); //! Ctor - IMainWindowAccess() {} + IMainWindowAccess() = default; //! Copy constructor IMainWindowAccess(const IMainWindowAccess &) = delete; diff --git a/src/gui/managedstatusbar.h b/src/gui/managedstatusbar.h index 682db2f0d..bf8ec336a 100644 --- a/src/gui/managedstatusbar.h +++ b/src/gui/managedstatusbar.h @@ -29,7 +29,7 @@ namespace swift::gui explicit CManagedStatusBar(QObject *parent = nullptr); //! Destructor - virtual ~CManagedStatusBar() override; + ~CManagedStatusBar() override; //! Get the status bar QStatusBar *getStatusBar() const { return m_statusBar; } diff --git a/src/gui/menus/aircraftmodelmenus.h b/src/gui/menus/aircraftmodelmenus.h index 24eefff6e..7b416e623 100644 --- a/src/gui/menus/aircraftmodelmenus.h +++ b/src/gui/menus/aircraftmodelmenus.h @@ -63,7 +63,7 @@ namespace swift::gui static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(CMenuActions &menuActions) override; + void customMenu(CMenuActions &menuActions) override; private: void showSimulatorFile(); //!< simulator file @@ -91,7 +91,7 @@ namespace swift::gui static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(CMenuActions &menuActions) override; + void customMenu(CMenuActions &menuActions) override; //! Change target void setModelsTarget(QObject *target) { m_modelsTarget = target; } @@ -123,7 +123,7 @@ namespace swift::gui static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(CMenuActions &menuActions) override; + void customMenu(CMenuActions &menuActions) override; //! Change target void setModelsTarget(QObject *target) { m_modelsTarget = target; } diff --git a/src/gui/menus/fontmenus.h b/src/gui/menus/fontmenus.h index b84966da2..24cc72bce 100644 --- a/src/gui/menus/fontmenus.h +++ b/src/gui/menus/fontmenus.h @@ -29,7 +29,7 @@ namespace swift::gui::menus static const QStringList &getLogCategories(); //! \copydoc IMenuDelegate::customMenu - virtual void customMenu(CMenuActions &menuActions) override; + void customMenu(CMenuActions &menuActions) override; //! Allow to use the actions directly QList getActions() const; diff --git a/src/gui/menus/menuaction.h b/src/gui/menus/menuaction.h index 3a91e5ffe..a59a218bc 100644 --- a/src/gui/menus/menuaction.h +++ b/src/gui/menus/menuaction.h @@ -384,7 +384,7 @@ namespace swift::gui::menus { public: //! Constructor - CMenuActions() {} + CMenuActions() = default; //! Constructor CMenuActions(const QList &actions); diff --git a/src/gui/menus/menudelegate.h b/src/gui/menus/menudelegate.h index 7e5443067..6fb529573 100644 --- a/src/gui/menus/menudelegate.h +++ b/src/gui/menus/menudelegate.h @@ -32,7 +32,7 @@ namespace swift::gui::menus IMenuDelegate *getNestedDelegate() const { return m_nestedDelegate; } //! Destructor - virtual ~IMenuDelegate() {} + ~IMenuDelegate() override = default; //! Log categories const QStringList &getLogCategories() diff --git a/src/gui/models/actionhotkeylistmodel.h b/src/gui/models/actionhotkeylistmodel.h index 0b0c67216..aca3eb99e 100644 --- a/src/gui/models/actionhotkeylistmodel.h +++ b/src/gui/models/actionhotkeylistmodel.h @@ -34,7 +34,7 @@ namespace swift::gui::models CActionHotkeyListModel(QObject *parent = nullptr); //! Destructor - virtual ~CActionHotkeyListModel() override {} + ~CActionHotkeyListModel() override = default; //! \copydoc QAbstractTableModel::rowCount int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/gui/models/actionmodel.cpp b/src/gui/models/actionmodel.cpp index 73f2c7d6d..b2d434d9d 100644 --- a/src/gui/models/actionmodel.cpp +++ b/src/gui/models/actionmodel.cpp @@ -23,7 +23,7 @@ namespace swift::gui::models setupModelData(); } - CActionModel::~CActionModel() {} + CActionModel::~CActionModel() = default; int CActionModel::columnCount(const QModelIndex &parent) const { diff --git a/src/gui/models/actionmodel.h b/src/gui/models/actionmodel.h index 0da81e12d..706719851 100644 --- a/src/gui/models/actionmodel.h +++ b/src/gui/models/actionmodel.h @@ -39,7 +39,7 @@ namespace swift::gui::models CActionModel(QObject *parent = nullptr); //! Destructor - virtual ~CActionModel() override; + ~CActionModel() override; //! \copydoc QAbstractItemModel::data QVariant data(const QModelIndex &index, int role) const override; diff --git a/src/gui/models/aircraftcategorylistmodel.h b/src/gui/models/aircraftcategorylistmodel.h index 00ac58d52..38138e90e 100644 --- a/src/gui/models/aircraftcategorylistmodel.h +++ b/src/gui/models/aircraftcategorylistmodel.h @@ -23,7 +23,7 @@ namespace swift::gui::models explicit CAircraftCategoryListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftCategoryListModel() {} + ~CAircraftCategoryListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_AIRCRAFTCATEGORYLISTMODEL_H diff --git a/src/gui/models/aircraftcategorytreemodel.h b/src/gui/models/aircraftcategorytreemodel.h index f10a57314..b60ada571 100644 --- a/src/gui/models/aircraftcategorytreemodel.h +++ b/src/gui/models/aircraftcategorytreemodel.h @@ -24,7 +24,7 @@ namespace swift::gui::models explicit CAircraftCategoryTreeModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftCategoryTreeModel() override {} + ~CAircraftCategoryTreeModel() override = default; //! Set columns void setColumns(const CColumns &columns) { m_columns.setColumns(columns); } diff --git a/src/gui/models/aircrafticaofilter.h b/src/gui/models/aircrafticaofilter.h index 2be8e1027..972ce695a 100644 --- a/src/gui/models/aircrafticaofilter.h +++ b/src/gui/models/aircrafticaofilter.h @@ -23,7 +23,7 @@ namespace swift::gui::models const QString &description, const QString &combinedType); //! \copydoc IModelFilter::filter - virtual swift::misc::aviation::CAircraftIcaoCodeList + swift::misc::aviation::CAircraftIcaoCodeList filter(const swift::misc::aviation::CAircraftIcaoCodeList &inContainer) const override; private: diff --git a/src/gui/models/aircrafticaolistmodel.h b/src/gui/models/aircrafticaolistmodel.h index 084f88fda..bb9626f8e 100644 --- a/src/gui/models/aircrafticaolistmodel.h +++ b/src/gui/models/aircrafticaolistmodel.h @@ -23,7 +23,7 @@ namespace swift::gui::models explicit CAircraftIcaoCodeListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftIcaoCodeListModel() {} + ~CAircraftIcaoCodeListModel() override = default; }; } // namespace swift::gui::models diff --git a/src/gui/models/aircraftmodelfilter.h b/src/gui/models/aircraftmodelfilter.h index e8d26bbf6..af5fb21b9 100644 --- a/src/gui/models/aircraftmodelfilter.h +++ b/src/gui/models/aircraftmodelfilter.h @@ -34,7 +34,7 @@ namespace swift::gui::models const swift::misc::simulation::CDistributor &distributor = swift::misc::simulation::CDistributor()); //! \copydoc IModelFilter::filter - virtual swift::misc::simulation::CAircraftModelList + swift::misc::simulation::CAircraftModelList filter(const swift::misc::simulation::CAircraftModelList &inContainer) const override; private: diff --git a/src/gui/models/aircraftmodellistmodel.h b/src/gui/models/aircraftmodellistmodel.h index 0ca9807c6..b0eb3c06a 100644 --- a/src/gui/models/aircraftmodellistmodel.h +++ b/src/gui/models/aircraftmodellistmodel.h @@ -47,7 +47,7 @@ namespace swift::gui::models explicit CAircraftModelListModel(AircraftModelMode mode, QObject *parent = nullptr); //! Destructor - virtual ~CAircraftModelListModel() override {} + ~CAircraftModelListModel() override = default; //! Mode void setAircraftModelMode(CAircraftModelListModel::AircraftModelMode stationMode); @@ -71,10 +71,10 @@ namespace swift::gui::models void setHighlightColor(const QBrush &brush) { m_highlightColor = brush; } //! \copydoc CListModelBaseNonTemplate::clearHighlighting - virtual void clearHighlighting() override; + void clearHighlighting() override; //! \copydoc CListModelBaseNonTemplate::hasHighlightedRows - virtual bool hasHighlightedRows() const override; + bool hasHighlightedRows() const override; //! Model strings QStringList getModelStrings(bool sort) const; @@ -83,10 +83,10 @@ namespace swift::gui::models void replaceOrAddByModelString(const swift::misc::simulation::CAircraftModelList &models); //! \copydoc QAbstractItemModel::data - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable - virtual bool isOrderable() const override { return true; } + bool isOrderable() const override { return true; } private: AircraftModelMode m_mode = NotSet; //!< current mode diff --git a/src/gui/models/aircraftpartslistmodel.h b/src/gui/models/aircraftpartslistmodel.h index a843aa424..4cba57459 100644 --- a/src/gui/models/aircraftpartslistmodel.h +++ b/src/gui/models/aircraftpartslistmodel.h @@ -26,7 +26,7 @@ namespace swift::gui::models explicit CAircraftPartsListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftPartsListModel() {} + ~CAircraftPartsListModel() override = default; }; } // namespace swift::gui::models diff --git a/src/gui/models/aircraftsituationchangelistmodel.h b/src/gui/models/aircraftsituationchangelistmodel.h index 81c07336b..c178e2a0f 100644 --- a/src/gui/models/aircraftsituationchangelistmodel.h +++ b/src/gui/models/aircraftsituationchangelistmodel.h @@ -26,7 +26,7 @@ namespace swift::gui::models explicit CAircraftSituationChangeListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftSituationChangeListModel() {} + ~CAircraftSituationChangeListModel() override = default; }; } // namespace swift::gui::models diff --git a/src/gui/models/aircraftsituationlistmodel.h b/src/gui/models/aircraftsituationlistmodel.h index 846baa768..ab3117f68 100644 --- a/src/gui/models/aircraftsituationlistmodel.h +++ b/src/gui/models/aircraftsituationlistmodel.h @@ -23,7 +23,7 @@ namespace swift::gui::models explicit CAircraftSituationListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAircraftSituationListModel() {} + ~CAircraftSituationListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H diff --git a/src/gui/models/airlineicaofilter.h b/src/gui/models/airlineicaofilter.h index 14aba753b..33fd1e73e 100644 --- a/src/gui/models/airlineicaofilter.h +++ b/src/gui/models/airlineicaofilter.h @@ -23,7 +23,7 @@ namespace swift::gui::models bool isReal, bool isVa); //! \copydoc IModelFilter::filter - virtual swift::misc::aviation::CAirlineIcaoCodeList + swift::misc::aviation::CAirlineIcaoCodeList filter(const swift::misc::aviation::CAirlineIcaoCodeList &inContainer) const override; private: diff --git a/src/gui/models/airlineicaolistmodel.h b/src/gui/models/airlineicaolistmodel.h index e01eef92c..e30fdb8e5 100644 --- a/src/gui/models/airlineicaolistmodel.h +++ b/src/gui/models/airlineicaolistmodel.h @@ -29,8 +29,8 @@ namespace swift::gui::models //! Constructor explicit CAirlineIcaoCodeListModel(QObject *parent = nullptr); - //! DestructorCAirlineIcaoCodeList - virtual ~CAirlineIcaoCodeListModel() {} + //! Destructor + ~CAirlineIcaoCodeListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_AIRLINEICAOLISTMODEL_H diff --git a/src/gui/models/applicationinfolistmodel.h b/src/gui/models/applicationinfolistmodel.h index c57e08b26..18353e022 100644 --- a/src/gui/models/applicationinfolistmodel.h +++ b/src/gui/models/applicationinfolistmodel.h @@ -26,7 +26,7 @@ namespace swift::gui::models explicit CApplicationInfoListModel(QObject *parent = nullptr); //! Destructor - virtual ~CApplicationInfoListModel() {} + ~CApplicationInfoListModel() override = default; //! \copydoc swift::misc::CApplicationInfoList::fromOtherSwiftVersionsFromDataDirectories void otherSwiftVersionsFromDataDirectories(bool reinit); diff --git a/src/gui/models/atcstationlistmodel.h b/src/gui/models/atcstationlistmodel.h index 7a4f5caa1..847e1f239 100644 --- a/src/gui/models/atcstationlistmodel.h +++ b/src/gui/models/atcstationlistmodel.h @@ -35,7 +35,7 @@ namespace swift::gui::models explicit CAtcStationListModel(AtcStationMode stationMode, QObject *parent = nullptr); //! Destructor - virtual ~CAtcStationListModel() override {} + ~CAtcStationListModel() override = default; //! Set station mode void setStationMode(AtcStationMode stationMode); diff --git a/src/gui/models/atcstationtreemodel.h b/src/gui/models/atcstationtreemodel.h index 5bd2e80f5..358ed63ac 100644 --- a/src/gui/models/atcstationtreemodel.h +++ b/src/gui/models/atcstationtreemodel.h @@ -25,7 +25,7 @@ namespace swift::gui::models explicit CAtcStationTreeModel(QObject *parent = nullptr); //! Destructor - virtual ~CAtcStationTreeModel() override {} + ~CAtcStationTreeModel() override = default; //! Set columns void setColumns(const CColumns &columns) { m_columns.setColumns(columns); } diff --git a/src/gui/models/audiodeviceinfolistmodel.h b/src/gui/models/audiodeviceinfolistmodel.h index 94f14db16..d2b8b821a 100644 --- a/src/gui/models/audiodeviceinfolistmodel.h +++ b/src/gui/models/audiodeviceinfolistmodel.h @@ -23,7 +23,7 @@ namespace swift::gui::models explicit CAudioDeviceInfoListModel(QObject *parent = nullptr); //! Destructor - virtual ~CAudioDeviceInfoListModel() override {} + ~CAudioDeviceInfoListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_AUDIODEVICEINFOLISTMODEL_H diff --git a/src/gui/models/clientlistmodel.h b/src/gui/models/clientlistmodel.h index 4c2f3d894..aba772b25 100644 --- a/src/gui/models/clientlistmodel.h +++ b/src/gui/models/clientlistmodel.h @@ -27,10 +27,10 @@ namespace swift::gui::models explicit CClientListModel(QObject *parent = nullptr); //! Destructor - virtual ~CClientListModel() {} + ~CClientListModel() override = default; //! \copydoc QAbstractListModel::data() - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_CLIENTLISTMODEL_H diff --git a/src/gui/models/columnformatters.h b/src/gui/models/columnformatters.h index 2965d9731..d00f60273 100644 --- a/src/gui/models/columnformatters.h +++ b/src/gui/models/columnformatters.h @@ -36,7 +36,7 @@ namespace swift::gui::models {} //! Virtual destructor - virtual ~CDefaultFormatter() {} + virtual ~CDefaultFormatter() = default; //! Copy constructor CDefaultFormatter(const CDefaultFormatter &) = default; @@ -156,13 +156,13 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::tooltipRole - virtual swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::decorationRole - virtual swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; //! @{ //! Width/height @@ -185,7 +185,7 @@ namespace swift::gui::models CStringFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Just returns a empty "" value @@ -196,7 +196,7 @@ namespace swift::gui::models CEmptyFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Just returns a empty "" value @@ -207,7 +207,7 @@ namespace swift::gui::models CIncognitoFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Layout will be defined by a delegate @@ -221,7 +221,7 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::flags - virtual Qt::ItemFlags flags(Qt::ItemFlags flags, bool editable) const override; + Qt::ItemFlags flags(Qt::ItemFlags flags, bool editable) const override; }; //! Bool value, format as text @@ -237,10 +237,10 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::flags - virtual Qt::ItemFlags flags(Qt::ItemFlags flags, bool editable) const override; + Qt::ItemFlags flags(Qt::ItemFlags flags, bool editable) const override; protected: const swift::misc::CVariant m_trueNameVariant = "true"; //!< displayed when true @@ -258,13 +258,13 @@ namespace swift::gui::models CBoolLedFormatter(const QString &onName, const QString &offName, int alignment = alignDefault()); //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; //! Display the LED - virtual swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::tooltipRole - virtual swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override + swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override { return CBoolTextFormatter::displayRole(dataCVariant); } @@ -300,13 +300,13 @@ namespace swift::gui::models const QString &onName, const QString &offName, int alignment = alignCentered()); //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; //! Display the icon - virtual swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::tooltipRole - virtual swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; protected: const swift::misc::CVariant m_iconOnVariant; //!< Used when on @@ -324,10 +324,10 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &valueObject) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &valueObject) const override; //! \copydoc CDefaultFormatter::decorationRole - virtual swift::misc::CVariant decorationRole(const swift::misc::CVariant &valueObject) const override; + swift::misc::CVariant decorationRole(const swift::misc::CVariant &valueObject) const override; }; //! Formatter when column contains QDateTime, QDate or QTime @@ -338,7 +338,7 @@ namespace swift::gui::models CDateTimeFormatter(const QString &formatString = formatYmd(), int alignment = alignDefault(), bool i18n = true); //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dateTime) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dateTime) const override; //! Year month day static const QString &formatYmd() @@ -387,7 +387,7 @@ namespace swift::gui::models CIntegerFormatter(int alignment = alignRightVCenter()) : CDefaultFormatter(alignment, false) {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &expectedInteger) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &expectedInteger) const override; }; //! Formatter when column contains an altitude @@ -409,7 +409,7 @@ namespace swift::gui::models void setUnit(const swift::misc::physical_quantities::CLengthUnit &unit); //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &altitude) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &altitude) const override; private: swift::misc::physical_quantities::CLengthUnit m_unit = swift::misc::physical_quantities::CLengthUnit::ft(); @@ -424,13 +424,13 @@ namespace swift::gui::models CColorFormatter(int alignment = alignCentered(), bool i18n = true); //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; //! \copydoc CDefaultFormatter::tooltipRole - virtual swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant tooltipRole(const swift::misc::CVariant &dataCVariant) const override; //! Display the icon - virtual swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant decorationRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Formatter for physical quantities @@ -447,7 +447,7 @@ namespace swift::gui::models {} //! \copydoc swift::gui::models::CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &physicalQuantity) const override + swift::misc::CVariant displayRole(const swift::misc::CVariant &physicalQuantity) const override { if (physicalQuantity.canConvert()) { @@ -500,7 +500,7 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Angle in degrees @@ -537,7 +537,7 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; //! Speed displayed in kts @@ -553,7 +553,7 @@ namespace swift::gui::models {} //! \copydoc CDefaultFormatter::displayRole - virtual swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; + swift::misc::CVariant displayRole(const swift::misc::CVariant &dataCVariant) const override; }; } // namespace swift::gui::models diff --git a/src/gui/models/countryfilter.h b/src/gui/models/countryfilter.h index 1b42c654a..6bf347bfd 100644 --- a/src/gui/models/countryfilter.h +++ b/src/gui/models/countryfilter.h @@ -22,7 +22,7 @@ namespace swift::gui::models CCountryFilter(const QString &isoCode, const QString &name); //! \copydoc IModelFilter::filter - virtual swift::misc::CCountryList filter(const swift::misc::CCountryList &inContainer) const override; + swift::misc::CCountryList filter(const swift::misc::CCountryList &inContainer) const override; private: QString m_isoCode; diff --git a/src/gui/models/countrylistmodel.h b/src/gui/models/countrylistmodel.h index 3fe057fda..d375a51ad 100644 --- a/src/gui/models/countrylistmodel.h +++ b/src/gui/models/countrylistmodel.h @@ -26,7 +26,7 @@ namespace swift::gui::models explicit CCountryListModel(QObject *parent = nullptr); //! Destructor - virtual ~CCountryListModel() {} + ~CCountryListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_COUNTRYLISTMODEL_H diff --git a/src/gui/models/distributorfilter.h b/src/gui/models/distributorfilter.h index 8c23c4c6e..f13364a45 100644 --- a/src/gui/models/distributorfilter.h +++ b/src/gui/models/distributorfilter.h @@ -23,7 +23,7 @@ namespace swift::gui::models CDistributorFilter(const swift::misc::simulation::CSimulatorInfo &simulator); //! \copydoc IModelFilter::filter - virtual swift::misc::simulation::CDistributorList + swift::misc::simulation::CDistributorList filter(const swift::misc::simulation::CDistributorList &inDistributors) const override; private: diff --git a/src/gui/models/distributorlistmodel.h b/src/gui/models/distributorlistmodel.h index 48c9146fb..19ed0a43a 100644 --- a/src/gui/models/distributorlistmodel.h +++ b/src/gui/models/distributorlistmodel.h @@ -39,7 +39,7 @@ namespace swift::gui::models explicit CDistributorListModel(QObject *parent = nullptr); //! Destructor - virtual ~CDistributorListModel() override {} + ~CDistributorListModel() override = default; //! Set mode void setDistributorMode(DistributorMode distributorMode); @@ -48,7 +48,7 @@ namespace swift::gui::models DistributorMode getDistributorMode() const { return this->m_distributorMode; } //! \copydoc swift::gui::models::CListModelBaseNonTemplate::isOrderable - virtual bool isOrderable() const override { return true; } + bool isOrderable() const override { return true; } private: DistributorMode m_distributorMode = NotSet; diff --git a/src/gui/models/identifierlistmodel.h b/src/gui/models/identifierlistmodel.h index b69394f40..4d2182d4c 100644 --- a/src/gui/models/identifierlistmodel.h +++ b/src/gui/models/identifierlistmodel.h @@ -22,7 +22,7 @@ namespace swift::gui::models explicit CIdentifierListModel(QObject *parent = nullptr); //! Destructor - virtual ~CIdentifierListModel() {} + ~CIdentifierListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_IDENTIFIERLISTMODEL_H diff --git a/src/gui/models/interpolationsetupmodel.h b/src/gui/models/interpolationsetupmodel.h index d94a0a95f..e7a115706 100644 --- a/src/gui/models/interpolationsetupmodel.h +++ b/src/gui/models/interpolationsetupmodel.h @@ -25,7 +25,7 @@ namespace swift::gui::models explicit CInterpolationSetupListModel(QObject *parent = nullptr); //! Destructor - virtual ~CInterpolationSetupListModel() override {} + ~CInterpolationSetupListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_INTERPOLATIONSETUPMODEL_H diff --git a/src/gui/models/listmodelcallsignobjects.h b/src/gui/models/listmodelcallsignobjects.h index 6b62776d9..4ffde07f2 100644 --- a/src/gui/models/listmodelcallsignobjects.h +++ b/src/gui/models/listmodelcallsignobjects.h @@ -31,7 +31,7 @@ namespace swift::gui::models using ObjectType = typename T::value_type; //! Destructor - virtual ~CListModelCallsignObjects() {} + ~CListModelCallsignObjects() override = default; //! Keys to be highlighted void setHighlightedCallsigns(const swift::misc::aviation::CCallsignSet &callsigns) @@ -43,7 +43,7 @@ namespace swift::gui::models void clearHighlightedCallsigns() { m_highlightCallsigns.clear(); } //! \copydoc swift::gui::models::CListModelBaseNonTemplate::clearHighlighting - virtual void clearHighlighting() override + void clearHighlighting() override { this->clearHighlightedCallsigns(); CListModelBase::clearHighlighting(); @@ -53,7 +53,7 @@ namespace swift::gui::models void setHighlightColor(QColor color) { m_highlightColor = color; } //! Get data for index and role - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; //! Callsign for given index swift::misc::aviation::CCallsign callsignForIndex(const QModelIndex &index) const; diff --git a/src/gui/models/listmodeldbobjects.h b/src/gui/models/listmodeldbobjects.h index 86ba6f8a1..9afffe500 100644 --- a/src/gui/models/listmodeldbobjects.h +++ b/src/gui/models/listmodeldbobjects.h @@ -34,7 +34,7 @@ namespace swift::gui::models using KeyType = K; //! Destructor - virtual ~CListModelDbObjects() {} + ~CListModelDbObjects() override = default; //! Keys to be highlighted void setHighlightedDbKeys(const QList &keys) { m_highlightKeys = keys; } @@ -43,20 +43,20 @@ namespace swift::gui::models void clearHighlightedDbKeys() { m_highlightKeys.clear(); } //! \copydoc swift::gui::models::CListModelBaseNonTemplate::clearHighlighting - virtual void clearHighlighting() override + void clearHighlighting() override { this->clearHighlightedDbKeys(); CListModelBase::clearHighlighting(); } //! \copydoc swift::gui::models::CListModelBaseNonTemplate::hasHighlightedRows - virtual bool hasHighlightedRows() const override { return !m_highlightKeys.isEmpty(); } + bool hasHighlightedRows() const override { return !m_highlightKeys.isEmpty(); } //! Set color for highlighting void setHighlightColor(QColor color) { m_highlightColor = color; } //! Get data for index and role - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; //! DB key for given index KeyType dbKeyForIndex(const QModelIndex &index) const; @@ -88,17 +88,17 @@ namespace swift::gui::models using KeyType = K; //! Destructor - virtual ~COrderableListModelDbObjects() {} + ~COrderableListModelDbObjects() override = default; //! \name specialized swift::gui::models::CListModelDbObjects functions for ordering //! @{ using COrderableListModelDbObjects::CListModelDbObjects::update; //! \copydoc swift::gui::models::CListModelDbObjects::update - virtual int update(const ContainerType &container, bool sort) override; + int update(const ContainerType &container, bool sort) override; //! \copydoc swift::gui::models::CListModelDbObjects::moveItems - virtual void moveItems(const ContainerType &items, int position) override; + void moveItems(const ContainerType &items, int position) override; //! @} //! Sort order to order property swift::misc::IOrderable::IndexOrder diff --git a/src/gui/models/listmodeltimestampobjects.h b/src/gui/models/listmodeltimestampobjects.h index 3c2d1a8d0..365c4085a 100644 --- a/src/gui/models/listmodeltimestampobjects.h +++ b/src/gui/models/listmodeltimestampobjects.h @@ -49,7 +49,7 @@ namespace swift::gui::models using ObjectType = typename T::value_type; //! Destructor - virtual ~CListModelTimestampWithOffsetObjects() {} + ~CListModelTimestampWithOffsetObjects() override = default; //! Insert as first element by keeping maxElements and the latest first void push_frontKeepLatestAdjustedFirst(const ObjectType &object, int max); diff --git a/src/gui/models/liveryfilter.h b/src/gui/models/liveryfilter.h index 3ef301b01..83a896fb6 100644 --- a/src/gui/models/liveryfilter.h +++ b/src/gui/models/liveryfilter.h @@ -25,8 +25,7 @@ namespace swift::gui::models double maxColorDistance, bool colorLiveries, bool airlineLiveries); //! \copydoc IModelFilter::filter - virtual swift::misc::aviation::CLiveryList - filter(const swift::misc::aviation::CLiveryList &inContainer) const override; + swift::misc::aviation::CLiveryList filter(const swift::misc::aviation::CLiveryList &inContainer) const override; private: int m_id = -1; diff --git a/src/gui/models/liverylistmodel.h b/src/gui/models/liverylistmodel.h index 566919d16..12fd31df6 100644 --- a/src/gui/models/liverylistmodel.h +++ b/src/gui/models/liverylistmodel.h @@ -29,7 +29,7 @@ namespace swift::gui::models explicit CLiveryListModel(QObject *parent = nullptr); //! Destructor - virtual ~CLiveryListModel() override {} + ~CLiveryListModel() override = default; }; } // namespace swift::gui::models diff --git a/src/gui/models/matchingstatisticsmodel.h b/src/gui/models/matchingstatisticsmodel.h index e79697487..ad64dbb31 100644 --- a/src/gui/models/matchingstatisticsmodel.h +++ b/src/gui/models/matchingstatisticsmodel.h @@ -33,7 +33,7 @@ namespace swift::gui::models explicit CMatchingStatisticsModel(MatchingStatisticsMode mode, QObject *parent = nullptr); //! Destructor - virtual ~CMatchingStatisticsModel() {} + ~CMatchingStatisticsModel() override = default; //! Set mode void setMode(MatchingStatisticsMode mode); diff --git a/src/gui/models/modelfilter.h b/src/gui/models/modelfilter.h index cc017df82..e17f6757f 100644 --- a/src/gui/models/modelfilter.h +++ b/src/gui/models/modelfilter.h @@ -24,7 +24,7 @@ namespace swift::gui::models IModelFilter(bool enabled = true) : m_enabled(enabled) {} //! Destructor - virtual ~IModelFilter() {} + virtual ~IModelFilter() = default; //! Used container data virtual ContainerType filter(const ContainerType &container) const = 0; diff --git a/src/gui/models/namevariantpairlistmodel.h b/src/gui/models/namevariantpairlistmodel.h index cba59c269..940c665a2 100644 --- a/src/gui/models/namevariantpairlistmodel.h +++ b/src/gui/models/namevariantpairlistmodel.h @@ -34,7 +34,7 @@ namespace swift::gui::models explicit CNameVariantPairModel(bool withIcon, QObject *parent = nullptr); //! Destructor - virtual ~CNameVariantPairModel() {} + ~CNameVariantPairModel() override = default; //! Icon on / off void setIconMode(bool withIcon); diff --git a/src/gui/models/selectionmodel.h b/src/gui/models/selectionmodel.h index 5848a31af..4bc32e90b 100644 --- a/src/gui/models/selectionmodel.h +++ b/src/gui/models/selectionmodel.h @@ -14,7 +14,7 @@ namespace swift::gui::models { public: //! Destructor - virtual ~ISelectionModel() {} + virtual ~ISelectionModel() = default; //! Selected objects virtual ContainerType selectedObjects() const = 0; diff --git a/src/gui/models/serverlistmodel.h b/src/gui/models/serverlistmodel.h index 191062641..4cbf811c0 100644 --- a/src/gui/models/serverlistmodel.h +++ b/src/gui/models/serverlistmodel.h @@ -24,7 +24,7 @@ namespace swift::gui::models explicit CServerListModel(QObject *parent = nullptr); //! Destructor - virtual ~CServerListModel() {} + ~CServerListModel() override = default; }; } // namespace swift::gui::models #endif // SWIFT_GUI_MODELS_SERVERLISTMODEL_H diff --git a/src/gui/models/simulatedaircraftlistmodel.h b/src/gui/models/simulatedaircraftlistmodel.h index 29f4f12a5..eca43c65f 100644 --- a/src/gui/models/simulatedaircraftlistmodel.h +++ b/src/gui/models/simulatedaircraftlistmodel.h @@ -35,7 +35,7 @@ namespace swift::gui::models explicit CSimulatedAircraftListModel(QObject *parent = nullptr); //! Destructor - virtual ~CSimulatedAircraftListModel() override {} + ~CSimulatedAircraftListModel() override = default; //! Mode void setAircraftMode(AircraftMode mode); diff --git a/src/gui/models/statusmessagefilter.h b/src/gui/models/statusmessagefilter.h index 48ffa030d..6d62f1bec 100644 --- a/src/gui/models/statusmessagefilter.h +++ b/src/gui/models/statusmessagefilter.h @@ -28,11 +28,10 @@ namespace swift::gui::models const QString &category); //! \copydoc IModelFilter::filter - virtual swift::misc::CStatusMessageList - filter(const swift::misc::CStatusMessageList &inContainer) const override; + swift::misc::CStatusMessageList filter(const swift::misc::CStatusMessageList &inContainer) const override; //! \copydoc IModelFilter::getAsValueObject - virtual swift::misc::CVariant getAsValueObject() const override; + swift::misc::CVariant getAsValueObject() const override; private: swift::misc::CStatusMessage::StatusSeverity m_severity = swift::misc::CStatusMessage::SeverityError; diff --git a/src/gui/models/statusmessagelistmodel.h b/src/gui/models/statusmessagelistmodel.h index 69fdd6847..c60a67b90 100644 --- a/src/gui/models/statusmessagelistmodel.h +++ b/src/gui/models/statusmessagelistmodel.h @@ -34,7 +34,7 @@ namespace swift::gui::models explicit CStatusMessageListModel(QObject *parent = nullptr); //! Destructor - virtual ~CStatusMessageListModel() override {} + ~CStatusMessageListModel() override = default; //! Set mode void setMode(Mode mode); @@ -46,7 +46,7 @@ namespace swift::gui::models void adjustOrderColumn(const swift::misc::CStatusMessageList &messages); //! \copydoc QAbstractItemModel::data - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; //! Currently sorted by timestamp or by order bool isSortedByTimestampOrOrder() const; diff --git a/src/gui/models/textmessagelistmodel.h b/src/gui/models/textmessagelistmodel.h index e4ba1564a..88bbb17b7 100644 --- a/src/gui/models/textmessagelistmodel.h +++ b/src/gui/models/textmessagelistmodel.h @@ -37,7 +37,7 @@ namespace swift::gui::models explicit CTextMessageListModel(TextMessageMode stationMode, QObject *parent = nullptr); //! Destructor - virtual ~CTextMessageListModel() override {} + ~CTextMessageListModel() override = default; //! Set mode void setTextMessageMode(TextMessageMode mode); @@ -46,7 +46,7 @@ namespace swift::gui::models TextMessageMode getTextMessageMode() const { return m_textMessageMode; } //! \copydoc QAbstractItemModel::data - virtual QVariant data(const QModelIndex &index, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; private: TextMessageMode m_textMessageMode = NotSet; diff --git a/src/gui/models/userlistmodel.h b/src/gui/models/userlistmodel.h index 9841cc95d..18eb9da2a 100644 --- a/src/gui/models/userlistmodel.h +++ b/src/gui/models/userlistmodel.h @@ -32,7 +32,7 @@ namespace swift::gui::models explicit CUserListModel(UserMode userMode, QObject *parent = nullptr); //! Destructor - virtual ~CUserListModel() {} + ~CUserListModel() override = default; //! Set station mode void setUserMode(UserMode userMode); diff --git a/src/gui/overlaymessages.cpp b/src/gui/overlaymessages.cpp index a9202ef4b..3c04afa7a 100644 --- a/src/gui/overlaymessages.cpp +++ b/src/gui/overlaymessages.cpp @@ -74,7 +74,7 @@ namespace swift::gui this->setDefaultConfirmationButton(QMessageBox::Cancel); } - COverlayMessages::~COverlayMessages() {} + COverlayMessages::~COverlayMessages() = default; void COverlayMessages::init(int w, int h) { diff --git a/src/gui/overlaymessages.h b/src/gui/overlaymessages.h index 18b3cfb21..02cce685e 100644 --- a/src/gui/overlaymessages.h +++ b/src/gui/overlaymessages.h @@ -51,7 +51,7 @@ namespace swift::gui explicit COverlayMessages(int w, int h, QWidget *parent); //! Destructor - virtual ~COverlayMessages() override; + ~COverlayMessages() override; //! Messages mode void setModeToMessages(); @@ -189,7 +189,7 @@ namespace swift::gui void display(std::chrono::milliseconds timeout = std::chrono::milliseconds(0)); //! \copydoc QFrame::keyPressEvent - virtual void keyPressEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; private: QScopedPointer ui; diff --git a/src/gui/overlaymessagesframe.h b/src/gui/overlaymessagesframe.h index 93bf65655..bef61bbb7 100644 --- a/src/gui/overlaymessagesframe.h +++ b/src/gui/overlaymessagesframe.h @@ -48,7 +48,7 @@ namespace swift::gui { public: //! Destructor - virtual ~COverlayMessagesBase() override {} + ~COverlayMessagesBase() override = default; //! Init, normally we use lazy init, but by calling init explicitly we can force initalization //! \remark usefule for text messages, as history will be already available @@ -332,7 +332,7 @@ namespace swift::gui } //! \copydoc QFrame::keyPressEvent - virtual void keyPressEvent(QKeyEvent *event) override + void keyPressEvent(QKeyEvent *event) override { if (m_overlayMessages && event->key() == Qt::Key_Escape) { @@ -343,7 +343,7 @@ namespace swift::gui } //! \copydoc QFrame::resizeEvent - virtual void resizeEvent(QResizeEvent *event) override + void resizeEvent(QResizeEvent *event) override { WIDGET::resizeEvent(event); if (m_overlayMessages && m_overlayMessages->isVisible()) { this->initInnerFrame(); } diff --git a/src/gui/pluginconfig.h b/src/gui/pluginconfig.h index bc7808533..7ee2ae02e 100644 --- a/src/gui/pluginconfig.h +++ b/src/gui/pluginconfig.h @@ -27,7 +27,7 @@ namespace swift::gui { public: //! Dtor. - virtual ~IPluginConfig() {} + virtual ~IPluginConfig() = default; //! Creates a new config window and returns its pointer. virtual CPluginConfigWindow *createConfigWindow(QWidget *parent) = 0; diff --git a/src/gui/plugindetailswindow.cpp b/src/gui/plugindetailswindow.cpp index e0efb6a2d..9d8f97515 100644 --- a/src/gui/plugindetailswindow.cpp +++ b/src/gui/plugindetailswindow.cpp @@ -27,7 +27,7 @@ namespace swift::gui connect(ui->pb_Close, &QPushButton::clicked, this, &CPluginDetailsWindow::close); } - CPluginDetailsWindow::~CPluginDetailsWindow() {} + CPluginDetailsWindow::~CPluginDetailsWindow() = default; void CPluginDetailsWindow::setPluginName(const QString &name) { diff --git a/src/gui/plugindetailswindow.h b/src/gui/plugindetailswindow.h index e635c5a21..c455bfa1a 100644 --- a/src/gui/plugindetailswindow.h +++ b/src/gui/plugindetailswindow.h @@ -33,7 +33,7 @@ namespace swift::gui explicit CPluginDetailsWindow(QWidget *parent = nullptr); //! Destructor - virtual ~CPluginDetailsWindow() override; + ~CPluginDetailsWindow() override; //! Sets the plugin name void setPluginName(const QString &name); diff --git a/src/gui/settings/dockwidgetsettings.cpp b/src/gui/settings/dockwidgetsettings.cpp index 3cbf3468b..22ca409c0 100644 --- a/src/gui/settings/dockwidgetsettings.cpp +++ b/src/gui/settings/dockwidgetsettings.cpp @@ -15,8 +15,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CDockWidgetSettings) namespace swift::gui::settings { - CDockWidgetSettings::CDockWidgetSettings() {} - void CDockWidgetSettings::resetMarginsToDefault() { // this->setMarginsWhenFloating(QMargins(0, 3, 15, 35)); // found by trial and error on windows diff --git a/src/gui/settings/dockwidgetsettings.h b/src/gui/settings/dockwidgetsettings.h index ceab3eb1d..eac9e57f2 100644 --- a/src/gui/settings/dockwidgetsettings.h +++ b/src/gui/settings/dockwidgetsettings.h @@ -35,7 +35,7 @@ namespace swift::gui::settings }; //! Default constructor - CDockWidgetSettings(); + CDockWidgetSettings() = default; //! Reset margins to default void resetMarginsToDefault(); diff --git a/src/gui/settings/guisettings.cpp b/src/gui/settings/guisettings.cpp index 50b99f9f1..6f30943d2 100644 --- a/src/gui/settings/guisettings.cpp +++ b/src/gui/settings/guisettings.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CGeneralGuiSettings) namespace swift::gui::settings { - CGeneralGuiSettings::CGeneralGuiSettings() {} - void CGeneralGuiSettings::setWidgetStyle(const QString &widgetStyle) { if (this->m_widgetStyle == widgetStyle) { return; } diff --git a/src/gui/settings/guisettings.h b/src/gui/settings/guisettings.h index 7230d27b6..c5cf1ae3f 100644 --- a/src/gui/settings/guisettings.h +++ b/src/gui/settings/guisettings.h @@ -29,7 +29,7 @@ namespace swift::gui::settings }; //! Default constructor - CGeneralGuiSettings(); + CGeneralGuiSettings() = default; //! Widget style const QString &getWidgetStyle() const { return m_widgetStyle; } diff --git a/src/gui/settings/navigatorsettings.cpp b/src/gui/settings/navigatorsettings.cpp index c94eb407d..1664c5fc1 100644 --- a/src/gui/settings/navigatorsettings.cpp +++ b/src/gui/settings/navigatorsettings.cpp @@ -15,8 +15,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CNavigatorSettings) namespace swift::gui::settings { - CNavigatorSettings::CNavigatorSettings() {} - void CNavigatorSettings::reset() {} void CNavigatorSettings::setMargins(const QMargins &margins) diff --git a/src/gui/settings/navigatorsettings.h b/src/gui/settings/navigatorsettings.h index 77e93a6e9..5c1f975c6 100644 --- a/src/gui/settings/navigatorsettings.h +++ b/src/gui/settings/navigatorsettings.h @@ -32,10 +32,10 @@ namespace swift::gui::settings }; //! Default constructor - CNavigatorSettings(); + CNavigatorSettings() = default; //! Destructor. - ~CNavigatorSettings() {} + ~CNavigatorSettings() = default; //! Reset to defaults void reset(); diff --git a/src/gui/settings/textmessagesettings.cpp b/src/gui/settings/textmessagesettings.cpp index f2df03c7f..f221a3a56 100644 --- a/src/gui/settings/textmessagesettings.cpp +++ b/src/gui/settings/textmessagesettings.cpp @@ -14,8 +14,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CTextMessageSettings) namespace swift::gui::settings { - CTextMessageSettings::CTextMessageSettings() {} - bool CTextMessageSettings::popupPrivateMessages() const { return this->getPopupAllMessages() || m_popupPrivateMessages; diff --git a/src/gui/settings/textmessagesettings.h b/src/gui/settings/textmessagesettings.h index 2b25dad96..5d684f4bc 100644 --- a/src/gui/settings/textmessagesettings.h +++ b/src/gui/settings/textmessagesettings.h @@ -44,7 +44,7 @@ namespace swift::gui::settings }; //! Default constructor - CTextMessageSettings(); + CTextMessageSettings() = default; //! Private messages? All considered. bool popupPrivateMessages() const; diff --git a/src/gui/settings/viewupdatesettings.cpp b/src/gui/settings/viewupdatesettings.cpp index b6b74e4a2..e3a55dc51 100644 --- a/src/gui/settings/viewupdatesettings.cpp +++ b/src/gui/settings/viewupdatesettings.cpp @@ -16,8 +16,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::gui::settings, CViewUpdateSettings) namespace swift::gui::settings { - CViewUpdateSettings::CViewUpdateSettings() {} - void CViewUpdateSettings::reset() { this->m_updateAircraft = CTime(10.0, CTimeUnit::s()); diff --git a/src/gui/settings/viewupdatesettings.h b/src/gui/settings/viewupdatesettings.h index fae178298..282b07f9e 100644 --- a/src/gui/settings/viewupdatesettings.h +++ b/src/gui/settings/viewupdatesettings.h @@ -34,7 +34,7 @@ namespace swift::gui::settings }; //! Default constructor - CViewUpdateSettings(); + CViewUpdateSettings() = default; //! Reset to defaults void reset(); diff --git a/src/gui/sharedstringlistcompleter.h b/src/gui/sharedstringlistcompleter.h index e15e0336e..72b1dc5e5 100644 --- a/src/gui/sharedstringlistcompleter.h +++ b/src/gui/sharedstringlistcompleter.h @@ -22,7 +22,7 @@ namespace swift::gui { public: //! Constructor - CSharedStringListCompleter() {} + CSharedStringListCompleter() = default; //! Update data bool updateData(const QStringList &data, int cacheTimeMs); diff --git a/src/gui/showhidebar.cpp b/src/gui/showhidebar.cpp index 63ad8d169..3ee750bdd 100644 --- a/src/gui/showhidebar.cpp +++ b/src/gui/showhidebar.cpp @@ -16,7 +16,7 @@ namespace swift::gui connect(ui->pb_ShowHidePushButton, &QPushButton::clicked, this, &CShowHideBar::toggleShowHide); } - CShowHideBar::~CShowHideBar() {} + CShowHideBar::~CShowHideBar() = default; bool CShowHideBar::isShown() const { return ui->pb_ShowHidePushButton->isChecked(); } } // namespace swift::gui diff --git a/src/gui/showhidebar.h b/src/gui/showhidebar.h index c70963ee1..bb8480974 100644 --- a/src/gui/showhidebar.h +++ b/src/gui/showhidebar.h @@ -28,7 +28,7 @@ namespace swift::gui explicit CShowHideBar(QWidget *parent = nullptr); //! Destructor - virtual ~CShowHideBar(); + ~CShowHideBar() override; //! Is shown? bool isShown() const; diff --git a/src/gui/systemtraywindow.h b/src/gui/systemtraywindow.h index d7d10626d..18954346a 100644 --- a/src/gui/systemtraywindow.h +++ b/src/gui/systemtraywindow.h @@ -63,10 +63,10 @@ namespace swift::gui protected: //! \copydoc QMainWindow::changeEvent - virtual void changeEvent(QEvent *event) override; + void changeEvent(QEvent *event) override; //! \copydoc QMainWindow::closeEvent - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; private: void createActions(); diff --git a/src/gui/textmessagetextedit.cpp b/src/gui/textmessagetextedit.cpp index 766bb8eae..bf0ed5749 100644 --- a/src/gui/textmessagetextedit.cpp +++ b/src/gui/textmessagetextedit.cpp @@ -51,7 +51,7 @@ namespace swift::gui connect(this, &QTextEdit::customContextMenuRequested, this, &CTextMessageTextEdit::showContextMenuForTextEdit); } - CTextMessageTextEdit::~CTextMessageTextEdit() {} + CTextMessageTextEdit::~CTextMessageTextEdit() = default; void CTextMessageTextEdit::insertTextMessage(const CTextMessage &textMessage, int maxMessages) { diff --git a/src/gui/textmessagetextedit.h b/src/gui/textmessagetextedit.h index 195d6255b..67d6e65c9 100644 --- a/src/gui/textmessagetextedit.h +++ b/src/gui/textmessagetextedit.h @@ -33,7 +33,7 @@ namespace swift::gui CTextMessageTextEdit(QWidget *parent = nullptr); //! Destructor - virtual ~CTextMessageTextEdit() override; + ~CTextMessageTextEdit() override; //! Insert a message void insertTextMessage(const swift::misc::network::CTextMessage &textMessage, int maxMessages = -1); diff --git a/src/gui/uppercasevalidator.h b/src/gui/uppercasevalidator.h index 3be426c3d..844b6bf87 100644 --- a/src/gui/uppercasevalidator.h +++ b/src/gui/uppercasevalidator.h @@ -38,10 +38,10 @@ namespace swift::gui void setAllowedCharacters09AZ(); //! \copydoc QValidator::validate - virtual State validate(QString &input, int &pos) const override; + State validate(QString &input, int &pos) const override; //! \copydoc QValidator::fixup - virtual void fixup(QString &input) const override; + void fixup(QString &input) const override; private: bool m_optionalValue = false; //!< allow empty diff --git a/src/gui/views/aircraftmodelstatisticsdialog.cpp b/src/gui/views/aircraftmodelstatisticsdialog.cpp index af7e63226..854354469 100644 --- a/src/gui/views/aircraftmodelstatisticsdialog.cpp +++ b/src/gui/views/aircraftmodelstatisticsdialog.cpp @@ -29,7 +29,7 @@ namespace swift::gui::views &CAircraftModelStatisticsDialog::displayHTMLMatrix); } - CAircraftModelStatisticsDialog::~CAircraftModelStatisticsDialog() {} + CAircraftModelStatisticsDialog::~CAircraftModelStatisticsDialog() = default; void CAircraftModelStatisticsDialog::analyzeModels(const CAircraftModelList &models) { diff --git a/src/gui/views/aircraftmodelstatisticsdialog.h b/src/gui/views/aircraftmodelstatisticsdialog.h index b6f5ebc32..0f7288d62 100644 --- a/src/gui/views/aircraftmodelstatisticsdialog.h +++ b/src/gui/views/aircraftmodelstatisticsdialog.h @@ -27,7 +27,7 @@ namespace swift::gui::views explicit CAircraftModelStatisticsDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelStatisticsDialog(); + ~CAircraftModelStatisticsDialog() override; //! Set and analyze the models void analyzeModels(const swift::misc::simulation::CAircraftModelList &models); diff --git a/src/gui/views/aircraftmodelvalidationdialog.cpp b/src/gui/views/aircraftmodelvalidationdialog.cpp index 7be61238e..7f3a900d7 100644 --- a/src/gui/views/aircraftmodelvalidationdialog.cpp +++ b/src/gui/views/aircraftmodelvalidationdialog.cpp @@ -30,7 +30,7 @@ namespace swift::gui::views Qt::QueuedConnection); } - CAircraftModelValidationDialog::~CAircraftModelValidationDialog() {} + CAircraftModelValidationDialog::~CAircraftModelValidationDialog() = default; void CAircraftModelValidationDialog::setModels(const CAircraftModelList &models, const CSimulatorInfo &simulator, const QString &simulatorDir) diff --git a/src/gui/views/aircraftmodelvalidationdialog.h b/src/gui/views/aircraftmodelvalidationdialog.h index d450ab406..d373f90a9 100644 --- a/src/gui/views/aircraftmodelvalidationdialog.h +++ b/src/gui/views/aircraftmodelvalidationdialog.h @@ -31,7 +31,7 @@ namespace swift::gui::views explicit CAircraftModelValidationDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CAircraftModelValidationDialog() override; + ~CAircraftModelValidationDialog() override; //! Models void setModels(const swift::misc::simulation::CAircraftModelList &models, diff --git a/src/gui/views/aircraftmodelview.h b/src/gui/views/aircraftmodelview.h index 9bc8a6c2c..4b1627b71 100644 --- a/src/gui/views/aircraftmodelview.h +++ b/src/gui/views/aircraftmodelview.h @@ -140,24 +140,24 @@ namespace swift::gui protected: //! \copydoc QTableView::dropEvent //! \sa swift::gui::models::CListModelBase::dropMimeData - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; //! \name View base class overrides //! @{ //! \copydoc swift::gui::views::COrderableViewWithDbObjects::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; //! \copydoc swift::gui::views::COrderableViewWithDbObjects::modifyLoadedJsonData - virtual swift::misc::CStatusMessage + swift::misc::CStatusMessage modifyLoadedJsonData(swift::misc::simulation::CAircraftModelList &models) const override; //! \copydoc swift::gui::views::COrderableViewWithDbObjects::validateLoadedJsonData - virtual swift::misc::CStatusMessage + swift::misc::CStatusMessage validateLoadedJsonData(const swift::misc::simulation::CAircraftModelList &models) const override; //! \copydoc swift::gui::views::COrderableViewWithDbObjects::jsonLoadedAndModelUpdated - virtual void jsonLoadedAndModelUpdated(const swift::misc::simulation::CAircraftModelList &models) override; + void jsonLoadedAndModelUpdated(const swift::misc::simulation::CAircraftModelList &models) override; //! @} private: diff --git a/src/gui/views/aircraftsituationview.h b/src/gui/views/aircraftsituationview.h index 20f314d9a..87bc1b9b5 100644 --- a/src/gui/views/aircraftsituationview.h +++ b/src/gui/views/aircraftsituationview.h @@ -31,7 +31,7 @@ namespace swift::gui::views protected: //! \copydoc CViewBase::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Request elevation diff --git a/src/gui/views/applicationinfoview.h b/src/gui/views/applicationinfoview.h index af6cd3188..b55ff0198 100644 --- a/src/gui/views/applicationinfoview.h +++ b/src/gui/views/applicationinfoview.h @@ -44,7 +44,7 @@ namespace swift::gui::views CApplicationInfoMenu(CApplicationInfoView *modelView) : menus::IMenuDelegate(modelView) {} //! \copydoc menus::IMenuDelegate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Model view diff --git a/src/gui/views/atcstationview.h b/src/gui/views/atcstationview.h index a6a852f51..8bb522e12 100644 --- a/src/gui/views/atcstationview.h +++ b/src/gui/views/atcstationview.h @@ -59,7 +59,7 @@ namespace swift::gui protected: //! \copydoc CViewBase::customMenu - virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override; + void customMenu(swift::gui::menus::CMenuActions &menuActions) override; private: void emitTestRequest1kAtcOnlineDummies() { emit this->testRequestDummyAtcOnlineStations(1000); } diff --git a/src/gui/views/checkboxdelegate.cpp b/src/gui/views/checkboxdelegate.cpp index 3608f266c..0252fcab1 100644 --- a/src/gui/views/checkboxdelegate.cpp +++ b/src/gui/views/checkboxdelegate.cpp @@ -25,8 +25,6 @@ namespace swift::gui::views : QItemDelegate(parent), m_iconCheckedUrl(iconCheckedUrl), m_iconUncheckedUrl(iconUncheckedUrl) {} - CCheckBoxDelegate::~CCheckBoxDelegate() {} - QWidget *CCheckBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const { diff --git a/src/gui/views/checkboxdelegate.h b/src/gui/views/checkboxdelegate.h index b2f9da9cf..af419c521 100644 --- a/src/gui/views/checkboxdelegate.h +++ b/src/gui/views/checkboxdelegate.h @@ -33,21 +33,21 @@ namespace swift::gui::views CCheckBoxDelegate(const QString &iconCheckedUrl, const QString &iconUncheckedUrl, QObject *parent = nullptr); //! Destructor - ~CCheckBoxDelegate(); + ~CCheckBoxDelegate() override = default; //! \copydoc QItemDelegate::createEditor - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, + const QModelIndex &index) const override; //! \copydoc QItemDelegate::setEditorData - virtual void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; //! \copydoc QItemDelegate::setModelData - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; //! \copydoc QItemDelegate::updateEditorGeometry - virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, + const QModelIndex &index) const override; private: QString m_iconCheckedUrl; diff --git a/src/gui/views/flightplandialog.cpp b/src/gui/views/flightplandialog.cpp index 89b1922a9..e6c48510f 100644 --- a/src/gui/views/flightplandialog.cpp +++ b/src/gui/views/flightplandialog.cpp @@ -25,7 +25,7 @@ namespace swift::gui::views &CFlightPlanDialog::loadFp); } - CFlightPlanDialog::~CFlightPlanDialog() {} + CFlightPlanDialog::~CFlightPlanDialog() = default; void CFlightPlanDialog::showFlightPlan(const CCallsign &callsign) { diff --git a/src/gui/views/flightplandialog.h b/src/gui/views/flightplandialog.h index da956a0a8..ef4b01939 100644 --- a/src/gui/views/flightplandialog.h +++ b/src/gui/views/flightplandialog.h @@ -27,7 +27,7 @@ namespace swift::gui::views explicit CFlightPlanDialog(QWidget *parent = nullptr); //! Destructor - virtual ~CFlightPlanDialog() override; + ~CFlightPlanDialog() override; //! Show a particular callsign flight plan void showFlightPlan(const swift::misc::aviation::CCallsign &callsign); diff --git a/src/gui/views/radarview.h b/src/gui/views/radarview.h index 02f12b574..078cfea81 100644 --- a/src/gui/views/radarview.h +++ b/src/gui/views/radarview.h @@ -30,10 +30,10 @@ namespace swift::gui::views protected: //! \copydoc QWidget::resizeEvent - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; //! \copydoc QWidget::wheelEvent - virtual void wheelEvent(QWheelEvent *event) override; + void wheelEvent(QWheelEvent *event) override; }; } // namespace swift::gui::views diff --git a/src/gui/views/simulatedaircraftview.h b/src/gui/views/simulatedaircraftview.h index 93abb3341..b87a9c64b 100644 --- a/src/gui/views/simulatedaircraftview.h +++ b/src/gui/views/simulatedaircraftview.h @@ -70,7 +70,7 @@ namespace swift::gui protected: //! \copydoc CViewBase::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Request text message for selected aircraft diff --git a/src/gui/views/userview.h b/src/gui/views/userview.h index 4ae4a681c..6c892c270 100644 --- a/src/gui/views/userview.h +++ b/src/gui/views/userview.h @@ -34,7 +34,7 @@ namespace swift::gui::views protected: //! \copydoc CViewBase::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; private: //! Request text message for selected aircraft diff --git a/src/gui/views/viewbase.h b/src/gui/views/viewbase.h index 965990963..6a76e1980 100644 --- a/src/gui/views/viewbase.h +++ b/src/gui/views/viewbase.h @@ -204,7 +204,7 @@ namespace swift::gui virtual bool acceptDrop(const QMimeData *mimeData) const = 0; //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea - virtual bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; + bool setParentDockWidgetInfoArea(swift::gui::CDockWidgetInfoArea *parentDockableWidget) override; //! Resize mode ResizeMode getResizeMode() const { return m_resizeMode; } @@ -301,7 +301,7 @@ namespace swift::gui Menu getMenu() const { return m_menus; } //! \copydoc QTableView::setSelectionModel - virtual void setSelectionModel(QItemSelectionModel *model) override; + void setSelectionModel(QItemSelectionModel *model) override; //! Main application window widget if any QWidget *mainApplicationWindowWidget() const; @@ -430,7 +430,7 @@ namespace swift::gui CViewBaseNonTemplate(QWidget *parent); //! Destructor - virtual ~CViewBaseNonTemplate() override; + ~CViewBaseNonTemplate() override; //! Method creating the menu //! \remarks override this method to contribute to the menu @@ -440,19 +440,19 @@ namespace swift::gui //! \name Functions from QTableView //! @{ //! \copydoc QTableView::resizeEvent - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; //! \copydoc QTableView::dragEnterEvent - virtual void dragEnterEvent(QDragEnterEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; //! \copydoc QTableView::dragMoveEvent - virtual void dragMoveEvent(QDragMoveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; //! \copydoc QTableView::dragLeaveEvent - virtual void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; //! \copydoc QTableView::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; //! @} //! Perform resizing (no presizing) / non slot method for template @@ -660,7 +660,7 @@ namespace swift::gui using ObjectType = typename T::ObjectType; //! Destructor - virtual ~CViewBase() + ~CViewBase() override { if (m_model) { m_model->markDestroyed(); } } @@ -716,13 +716,13 @@ namespace swift::gui //! @{ //! \copydoc swift::gui::models::ISelectionModel::selectObjects - virtual void selectObjects(const ContainerType &selectedObjects) override; + void selectObjects(const ContainerType &selectedObjects) override; //! \copydoc swift::gui::models::ISelectionModel::selectedObjects - virtual ContainerType selectedObjects() const override; + ContainerType selectedObjects() const override; //! \copydoc swift::gui::models::ISelectionModel::unselectedObjects - virtual ContainerType unselectedObjects() const override; + ContainerType unselectedObjects() const override; //! @} //! First selected, the only one, or default @@ -762,70 +762,70 @@ namespace swift::gui //! @{ //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeSelectedRows - virtual int removeSelectedRows() override; + int removeSelectedRows() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::presizeOrFullResizeToContents - virtual void presizeOrFullResizeToContents() override; + void presizeOrFullResizeToContents() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::clearHighlighting - virtual void clearHighlighting() override; + void clearHighlighting() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::materializeFilter - virtual void materializeFilter() override; + void materializeFilter() override; //! @} //! \name swift::gui::views::CViewBaseNonTemplate implementations //! @{ //!\copydoc swift::gui::views::CViewBaseNonTemplate::clear - virtual void clear() override; + void clear() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::rowCount - virtual int rowCount() const override; + int rowCount() const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::isEmpty - virtual bool isEmpty() const override; + bool isEmpty() const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::isOrderable - virtual bool isOrderable() const override; + bool isOrderable() const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::allowDragDrop - virtual void allowDragDrop(bool allowDrag, bool allowDrop, bool allowDropJsonFile = false) override; + void allowDragDrop(bool allowDrag, bool allowDrop, bool allowDropJsonFile = false) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::isDropAllowed - virtual bool isDropAllowed() const override; + bool isDropAllowed() const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::dropEvent - virtual void dropEvent(QDropEvent *event) override; + void dropEvent(QDropEvent *event) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::acceptDrop - virtual bool acceptDrop(const QMimeData *mimeData) const override; + bool acceptDrop(const QMimeData *mimeData) const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::setSorting - virtual bool setSorting(const swift::misc::CPropertyIndex &propertyIndex, - Qt::SortOrder order = Qt::AscendingOrder) override; + bool setSorting(const swift::misc::CPropertyIndex &propertyIndex, + Qt::SortOrder order = Qt::AscendingOrder) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::sortByPropertyIndex - virtual void sortByPropertyIndex(const swift::misc::CPropertyIndex &propertyIndex, - Qt::SortOrder order = Qt::AscendingOrder) override; + void sortByPropertyIndex(const swift::misc::CPropertyIndex &propertyIndex, + Qt::SortOrder order = Qt::AscendingOrder) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::setNoSorting - virtual void setNoSorting() override { m_model->setNoSorting(); } + void setNoSorting() override { m_model->setNoSorting(); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortProperty - virtual swift::misc::CPropertyIndex getSortProperty() const override { return m_model->getSortProperty(); } + swift::misc::CPropertyIndex getSortProperty() const override { return m_model->getSortProperty(); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortColumn - virtual int getSortColumn() const override { return m_model->getSortColumn(); } + int getSortColumn() const override { return m_model->getSortColumn(); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::hasValidSortColumn - virtual bool hasValidSortColumn() const override { return m_model->hasValidSortColumn(); } + bool hasValidSortColumn() const override { return m_model->hasValidSortColumn(); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::endsWithEmptyColumn - virtual bool endsWithEmptyColumn() const override { return m_model->endsWithEmptyColumn(); } + bool endsWithEmptyColumn() const override { return m_model->endsWithEmptyColumn(); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::getSortOrder - virtual Qt::SortOrder getSortOrder() const override { return m_model->getSortOrder(); } + Qt::SortOrder getSortOrder() const override { return m_model->getSortOrder(); } //! @} //! Sort if columns or order changed @@ -889,46 +889,46 @@ namespace swift::gui //! @{ //!\copydoc swift::gui::views::CViewBaseNonTemplate::reachedResizeThreshold - virtual bool reachedResizeThreshold(int containrerSize = -1) const override; + bool reachedResizeThreshold(int containrerSize = -1) const override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::performModeBasedResizeToContent - virtual void performModeBasedResizeToContent() override; + void performModeBasedResizeToContent() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::performUpdateContainer - virtual int performUpdateContainer(const swift::misc::CVariant &variant, bool sort, bool resize) override; + int performUpdateContainer(const swift::misc::CVariant &variant, bool sort, bool resize) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::updateSortIndicator - virtual void updateSortIndicator() override; + void updateSortIndicator() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::mouseOverCallback - virtual void mouseOverCallback(const QModelIndex &index, bool mouseOver) override; + void mouseOverCallback(const QModelIndex &index, bool mouseOver) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::drawDropIndicator - virtual void drawDropIndicator(bool indicator) override; + void drawDropIndicator(bool indicator) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::copy - virtual void copy() override; + void copy() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::cut - virtual void cut() override; + void cut() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::paste - virtual void paste() override; + void paste() override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::displayJsonPopup - virtual void displayJsonPopup() override { this->displayContainerAsJsonPopup(false); } + void displayJsonPopup() override { this->displayContainerAsJsonPopup(false); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::displaySelectedJsonPopup - virtual void displaySelectedJsonPopup() override { this->displayContainerAsJsonPopup(true); } + void displaySelectedJsonPopup() override { this->displayContainerAsJsonPopup(true); } //!\copydoc swift::gui::views::CViewBaseNonTemplate::filterDialogFinished - virtual bool filterDialogFinished(int status) override; + bool filterDialogFinished(int status) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::filterWidgetChangedFilter - virtual bool filterWidgetChangedFilter(bool enabled) override; + bool filterWidgetChangedFilter(bool enabled) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeFilter - virtual void removeFilter() override; + void removeFilter() override; //! @} //! Modify JSON data loaded in swift::gui::views::CViewBaseNonTemplate::loadJson @@ -942,10 +942,10 @@ namespace swift::gui virtual void jsonLoadedAndModelUpdated(const ContainerType &data); //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu - virtual void customMenu(menus::CMenuActions &menuActions) override; + void customMenu(menus::CMenuActions &menuActions) override; //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu - virtual swift::misc::CStatusMessage loadJsonFile(const QString &fileName) override; + swift::misc::CStatusMessage loadJsonFile(const QString &fileName) override; //! Display the container as JSON popup virtual void displayContainerAsJsonPopup(bool selectedOnly); @@ -954,20 +954,19 @@ namespace swift::gui //! @{ //!\copydoc swift::gui::views::CViewBaseNonTemplate::removeFilter - virtual void onClicked(const QModelIndex &index) override; + void onClicked(const QModelIndex &index) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::onDoubleClicked - virtual void onDoubleClicked(const QModelIndex &index) override; + void onDoubleClicked(const QModelIndex &index) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::onRowSelected - virtual void onRowSelected(const QModelIndex &index) override; + void onRowSelected(const QModelIndex &index) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::loadJson - virtual swift::misc::CStatusMessage loadJson(const QString &directory = {}) override; + swift::misc::CStatusMessage loadJson(const QString &directory = {}) override; //!\copydoc swift::gui::views::CViewBaseNonTemplate::saveJson - virtual swift::misc::CStatusMessage saveJson(bool selectedOnly = false, - const QString &directory = {}) override; + swift::misc::CStatusMessage saveJson(bool selectedOnly = false, const QString &directory = {}) override; //! @} }; } // namespace views diff --git a/src/gui/views/viewbaseitemdelegate.h b/src/gui/views/viewbaseitemdelegate.h index 848b44deb..0357e4367 100644 --- a/src/gui/views/viewbaseitemdelegate.h +++ b/src/gui/views/viewbaseitemdelegate.h @@ -27,11 +27,10 @@ namespace swift::gui::views //! @{ //! \copydoc QStyledItemDelegate::paint - virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; //! \copydoc QStyledItemDelegate::sizeHint - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; //! @} private: diff --git a/src/gui/views/viewbasenontemplate.cpp b/src/gui/views/viewbasenontemplate.cpp index 39f9d79ff..d2145a311 100644 --- a/src/gui/views/viewbasenontemplate.cpp +++ b/src/gui/views/viewbasenontemplate.cpp @@ -88,10 +88,7 @@ namespace swift::gui::views resize->setContext(Qt::WidgetShortcut); } - CViewBaseNonTemplate::~CViewBaseNonTemplate() - { - // dtor - } + CViewBaseNonTemplate::~CViewBaseNonTemplate() = default; bool CViewBaseNonTemplate::setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget) { diff --git a/src/gui/views/viewbaseproxystyle.h b/src/gui/views/viewbaseproxystyle.h index ec9af5865..8e0514627 100644 --- a/src/gui/views/viewbaseproxystyle.h +++ b/src/gui/views/viewbaseproxystyle.h @@ -28,8 +28,8 @@ namespace swift::gui::views //! @{ //! \copydoc QProxyStyle::drawPrimitive - virtual void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, - const QWidget *widget) const override; + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, + const QWidget *widget) const override; //! @} private: diff --git a/src/gui/views/viewcallsignobjects.h b/src/gui/views/viewcallsignobjects.h index 533723ac2..9bc8aa686 100644 --- a/src/gui/views/viewcallsignobjects.h +++ b/src/gui/views/viewcallsignobjects.h @@ -58,7 +58,7 @@ namespace swift::gui int replaceOrAddObjectByCallsign(const ObjectType &object); //! Reselect by callsigns - virtual void selectObjects(const ContainerType &selectedObjects) override; + void selectObjects(const ContainerType &selectedObjects) override; protected: //! Constructor diff --git a/src/gui/views/viewdbobjects.h b/src/gui/views/viewdbobjects.h index 2471ef81f..9409073da 100644 --- a/src/gui/views/viewdbobjects.h +++ b/src/gui/views/viewdbobjects.h @@ -63,14 +63,14 @@ namespace swift::gui int replaceOrAddObjectsByKey(const ContainerType &container); //! Select by DB keys - virtual void selectObjects(const ContainerType &selectedObjects) override; + void selectObjects(const ContainerType &selectedObjects) override; protected: //! Constructor explicit CViewWithDbObjects(QWidget *parent = nullptr); //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu - virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override; + void customMenu(swift::gui::menus::CMenuActions &menuActions) override; }; //! Base class for views with DB objects also orderable (based on swift::misc::IOrderableList ) @@ -91,14 +91,14 @@ namespace swift::gui using KeyType = typename T::KeyType; //! Select by DB keys - virtual void selectObjects(const ContainerType &selectedObjects) override; + void selectObjects(const ContainerType &selectedObjects) override; protected: //! Constructor explicit COrderableViewWithDbObjects(QWidget *parent = nullptr); //! \copydoc swift::gui::views::CViewBaseNonTemplate::customMenu - virtual void customMenu(swift::gui::menus::CMenuActions &menuActions) override; + void customMenu(swift::gui::menus::CMenuActions &menuActions) override; //! Move selected items void moveSelectedItems(int order); diff --git a/src/input/joystick.h b/src/input/joystick.h index 0e02d3346..fd5e25977 100644 --- a/src/input/joystick.h +++ b/src/input/joystick.h @@ -27,7 +27,7 @@ namespace swift::input IJoystick(QObject *parent = nullptr); //! Destructor - virtual ~IJoystick() {} + ~IJoystick() override = default; //! Creates a native joystick handler object static std::unique_ptr create(QObject *parent = nullptr); diff --git a/src/input/keyboard.h b/src/input/keyboard.h index e683e455f..491e3c548 100644 --- a/src/input/keyboard.h +++ b/src/input/keyboard.h @@ -28,7 +28,7 @@ namespace swift::input IKeyboard(QObject *parent = nullptr); //! Destructor - virtual ~IKeyboard() {} + ~IKeyboard() override = default; //! Creates a native keyboard handler object static std::unique_ptr create(QObject *parent = nullptr); diff --git a/src/input/linux/joysticklinux.h b/src/input/linux/joysticklinux.h index 451c2c002..75f140951 100644 --- a/src/input/linux/joysticklinux.h +++ b/src/input/linux/joysticklinux.h @@ -27,7 +27,7 @@ namespace swift::input public: //! Constructor CJoystickDevice(const QString &path, QFile *fd, QObject *parent); - ~CJoystickDevice(); + ~CJoystickDevice() override; //! Get device name QString getName() const { return m_name; } @@ -65,10 +65,10 @@ namespace swift::input CJoystickLinux &operator=(CJoystickLinux const &) = delete; //! \brief Destructor - virtual ~CJoystickLinux() = default; + ~CJoystickLinux() override = default; //! \copydoc swift::input::IJoystick::getAllAvailableJoystickButtons() - virtual swift::misc::input::CJoystickButtonList getAllAvailableJoystickButtons() const override; + swift::misc::input::CJoystickButtonList getAllAvailableJoystickButtons() const override; private: friend class IJoystick; diff --git a/src/input/linux/keyboardlinux.h b/src/input/linux/keyboardlinux.h index be8a8932c..8452704db 100644 --- a/src/input/linux/keyboardlinux.h +++ b/src/input/linux/keyboardlinux.h @@ -32,11 +32,11 @@ namespace swift::input CKeyboardLinux &operator=(CKeyboardLinux const &) = delete; //! Destructor - virtual ~CKeyboardLinux() override; + ~CKeyboardLinux() override; protected: //! \copydoc IKeyboard::init() - virtual bool init() override; + bool init() override; private slots: //! Changed directory to linux devices diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt index 018a84ab4..6d0e075a9 100644 --- a/src/misc/CMakeLists.txt +++ b/src/misc/CMakeLists.txt @@ -291,7 +291,6 @@ add_library(misc SHARED propertyindexref.h propertyindexvariantmap.cpp propertyindexvariantmap.h - provider.cpp provider.h range.h registermetadata.cpp diff --git a/src/misc/applicationinfolist.cpp b/src/misc/applicationinfolist.cpp index 66e5c0bc5..2823b02a9 100644 --- a/src/misc/applicationinfolist.cpp +++ b/src/misc/applicationinfolist.cpp @@ -14,8 +14,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CApplicationInfo, CApplicationInfoList namespace swift::misc { - CApplicationInfoList::CApplicationInfoList() {} - CApplicationInfoList::CApplicationInfoList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/applicationinfolist.h b/src/misc/applicationinfolist.h index 94e562fe6..b4927f234 100644 --- a/src/misc/applicationinfolist.h +++ b/src/misc/applicationinfolist.h @@ -26,7 +26,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CApplicationInfoList(); + CApplicationInfoList() = default; //! Construct from base class object. CApplicationInfoList(const CSequence &other); diff --git a/src/misc/atomicfile.h b/src/misc/atomicfile.h index 036f915e3..afb9f3dab 100644 --- a/src/misc/atomicfile.h +++ b/src/misc/atomicfile.h @@ -31,15 +31,15 @@ namespace swift::misc CAtomicFile(const QString &filename) : QFile(filename) {} //! \copydoc QFile::~QFile - virtual ~CAtomicFile() override; + ~CAtomicFile() override; //! \copydoc QFile::open //! Just before opening the file, the filename is changed so we actually write to a temporary file. - virtual bool open(OpenMode mode) override; + bool open(OpenMode mode) override; //! \copydoc QFileDevice::close //! After closing the file, it is renamed so that it overwrites the target file. - virtual void close() override; + void close() override; //! Calls close() and returns false if there was an error at any stage. bool checkedClose(); diff --git a/src/misc/aviation/aircraftcategorylist.cpp b/src/misc/aviation/aircraftcategorylist.cpp index 6193c45c0..59e75f89b 100644 --- a/src/misc/aviation/aircraftcategorylist.cpp +++ b/src/misc/aviation/aircraftcategorylist.cpp @@ -13,8 +13,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftCategory, CAircraft namespace swift::misc::aviation { - CAircraftCategoryList::CAircraftCategoryList() {} - CAircraftCategoryList::CAircraftCategoryList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/aviation/aircraftcategorylist.h b/src/misc/aviation/aircraftcategorylist.h index 203612b99..22eaf521f 100644 --- a/src/misc/aviation/aircraftcategorylist.h +++ b/src/misc/aviation/aircraftcategorylist.h @@ -34,7 +34,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CAircraftCategoryList(); + CAircraftCategoryList() = default; //! Construct from a base class object. CAircraftCategoryList(const CSequence &other); diff --git a/src/misc/aviation/aircraftengine.h b/src/misc/aviation/aircraftengine.h index 00b74cf3e..da49cdc33 100644 --- a/src/misc/aviation/aircraftengine.h +++ b/src/misc/aviation/aircraftengine.h @@ -22,7 +22,7 @@ namespace swift::misc::aviation { public: //! Default constructor - CAircraftEngine() {} + CAircraftEngine() = default; //! Constructor //! \remark numbers are 1 based! diff --git a/src/misc/aviation/aircrafticaocode.h b/src/misc/aviation/aircrafticaocode.h index 3803067b7..1d525442e 100644 --- a/src/misc/aviation/aircrafticaocode.h +++ b/src/misc/aviation/aircrafticaocode.h @@ -54,7 +54,7 @@ namespace swift::misc::aviation }; //! Default constructor. - CAircraftIcaoCode() {} + CAircraftIcaoCode() = default; //! Constructor. CAircraftIcaoCode(const QString &icao, const QString &combinedType = ""); diff --git a/src/misc/aviation/aircrafticaocodelist.cpp b/src/misc/aviation/aircrafticaocodelist.cpp index 77393529c..6a999931e 100644 --- a/src/misc/aviation/aircrafticaocodelist.cpp +++ b/src/misc/aviation/aircrafticaocodelist.cpp @@ -13,8 +13,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftIcaoCode, CAircraft namespace swift::misc::aviation { - CAircraftIcaoCodeList::CAircraftIcaoCodeList() {} - CAircraftIcaoCodeList::CAircraftIcaoCodeList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/aviation/aircrafticaocodelist.h b/src/misc/aviation/aircrafticaocodelist.h index 14bd25ce5..68ea31675 100644 --- a/src/misc/aviation/aircrafticaocodelist.h +++ b/src/misc/aviation/aircrafticaocodelist.h @@ -35,7 +35,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CAircraftIcaoCodeList(); + CAircraftIcaoCodeList() = default; //! Construct from a base class object. CAircraftIcaoCodeList(const CSequence &other); diff --git a/src/misc/aviation/aircraftparts.h b/src/misc/aviation/aircraftparts.h index fcc229238..8a6da191a 100644 --- a/src/misc/aviation/aircraftparts.h +++ b/src/misc/aviation/aircraftparts.h @@ -46,7 +46,7 @@ namespace swift::misc::aviation }; //! Default constructor - CAircraftParts() {} + CAircraftParts() = default; //! Default constructor CAircraftParts(int flapsPercent); diff --git a/src/misc/aviation/aircraftpartslist.cpp b/src/misc/aviation/aircraftpartslist.cpp index 7a61e8c77..b6ac663a8 100644 --- a/src/misc/aviation/aircraftpartslist.cpp +++ b/src/misc/aviation/aircraftpartslist.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftParts, CAircraftPar namespace swift::misc::aviation { - CAircraftPartsList::CAircraftPartsList() {} - CAircraftPartsList::CAircraftPartsList(const CSequence &other) : CSequence(other) {} int CAircraftPartsList::setOnGround(bool onGround) diff --git a/src/misc/aviation/aircraftpartslist.h b/src/misc/aviation/aircraftpartslist.h index b71b8b4ae..386567234 100644 --- a/src/misc/aviation/aircraftpartslist.h +++ b/src/misc/aviation/aircraftpartslist.h @@ -31,7 +31,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CAircraftPartsList(); + CAircraftPartsList() = default; //! Construct from a base class object. CAircraftPartsList(const CSequence &other); diff --git a/src/misc/aviation/aircraftsituation.cpp b/src/misc/aviation/aircraftsituation.cpp index 66d8d5571..012a8659a 100644 --- a/src/misc/aviation/aircraftsituation.cpp +++ b/src/misc/aviation/aircraftsituation.cpp @@ -87,8 +87,6 @@ namespace swift::misc::aviation qRegisterMetaType(); } - CAircraftSituation::CAircraftSituation() {} - CAircraftSituation::CAircraftSituation(const CCallsign &correspondingCallsign) : m_correspondingCallsign(correspondingCallsign) {} diff --git a/src/misc/aviation/aircraftsituation.h b/src/misc/aviation/aircraftsituation.h index 45c500b95..c6f56e62a 100644 --- a/src/misc/aviation/aircraftsituation.h +++ b/src/misc/aviation/aircraftsituation.h @@ -104,7 +104,7 @@ namespace swift::misc }; //! Default constructor. - CAircraftSituation(); + CAircraftSituation() = default; //! Constructor with callsign CAircraftSituation(const CCallsign &correspondingCallsign); @@ -143,7 +143,7 @@ namespace swift::misc bool isPositionOrAltitudeNull() const { return this->isPositionNull() || this->getAltitude().isNull(); } //! Null situation - virtual bool isNull() const override; + bool isNull() const override; //! Is given info better (more accurate)? bool isOtherElevationInfoBetter(GndElevationInfo otherInfo, bool transferred) const; @@ -171,10 +171,10 @@ namespace swift::misc void setPosition(const geo::CCoordinateGeodetic &position) { m_position = position; } //! \copydoc geo::ICoordinateGeodetic::latitude() - virtual geo::CLatitude latitude() const override { return m_position.latitude(); } + geo::CLatitude latitude() const override { return m_position.latitude(); } //! \copydoc geo::ICoordinateGeodetic::longitude() - virtual geo::CLongitude longitude() const override { return m_position.longitude(); } + geo::CLongitude longitude() const override { return m_position.longitude(); } //! Is on ground? bool isOnGround() const { return m_onGroundInfo.getOnGround() == COnGroundInfo::OnGround; } @@ -210,13 +210,10 @@ namespace swift::misc const CAltitude &geodeticHeight() const override { return m_position.geodeticHeight(); } //! \copydoc geo::ICoordinateGeodetic::normalVector - virtual QVector3D normalVector() const override { return m_position.normalVector(); } + QVector3D normalVector() const override { return m_position.normalVector(); } //! \copydoc geo::ICoordinateGeodetic::normalVectorDouble - virtual std::array normalVectorDouble() const override - { - return m_position.normalVectorDouble(); - } + std::array normalVectorDouble() const override { return m_position.normalVectorDouble(); } //! Elevation of the ground directly beneath const CAltitude &getGroundElevation() const { return m_groundElevationPlane.getAltitude(); } diff --git a/src/misc/aviation/aircraftsituationchangelist.cpp b/src/misc/aviation/aircraftsituationchangelist.cpp index 1e931f1a2..dc8ce7a8f 100644 --- a/src/misc/aviation/aircraftsituationchangelist.cpp +++ b/src/misc/aviation/aircraftsituationchangelist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAircraftSituationChange, CA namespace swift::misc::aviation { - CAircraftSituationChangeList::CAircraftSituationChangeList() {} - CAircraftSituationChangeList::CAircraftSituationChangeList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/aviation/aircraftsituationchangelist.h b/src/misc/aviation/aircraftsituationchangelist.h index b88b2d3aa..c22b84067 100644 --- a/src/misc/aviation/aircraftsituationchangelist.h +++ b/src/misc/aviation/aircraftsituationchangelist.h @@ -27,7 +27,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CAircraftSituationChangeList(); + CAircraftSituationChangeList() = default; //! Construct from a base class object. CAircraftSituationChangeList(const CSequence &other); diff --git a/src/misc/aviation/aircraftvelocity.cpp b/src/misc/aviation/aircraftvelocity.cpp index f812c125f..4d890b465 100644 --- a/src/misc/aviation/aircraftvelocity.cpp +++ b/src/misc/aviation/aircraftvelocity.cpp @@ -18,8 +18,6 @@ namespace swift::misc::aviation const CAngleUnit CAircraftVelocity::c_pbhAngleUnit = CAngleUnit::rad(); const CTimeUnit CAircraftVelocity::c_timeUnit = CTimeUnit::s(); - CAircraftVelocity::CAircraftVelocity() = default; - CAircraftVelocity::CAircraftVelocity(double x, double y, double z, CSpeedUnit xyzUnit, double pitch, double roll, double heading, CAngleUnit pbhAngleUnit, CTimeUnit pbhTimeUnit) { diff --git a/src/misc/aviation/aircraftvelocity.h b/src/misc/aviation/aircraftvelocity.h index 42c343722..cf9db2980 100644 --- a/src/misc/aviation/aircraftvelocity.h +++ b/src/misc/aviation/aircraftvelocity.h @@ -34,7 +34,7 @@ namespace swift::misc::aviation }; //! Default constructor - CAircraftVelocity(); + CAircraftVelocity() = default; //! Constructor CAircraftVelocity(double x, double y, double z, physical_quantities::CSpeedUnit xyzUnit, double pitch, diff --git a/src/misc/aviation/airlineicaocodelist.cpp b/src/misc/aviation/airlineicaocodelist.cpp index b096e1287..fdc0f59cb 100644 --- a/src/misc/aviation/airlineicaocodelist.cpp +++ b/src/misc/aviation/airlineicaocodelist.cpp @@ -20,8 +20,6 @@ namespace swift::misc::aviation return cats; } - CAirlineIcaoCodeList::CAirlineIcaoCodeList() {} - CAirlineIcaoCodeList::CAirlineIcaoCodeList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/aviation/airlineicaocodelist.h b/src/misc/aviation/airlineicaocodelist.h index 71380c6ce..6e77002e7 100644 --- a/src/misc/aviation/airlineicaocodelist.h +++ b/src/misc/aviation/airlineicaocodelist.h @@ -38,7 +38,7 @@ namespace swift::misc::aviation static const QStringList &getLogCategories(); //! Default constructor. - CAirlineIcaoCodeList(); + CAirlineIcaoCodeList() = default; //! Construct from a base class object. CAirlineIcaoCodeList(const CSequence &other); diff --git a/src/misc/aviation/airport.h b/src/misc/aviation/airport.h index 396a84457..b4df40b5f 100644 --- a/src/misc/aviation/airport.h +++ b/src/misc/aviation/airport.h @@ -132,22 +132,20 @@ namespace swift::misc::aviation bool hasValidIcaoCode() const { return !this->getIcao().isEmpty(); } //! NULL airport? - virtual bool isNull() const override; + bool isNull() const override; //! \copydoc geo::ICoordinateGeodetic::latitude - virtual swift::misc::geo::CLatitude latitude() const override { return this->getPosition().latitude(); } + + swift::misc::geo::CLatitude latitude() const override { return this->getPosition().latitude(); } //! \copydoc geo::ICoordinateGeodetic::longitude - virtual swift::misc::geo::CLongitude longitude() const override { return this->getPosition().longitude(); } + swift::misc::geo::CLongitude longitude() const override { return this->getPosition().longitude(); } //! \copydoc geo::ICoordinateGeodetic::normalVector - virtual QVector3D normalVector() const override { return this->getPosition().normalVector(); } + QVector3D normalVector() const override { return this->getPosition().normalVector(); } //! \copydoc geo::ICoordinateGeodetic::normalVectorDouble - virtual std::array normalVectorDouble() const override - { - return this->getPosition().normalVectorDouble(); - } + std::array normalVectorDouble() const override { return this->getPosition().normalVectorDouble(); } //! \copydoc swift::misc::mixin::Index::propertyByIndex QVariant propertyByIndex(swift::misc::CPropertyIndexRef index) const; diff --git a/src/misc/aviation/airporticaocode.h b/src/misc/aviation/airporticaocode.h index 3c4f3cc72..8b13a1bd8 100644 --- a/src/misc/aviation/airporticaocode.h +++ b/src/misc/aviation/airporticaocode.h @@ -25,7 +25,7 @@ namespace swift::misc::aviation { public: //! Default constructor. - CAirportIcaoCode() {} + CAirportIcaoCode() = default; //! Constructor CAirportIcaoCode(const QString &icaoCode) : m_icaoCode(CAirportIcaoCode::unifyAirportCode(icaoCode)) {} diff --git a/src/misc/aviation/atcstation.cpp b/src/misc/aviation/atcstation.cpp index 19d8b0520..b18bab477 100644 --- a/src/misc/aviation/atcstation.cpp +++ b/src/misc/aviation/atcstation.cpp @@ -25,8 +25,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CAtcStation) namespace swift::misc::aviation { - CAtcStation::CAtcStation() {} - CAtcStation::CAtcStation(const QString &callsign) : m_callsign(callsign) { m_callsign.setTypeHint(CCallsign::Atc); } CAtcStation::CAtcStation(const CCallsign &callsign, const CUser &controller, const CFrequency &frequency, diff --git a/src/misc/aviation/atcstation.h b/src/misc/aviation/atcstation.h index b61bb31a8..ee6a88397 100644 --- a/src/misc/aviation/atcstation.h +++ b/src/misc/aviation/atcstation.h @@ -58,7 +58,7 @@ namespace swift::misc::aviation }; //! Default constructor. - CAtcStation(); + CAtcStation() = default; //! Simplified constructor CAtcStation(const QString &callsign); @@ -202,19 +202,19 @@ namespace swift::misc::aviation void setLogoffTimeUtc(const QDateTime &logoffTimeUtc) { m_logoffTimeUtc = logoffTimeUtc; } //! \copydoc geo::ICoordinateGeodetic::latitude - virtual geo::CLatitude latitude() const override; + geo::CLatitude latitude() const override; //! \copydoc geo::ICoordinateGeodetic::longitude - virtual geo::CLongitude longitude() const override; + geo::CLongitude longitude() const override; //! \copydoc geo::ICoordinateGeodetic::geodeticHeight const aviation::CAltitude &geodeticHeight() const override; //! \copydoc geo::ICoordinateGeodetic::normalVector - virtual QVector3D normalVector() const override; + QVector3D normalVector() const override; //! \copydoc geo::ICoordinateGeodetic::normalVectorDouble - virtual std::array normalVectorDouble() const override; + std::array normalVectorDouble() const override; //! \copydoc swift::misc::mixin::Index::propertyByIndex QVariant propertyByIndex(CPropertyIndexRef index) const; diff --git a/src/misc/aviation/atcstationlist.cpp b/src/misc/aviation/atcstationlist.cpp index e335889a9..85eb9b05b 100644 --- a/src/misc/aviation/atcstationlist.cpp +++ b/src/misc/aviation/atcstationlist.cpp @@ -19,8 +19,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CAtcStation, CAtcStationList namespace swift::misc::aviation { - CAtcStationList::CAtcStationList() {} - CAtcStationList::CAtcStationList(const CSequence &other) : CSequence(other) {} CAtcStationList CAtcStationList::findIfComUnitTunedInChannelSpacing(const CComSystem &comUnit) const diff --git a/src/misc/aviation/atcstationlist.h b/src/misc/aviation/atcstationlist.h index f835771f3..3c439ee76 100644 --- a/src/misc/aviation/atcstationlist.h +++ b/src/misc/aviation/atcstationlist.h @@ -35,7 +35,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CAtcStationList(); + CAtcStationList() = default; //! Construct from a base class object. CAtcStationList(const CSequence &other); diff --git a/src/misc/aviation/callsign.h b/src/misc/aviation/callsign.h index e37bf47f2..1614627a3 100644 --- a/src/misc/aviation/callsign.h +++ b/src/misc/aviation/callsign.h @@ -48,7 +48,7 @@ namespace swift::misc }; //! Default constructor. - CCallsign() {} + CCallsign() = default; //! Constructor CCallsign(const QString &callsign, TypeHint hint = NoHint); diff --git a/src/misc/aviation/callsignset.cpp b/src/misc/aviation/callsignset.cpp index 464f74712..edd0d6047 100644 --- a/src/misc/aviation/callsignset.cpp +++ b/src/misc/aviation/callsignset.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_COLLECTION_MIXINS(swift::misc::aviation, CCallsign, CCallsignSet) namespace swift::misc::aviation { - CCallsignSet::CCallsignSet() {} - CCallsignSet::CCallsignSet(const QStringList &callsigns, CCallsign::TypeHint typeHint) { for (const QString &c : callsigns) diff --git a/src/misc/aviation/callsignset.h b/src/misc/aviation/callsignset.h index 3ef412671..e770b38e0 100644 --- a/src/misc/aviation/callsignset.h +++ b/src/misc/aviation/callsignset.h @@ -29,7 +29,7 @@ namespace swift::misc::aviation public: //! Default constructor - CCallsignSet(); + CCallsignSet() = default; //! By string list CCallsignSet(const QStringList &callsigns, CCallsign::TypeHint typeHint = CCallsign::NoHint); diff --git a/src/misc/aviation/comsystem.h b/src/misc/aviation/comsystem.h index fac643ac0..dba58ff15 100644 --- a/src/misc/aviation/comsystem.h +++ b/src/misc/aviation/comsystem.h @@ -58,7 +58,7 @@ namespace swift::misc::aviation }; //! Default constructor - CComSystem() {} + CComSystem() = default; //! Constructor CComSystem(const QString &name, const physical_quantities::CFrequency &activeFrequency, diff --git a/src/misc/aviation/flightplan.cpp b/src/misc/aviation/flightplan.cpp index afada2ad8..796ee40dc 100644 --- a/src/misc/aviation/flightplan.cpp +++ b/src/misc/aviation/flightplan.cpp @@ -28,8 +28,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CFlightPlan) namespace swift::misc::aviation { - CFlightPlanRemarks::CFlightPlanRemarks() {} - CFlightPlanRemarks::CFlightPlanRemarks(const QString &remarks, bool parse) : m_remarks(cleanRemarks(remarks)) { if (parse) { this->parseFlightPlanRemarks(); } diff --git a/src/misc/aviation/flightplan.h b/src/misc/aviation/flightplan.h index 8551616ad..8b32428d4 100644 --- a/src/misc/aviation/flightplan.h +++ b/src/misc/aviation/flightplan.h @@ -46,7 +46,7 @@ namespace swift::misc::aviation { public: //! Ctor - CFlightPlanRemarks(); + CFlightPlanRemarks() = default; //! Ctor CFlightPlanRemarks(const QString &remarks, bool parse = true); diff --git a/src/misc/aviation/flightplanlist.cpp b/src/misc/aviation/flightplanlist.cpp index bfe4cf038..cde7282ff 100644 --- a/src/misc/aviation/flightplanlist.cpp +++ b/src/misc/aviation/flightplanlist.cpp @@ -7,7 +7,5 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CFlightPlan, CFlightPlanList namespace swift::misc::aviation { - CFlightPlanList::CFlightPlanList() {} - CFlightPlanList::CFlightPlanList(const CSequence &other) : CSequence(other) {} } // namespace swift::misc::aviation diff --git a/src/misc/aviation/flightplanlist.h b/src/misc/aviation/flightplanlist.h index 11f8d2321..42541816e 100644 --- a/src/misc/aviation/flightplanlist.h +++ b/src/misc/aviation/flightplanlist.h @@ -29,7 +29,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CFlightPlanList(); + CFlightPlanList() = default; //! Construct from a base class object. CFlightPlanList(const CSequence &other); diff --git a/src/misc/aviation/livery.cpp b/src/misc/aviation/livery.cpp index a8e3d51df..4d50f3fe4 100644 --- a/src/misc/aviation/livery.cpp +++ b/src/misc/aviation/livery.cpp @@ -25,8 +25,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::aviation, CLivery) namespace swift::misc::aviation { - CLivery::CLivery() {} - CLivery::CLivery(const QString &combinedCode, const CAirlineIcaoCode &airline, const QString &description) : CLivery(-1, combinedCode, airline, description, "", "", false) {} diff --git a/src/misc/aviation/livery.h b/src/misc/aviation/livery.h index 23a09e395..8d3aeb217 100644 --- a/src/misc/aviation/livery.h +++ b/src/misc/aviation/livery.h @@ -40,7 +40,7 @@ namespace swift::misc::aviation }; //! Default constructor. - CLivery(); + CLivery() = default; //! Constructor CLivery(const QString &combinedCode, const CAirlineIcaoCode &airline, const QString &description); diff --git a/src/misc/aviation/liverylist.cpp b/src/misc/aviation/liverylist.cpp index 1305cf047..20ac2ddfa 100644 --- a/src/misc/aviation/liverylist.cpp +++ b/src/misc/aviation/liverylist.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::aviation, CLivery, CLiveryList) namespace swift::misc::aviation { - CLiveryList::CLiveryList() {} - CLiveryList::CLiveryList(const CSequence &other) : CSequence(other) {} CLiveryList CLiveryList::findByAirlineIcaoDesignator(const QString &icao) const diff --git a/src/misc/aviation/liverylist.h b/src/misc/aviation/liverylist.h index fc7fb65db..327fb2f8a 100644 --- a/src/misc/aviation/liverylist.h +++ b/src/misc/aviation/liverylist.h @@ -32,7 +32,7 @@ namespace swift::misc::aviation using CSequence::CSequence; //! Default constructor. - CLiveryList(); + CLiveryList() = default; //! Construct from a base class object. CLiveryList(const CSequence &other); diff --git a/src/misc/countrylist.cpp b/src/misc/countrylist.cpp index d16e3eae1..3da08a772 100644 --- a/src/misc/countrylist.cpp +++ b/src/misc/countrylist.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CCountry, CCountryList) namespace swift::misc { - CCountryList::CCountryList() {} - CCountryList::CCountryList(const CSequence &other) : CSequence(other) {} CCountry CCountryList::findByIsoCode(const QString &isoCode) const diff --git a/src/misc/countrylist.h b/src/misc/countrylist.h index 75688f292..f0137357b 100644 --- a/src/misc/countrylist.h +++ b/src/misc/countrylist.h @@ -35,7 +35,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CCountryList(); + CCountryList() = default; //! Construct from a base class object. CCountryList(const CSequence &other); diff --git a/src/misc/crashhandler.h b/src/misc/crashhandler.h index 708d76079..c8187ca80 100644 --- a/src/misc/crashhandler.h +++ b/src/misc/crashhandler.h @@ -30,7 +30,7 @@ namespace swift::misc static CCrashHandler *instance(); //! Destructor - virtual ~CCrashHandler(); + ~CCrashHandler() override; //! Initialize and start crashpad handler process void init(); diff --git a/src/misc/datacache.cpp b/src/misc/datacache.cpp index b317c9063..5e3915c94 100644 --- a/src/misc/datacache.cpp +++ b/src/misc/datacache.cpp @@ -351,8 +351,6 @@ namespace swift::misc : m_basename(basename), m_session(std::make_unique(m_basename + "/.session")) {} - CDataCacheRevision::~CDataCacheRevision() = default; - CDataCacheRevision::LockGuard CDataCacheRevision::beginUpdate(const QMap ×tamps, bool updateUuid, bool pinsOnly) { diff --git a/src/misc/datacache.h b/src/misc/datacache.h index ef77ec559..ccb823ca7 100644 --- a/src/misc/datacache.h +++ b/src/misc/datacache.h @@ -83,7 +83,7 @@ namespace swift::misc CDataCacheRevision(const QString &basename); //! Destructor. - ~CDataCacheRevision(); + ~CDataCacheRevision() = default; //! @{ //! Non-copyable. @@ -247,7 +247,7 @@ namespace swift::misc public: //! Destructor. - virtual ~CDataCache() override; + ~CDataCache() override; //! Return the singleton instance. static CDataCache *instance(); @@ -297,7 +297,7 @@ namespace swift::misc void saveToStoreAsync(const swift::misc::CValueCachePacket &values); void loadFromStoreAsync(); - virtual void connectPage(private_ns::CValuePage *page) override; + void connectPage(private_ns::CValuePage *page) override; QFileSystemWatcher m_watcher; diff --git a/src/misc/db/artifact.cpp b/src/misc/db/artifact.cpp index eb2c5e83a..d2db3c445 100644 --- a/src/misc/db/artifact.cpp +++ b/src/misc/db/artifact.cpp @@ -16,8 +16,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CArtifact) namespace swift::misc::db { - CArtifact::CArtifact() {} - CArtifact::CArtifact(const QString &name, const QString &version, const QString &md5, CArtifact::ArtifactType type, int size, bool existing, const CPlatform &platform) : m_name(name.trimmed()), m_md5(md5), m_type(static_cast(type)), m_size(size), m_existing(existing), diff --git a/src/misc/db/artifact.h b/src/misc/db/artifact.h index 53f8e2388..763b8ad7b 100644 --- a/src/misc/db/artifact.h +++ b/src/misc/db/artifact.h @@ -46,7 +46,7 @@ namespace swift::misc::db }; //! Default constructor - CArtifact(); + CArtifact() = default; //! Constructor CArtifact(const QString &name, const QString &version, const QString &md5, ArtifactType type, int size, diff --git a/src/misc/db/artifactlist.cpp b/src/misc/db/artifactlist.cpp index 6d3dc4efd..d75802e6e 100644 --- a/src/misc/db/artifactlist.cpp +++ b/src/misc/db/artifactlist.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CArtifact, CArtifactList) namespace swift::misc::db { - CArtifactList::CArtifactList() {} - CArtifactList::CArtifactList(const CSequence &other) : CSequence(other) {} CPlatformSet CArtifactList::getPlatforms() const diff --git a/src/misc/db/artifactlist.h b/src/misc/db/artifactlist.h index f083c3ca1..1d5d7e0e2 100644 --- a/src/misc/db/artifactlist.h +++ b/src/misc/db/artifactlist.h @@ -32,7 +32,7 @@ namespace swift::misc::db using CSequence::CSequence; //! Empty constructor. - CArtifactList(); + CArtifactList() = default; //! Construct from a base class object. CArtifactList(const CSequence &other); diff --git a/src/misc/db/dbinfolist.cpp b/src/misc/db/dbinfolist.cpp index dddfc503a..e9ff6c6d4 100644 --- a/src/misc/db/dbinfolist.cpp +++ b/src/misc/db/dbinfolist.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDbInfo, CDbInfoList) namespace swift::misc::db { - CDbInfoList::CDbInfoList() {} - CDbInfoList::CDbInfoList(const CSequence &other) : CSequence(other) {} CDbInfo CDbInfoList::findFirstByEntityOrDefault(CEntityFlags::Entity entity) const diff --git a/src/misc/db/dbinfolist.h b/src/misc/db/dbinfolist.h index 97a1aadd3..be0d2b39e 100644 --- a/src/misc/db/dbinfolist.h +++ b/src/misc/db/dbinfolist.h @@ -30,7 +30,7 @@ namespace swift::misc::db using CSequence::CSequence; //! Default constructor. - CDbInfoList(); + CDbInfoList() = default; //! Construct from a base class object. CDbInfoList(const CSequence &other); diff --git a/src/misc/db/distribution.cpp b/src/misc/db/distribution.cpp index f67da4fa4..da411b3f7 100644 --- a/src/misc/db/distribution.cpp +++ b/src/misc/db/distribution.cpp @@ -14,8 +14,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::db, CDistribution) namespace swift::misc::db { - CDistribution::CDistribution() {} - CDistribution::CDistribution(const QString &channel, int stability, bool restricted) : m_channel(channel.trimmed().toUpper()), m_stability(stability), m_restricted(restricted) {} diff --git a/src/misc/db/distribution.h b/src/misc/db/distribution.h index d1d3ec20b..cdbc7f44a 100644 --- a/src/misc/db/distribution.h +++ b/src/misc/db/distribution.h @@ -36,7 +36,7 @@ namespace swift::misc::db }; //! Default constructor - CDistribution(); + CDistribution() = default; //! Constructor CDistribution(const QString &channel, int stability, bool restricted); diff --git a/src/misc/db/distributionlist.cpp b/src/misc/db/distributionlist.cpp index a214fc96f..cad706464 100644 --- a/src/misc/db/distributionlist.cpp +++ b/src/misc/db/distributionlist.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::db, CDistribution, CDistributionList) namespace swift::misc::db { - CDistributionList::CDistributionList() {} - CDistributionList::CDistributionList(const CSequence &other) : CSequence(other) {} QStringList CDistributionList::getChannels() const diff --git a/src/misc/db/distributionlist.h b/src/misc/db/distributionlist.h index 46671cf8b..dd3b1ce5e 100644 --- a/src/misc/db/distributionlist.h +++ b/src/misc/db/distributionlist.h @@ -34,7 +34,7 @@ namespace swift::misc::db using CSequence::CSequence; //! Empty constructor. - CDistributionList(); + CDistributionList() = default; //! Construct from a base class object. CDistributionList(const CSequence &other); diff --git a/src/misc/db/updateinfo.h b/src/misc/db/updateinfo.h index c351dd8f0..5b69a4ce2 100644 --- a/src/misc/db/updateinfo.h +++ b/src/misc/db/updateinfo.h @@ -32,13 +32,13 @@ namespace swift::misc::db }; //! Constructor - CUpdateInfo() {} + CUpdateInfo() = default; //! Constructor CUpdateInfo(const CArtifactList &artifacts, const CDistributionList &distributions); //! Destructor. - ~CUpdateInfo() {} + ~CUpdateInfo() = default; //! Artifacts (pilot client) const CArtifactList &getArtifactsPilotClient() const { return m_artifactsPilotClient; } diff --git a/src/misc/dbusserver.h b/src/misc/dbusserver.h index 3c826d954..1faa707fe 100644 --- a/src/misc/dbusserver.h +++ b/src/misc/dbusserver.h @@ -60,7 +60,7 @@ namespace swift::misc CDBusServer(const QString &service, const QString &address, QObject *parent = nullptr); //! Destructor - virtual ~CDBusServer() override; + ~CDBusServer() override; //! Add a QObject to be exposed via DBus void addObject(const QString &name, QObject *object); diff --git a/src/misc/dictionary.h b/src/misc/dictionary.h index 6d7092481..47a3d9573 100644 --- a/src/misc/dictionary.h +++ b/src/misc/dictionary.h @@ -276,7 +276,7 @@ namespace swift::misc } //! Default constructor. - CDictionary() {} + CDictionary() = default; //! Initializer list constructor. CDictionary(std::initializer_list> il) : m_impl(il) {} diff --git a/src/misc/geo/coordinategeodetic.cpp b/src/misc/geo/coordinategeodetic.cpp index 400f465a8..e9d5ce263 100644 --- a/src/misc/geo/coordinategeodetic.cpp +++ b/src/misc/geo/coordinategeodetic.cpp @@ -19,8 +19,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::geo, CCoordinateGeodetic) namespace swift::misc::geo { - ICoordinateGeodetic::~ICoordinateGeodetic() {} - QString CCoordinateGeodetic::convertToQString(bool i18n) const { return ICoordinateGeodetic::convertToQString(i18n); @@ -525,8 +523,6 @@ namespace swift::misc::geo ICoordinateGeodetic::convertToQString(i18n); } - ICoordinateWithRelativePosition::ICoordinateWithRelativePosition() {} - bool ICoordinateWithRelativePosition::canHandleIndex(CPropertyIndexRef index) { if (ICoordinateGeodetic::canHandleIndex(index)) { return true; } diff --git a/src/misc/geo/coordinategeodetic.h b/src/misc/geo/coordinategeodetic.h index b2966c2e6..5014e7834 100644 --- a/src/misc/geo/coordinategeodetic.h +++ b/src/misc/geo/coordinategeodetic.h @@ -54,7 +54,7 @@ namespace swift::misc ICoordinateGeodetic() = default; //! Destructor - virtual ~ICoordinateGeodetic(); + virtual ~ICoordinateGeodetic() = default; //! Copy constructor ICoordinateGeodetic(const ICoordinateGeodetic &) = default; @@ -216,7 +216,7 @@ namespace swift::misc protected: //! Constructor - ICoordinateWithRelativePosition(); + ICoordinateWithRelativePosition() = default; //! Can given index be handled? static bool canHandleIndex(CPropertyIndexRef index); @@ -232,7 +232,7 @@ namespace swift::misc { public: //! Default constructor (null coordinate) - CCoordinateGeodetic() {} + CCoordinateGeodetic() = default; //! Constructor by normal vector CCoordinateGeodetic(const QVector3D &normal) @@ -264,19 +264,19 @@ namespace swift::misc const physical_quantities::CAngle &relBearing) const; //! \copydoc ICoordinateGeodetic::latitude - virtual CLatitude latitude() const override; + CLatitude latitude() const override; //! \copydoc ICoordinateGeodetic::longitude - virtual CLongitude longitude() const override; + CLongitude longitude() const override; //! \copydoc ICoordinateGeodetic::geodeticHeight - virtual const aviation::CAltitude &geodeticHeight() const override { return m_geodeticHeight; } + const aviation::CAltitude &geodeticHeight() const override { return m_geodeticHeight; } //! \copydoc ICoordinateGeodetic::normalVector - virtual QVector3D normalVector() const override; + QVector3D normalVector() const override; //! \copydoc ICoordinateGeodetic::normalVectorDouble - virtual std::array normalVectorDouble() const override; + std::array normalVectorDouble() const override; //! \copydoc mixin::Index::propertyByIndex QVariant propertyByIndex(CPropertyIndexRef index) const; @@ -344,7 +344,7 @@ namespace swift::misc } //! Is null? - virtual bool isNull() const override + bool isNull() const override { if (m_geodeticHeight.isNull()) { return true; } return math::CMathUtils::epsilonZeroLimits(m_x) && math::CMathUtils::epsilonZeroLimits(m_y) && diff --git a/src/misc/geo/coordinategeodeticlist.cpp b/src/misc/geo/coordinategeodeticlist.cpp index b7511893b..81e3bbdd0 100644 --- a/src/misc/geo/coordinategeodeticlist.cpp +++ b/src/misc/geo/coordinategeodeticlist.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::geo, CCoordinateGeodetic, CCoordinateG namespace swift::misc::geo { - CCoordinateGeodeticList::CCoordinateGeodeticList() {} - CCoordinateGeodeticList::CCoordinateGeodeticList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/geo/coordinategeodeticlist.h b/src/misc/geo/coordinategeodeticlist.h index 76a4f8c5f..f58440fc3 100644 --- a/src/misc/geo/coordinategeodeticlist.h +++ b/src/misc/geo/coordinategeodeticlist.h @@ -34,7 +34,7 @@ namespace swift::misc::geo using CSequence::CSequence; //! Default constructor. - CCoordinateGeodeticList(); + CCoordinateGeodeticList() = default; //! Construct from a base class object. CCoordinateGeodeticList(const CSequence &other); diff --git a/src/misc/geo/elevationplane.h b/src/misc/geo/elevationplane.h index 418752066..6955c93dd 100644 --- a/src/misc/geo/elevationplane.h +++ b/src/misc/geo/elevationplane.h @@ -33,7 +33,7 @@ namespace swift::misc::geo }; //! Default constructor - CElevationPlane() {} + CElevationPlane() = default; //! Plane at given coordinates with range to 2nd coordinate CElevationPlane(const ICoordinateGeodetic &coordinate, const ICoordinateGeodetic &rangeCoordinate); @@ -96,7 +96,7 @@ namespace swift::misc::geo double getAltitudeValue(const physical_quantities::CLengthUnit &unit) const; //! Existing value? - virtual bool isNull() const override; + bool isNull() const override; //! Check if elevation is within radius and can be used //! \remark checks against the set radius diff --git a/src/misc/icon.h b/src/misc/icon.h index d84e9a42f..0814b3040 100644 --- a/src/misc/icon.h +++ b/src/misc/icon.h @@ -39,7 +39,7 @@ namespace swift::misc { public: //! Default constructor. - CIcon() {} + CIcon() = default; //! Constructor. CIcon(CIcons::IconIndex index); diff --git a/src/misc/iconlist.h b/src/misc/iconlist.h index b6c6bf116..2d472bec7 100644 --- a/src/misc/iconlist.h +++ b/src/misc/iconlist.h @@ -31,7 +31,7 @@ namespace swift::misc public: //! Constructor - CIconList() {} + CIconList() = default; //! Construct from a base class object. CIconList(const CSequence &other); diff --git a/src/misc/identifierlist.cpp b/src/misc/identifierlist.cpp index 251ffe211..f05fff0a2 100644 --- a/src/misc/identifierlist.cpp +++ b/src/misc/identifierlist.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CIdentifier, CIdentifierList) namespace swift::misc { - CIdentifierList::CIdentifierList() {} - CIdentifierList::CIdentifierList(const CSequence &other) : CSequence(other) {} bool CIdentifierList::containsAnyNotIn(const CIdentifierList &other) const diff --git a/src/misc/identifierlist.h b/src/misc/identifierlist.h index 43357559d..0409acaae 100644 --- a/src/misc/identifierlist.h +++ b/src/misc/identifierlist.h @@ -27,7 +27,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CIdentifierList(); + CIdentifierList() = default; //! Construct from a base class object. CIdentifierList(const CSequence &other); diff --git a/src/misc/input/keyboardkeylist.cpp b/src/misc/input/keyboardkeylist.cpp index 5be39cefc..57e7eb8eb 100644 --- a/src/misc/input/keyboardkeylist.cpp +++ b/src/misc/input/keyboardkeylist.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::input, CKeyboardKey, CKeyboardKeyList) namespace swift::misc::input { - CKeyboardKeyList::CKeyboardKeyList() {} - CKeyboardKeyList::CKeyboardKeyList(const CSequence &baseClass) : CSequence(baseClass) {} QStringList CKeyboardKeyList::getKeyStrings() const diff --git a/src/misc/input/keyboardkeylist.h b/src/misc/input/keyboardkeylist.h index 35ed7977c..02130c329 100644 --- a/src/misc/input/keyboardkeylist.h +++ b/src/misc/input/keyboardkeylist.h @@ -29,7 +29,7 @@ namespace swift::misc::input using CSequence::CSequence; //! Default constructor - CKeyboardKeyList(); + CKeyboardKeyList() = default; //! Construct from a base class object. CKeyboardKeyList(const CSequence &baseClass); diff --git a/src/misc/logmessage.cpp b/src/misc/logmessage.cpp index 11438768c..21a12e4cf 100644 --- a/src/misc/logmessage.cpp +++ b/src/misc/logmessage.cpp @@ -10,8 +10,6 @@ namespace swift::misc { - CLogMessage::CLogMessage() = default; - CLogMessage::CLogMessage(const char *file, int line, const char *function) : m_logger(file, line, function) {} CLogMessage::operator CStatusMessage() { return { m_categories, m_severity, message() }; } diff --git a/src/misc/logmessage.h b/src/misc/logmessage.h index 67976317c..f18aa195e 100644 --- a/src/misc/logmessage.h +++ b/src/misc/logmessage.h @@ -30,7 +30,7 @@ namespace swift::misc using CMessageBase::CMessageBase; //! Construct a message with the "uncategorized" category. - CLogMessage(); + CLogMessage() = default; //! Constructor taking filename, line number, and function name, for uncategorized verbose debug messages. CLogMessage(const char *file, int line, const char *function); diff --git a/src/misc/namevariantpairlist.cpp b/src/misc/namevariantpairlist.cpp index 3bacf65ed..bda704f4c 100644 --- a/src/misc/namevariantpairlist.cpp +++ b/src/misc/namevariantpairlist.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CNameVariantPair, CNameVariantPairList namespace swift::misc { - CNameVariantPairList::CNameVariantPairList() {} - CNameVariantPairList::CNameVariantPairList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/namevariantpairlist.h b/src/misc/namevariantpairlist.h index 284224bd5..77a20090c 100644 --- a/src/misc/namevariantpairlist.h +++ b/src/misc/namevariantpairlist.h @@ -30,7 +30,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CNameVariantPairList(); + CNameVariantPairList() = default; //! Construct from a base class object. CNameVariantPairList(const CSequence &other); diff --git a/src/misc/network/authenticateduser.cpp b/src/misc/network/authenticateduser.cpp index 95ae12b02..d3cafeed8 100644 --- a/src/misc/network/authenticateduser.cpp +++ b/src/misc/network/authenticateduser.cpp @@ -15,8 +15,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::network, CAuthenticatedUser) namespace swift::misc::network { - CAuthenticatedUser::CAuthenticatedUser() {} - CAuthenticatedUser::CAuthenticatedUser(int id, const QString &realname) : IDatastoreObjectWithIntegerKey(id), m_realname(realname.trimmed()) {} diff --git a/src/misc/network/authenticateduser.h b/src/misc/network/authenticateduser.h index 2362b4fcd..ae1b9c1f6 100644 --- a/src/misc/network/authenticateduser.h +++ b/src/misc/network/authenticateduser.h @@ -43,7 +43,7 @@ namespace swift::misc::network }; //! Default constructor. - CAuthenticatedUser(); + CAuthenticatedUser() = default; //! Constructor. CAuthenticatedUser(int id, const QString &realname); diff --git a/src/misc/network/clientlist.cpp b/src/misc/network/clientlist.cpp index c352d2a3a..d99dc6280 100644 --- a/src/misc/network/clientlist.cpp +++ b/src/misc/network/clientlist.cpp @@ -9,7 +9,5 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CClient, CClientList) namespace swift::misc::network { - CClientList::CClientList() {} - CClientList::CClientList(const CSequence &other) : CSequence(other) {} } // namespace swift::misc::network diff --git a/src/misc/network/clientlist.h b/src/misc/network/clientlist.h index f0fecaa68..07bd75abe 100644 --- a/src/misc/network/clientlist.h +++ b/src/misc/network/clientlist.h @@ -30,7 +30,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CClientList(); + CClientList() = default; //! Construct from a base class object. CClientList(const CSequence &other); diff --git a/src/misc/network/clientprovider.h b/src/misc/network/clientprovider.h index 1526eb7d2..a4a011642 100644 --- a/src/misc/network/clientprovider.h +++ b/src/misc/network/clientprovider.h @@ -88,21 +88,21 @@ namespace swift::misc { public: //! clientprovider - virtual CClientList getClients() const override; - virtual void setClients(const CClientList &clients) override; - virtual void clearClients() override; - virtual CClientList getClientsForCallsigns(const aviation::CCallsignSet &callsigns) const override; - virtual CClient getClientOrDefaultForCallsign(const aviation::CCallsign &callsign) const override; - virtual bool hasClientInfo(const aviation::CCallsign &callsign) const override; - virtual bool addNewClient(const CClient &client) override; - virtual bool setOtherClient(const swift::misc::network::CClient &client) override; - virtual int updateOrAddClient(const aviation::CCallsign &callsign, const CPropertyIndexVariantMap &vm, - bool skipEqualValues = true) override; - virtual int removeClient(const aviation::CCallsign &callsign) override; - virtual bool autoAdjustCientGndCapability(const aviation::CAircraftSituation &situation) override; - virtual bool addClientGndCapability(const aviation::CCallsign &callsign) override; - virtual bool setClientGndCapability(const aviation::CCallsign &callsign, bool supportGndFlag) override; - virtual void markAsSwiftClient(const aviation::CCallsign &callsign) override; + CClientList getClients() const override; + void setClients(const CClientList &clients) override; + void clearClients() override; + CClientList getClientsForCallsigns(const aviation::CCallsignSet &callsigns) const override; + CClient getClientOrDefaultForCallsign(const aviation::CCallsign &callsign) const override; + bool hasClientInfo(const aviation::CCallsign &callsign) const override; + bool addNewClient(const CClient &client) override; + bool setOtherClient(const swift::misc::network::CClient &client) override; + int updateOrAddClient(const aviation::CCallsign &callsign, const CPropertyIndexVariantMap &vm, + bool skipEqualValues = true) override; + int removeClient(const aviation::CCallsign &callsign) override; + bool autoAdjustCientGndCapability(const aviation::CAircraftSituation &situation) override; + bool addClientGndCapability(const aviation::CCallsign &callsign) override; + bool setClientGndCapability(const aviation::CCallsign &callsign, bool supportGndFlag) override; + void markAsSwiftClient(const aviation::CCallsign &callsign) override; private: CClientPerCallsign m_clients; diff --git a/src/misc/network/ecosystem.h b/src/misc/network/ecosystem.h index ad951dc1a..2d6489422 100644 --- a/src/misc/network/ecosystem.h +++ b/src/misc/network/ecosystem.h @@ -39,7 +39,7 @@ namespace swift::misc::network }; //! Default constructor - CEcosystem() {} + CEcosystem() = default; //! Constructor CEcosystem(System s) : m_system(static_cast(s)) {} diff --git a/src/misc/network/ecosystemlist.cpp b/src/misc/network/ecosystemlist.cpp index ce27d5dd2..37b504e83 100644 --- a/src/misc/network/ecosystemlist.cpp +++ b/src/misc/network/ecosystemlist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CEcosystem, CEcosystemList) namespace swift::misc::network { - CEcosystemList::CEcosystemList() {} - CEcosystemList::CEcosystemList(const CSequence &other) : CSequence(other) {} QStringList CEcosystemList::allSystemStrings() const diff --git a/src/misc/network/ecosystemlist.h b/src/misc/network/ecosystemlist.h index 1376c7d44..60eb1c9ea 100644 --- a/src/misc/network/ecosystemlist.h +++ b/src/misc/network/ecosystemlist.h @@ -28,7 +28,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CEcosystemList(); + CEcosystemList() = default; //! Construct from a base class object. CEcosystemList(const CSequence &other); diff --git a/src/misc/network/fsdsetup.h b/src/misc/network/fsdsetup.h index c321aa0a6..901945353 100644 --- a/src/misc/network/fsdsetup.h +++ b/src/misc/network/fsdsetup.h @@ -65,7 +65,7 @@ namespace swift::misc::network //! @} //! Default constructor. - CFsdSetup() {} + CFsdSetup() = default; //! Constructor. CFsdSetup(SendReceiveDetails sendReceive); diff --git a/src/misc/network/rawfsdmessagelist.cpp b/src/misc/network/rawfsdmessagelist.cpp index 4cb3bdc08..4019c1873 100644 --- a/src/misc/network/rawfsdmessagelist.cpp +++ b/src/misc/network/rawfsdmessagelist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRawFsdMessage, CRawFsdMessag namespace swift::misc::network { - CRawFsdMessageList::CRawFsdMessageList() {} - CRawFsdMessageList::CRawFsdMessageList(const CSequence &other) : CSequence(other) {} CRawFsdMessageList CRawFsdMessageList::findByPacketType(const QString &type) const diff --git a/src/misc/network/rawfsdmessagelist.h b/src/misc/network/rawfsdmessagelist.h index f9754350c..a046582b9 100644 --- a/src/misc/network/rawfsdmessagelist.h +++ b/src/misc/network/rawfsdmessagelist.h @@ -31,7 +31,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CRawFsdMessageList(); + CRawFsdMessageList() = default; //! Construct from a base class object. CRawFsdMessageList(const CSequence &other); diff --git a/src/misc/network/remotefilelist.cpp b/src/misc/network/remotefilelist.cpp index 3563c5e71..f8b8753ff 100644 --- a/src/misc/network/remotefilelist.cpp +++ b/src/misc/network/remotefilelist.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRemoteFile, CRemoteFileList) namespace swift::misc::network { - CRemoteFileList::CRemoteFileList() {} - CRemoteFileList::CRemoteFileList(const CSequence &other) : CSequence(other) {} QStringList CRemoteFileList::getNames(bool sorted) const diff --git a/src/misc/network/remotefilelist.h b/src/misc/network/remotefilelist.h index 6ec97734d..2b5fe63db 100644 --- a/src/misc/network/remotefilelist.h +++ b/src/misc/network/remotefilelist.h @@ -28,7 +28,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CRemoteFileList(); + CRemoteFileList() = default; //! Construct from a base class object. CRemoteFileList(const CSequence &other); diff --git a/src/misc/network/rolelist.cpp b/src/misc/network/rolelist.cpp index e9fee5a10..0f0979486 100644 --- a/src/misc/network/rolelist.cpp +++ b/src/misc/network/rolelist.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CRole, CRoleList) namespace swift::misc::network { - CRoleList::CRoleList() {} - bool CRoleList::hasRole(const QString &roleName) const { return this->contains(&CRole::getName, roleName.trimmed().toUpper()); diff --git a/src/misc/network/rolelist.h b/src/misc/network/rolelist.h index 410121b38..b0e72d780 100644 --- a/src/misc/network/rolelist.h +++ b/src/misc/network/rolelist.h @@ -30,7 +30,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CRoleList(); + CRoleList() = default; //! Has role? bool hasRole(const QString &roleName) const; diff --git a/src/misc/network/server.h b/src/misc/network/server.h index 671db49c7..2b7e0829c 100644 --- a/src/misc/network/server.h +++ b/src/misc/network/server.h @@ -60,7 +60,7 @@ namespace swift::misc::network static const QString &serverTypeToString(ServerType server); //! Default constructor. - CServer() {} + CServer() = default; //! Constructor. CServer(const QString &name, const QString &description, const QString &address, int port, const CUser &user, diff --git a/src/misc/network/serverlist.cpp b/src/misc/network/serverlist.cpp index c5c3b8c6a..2d7b29224 100644 --- a/src/misc/network/serverlist.cpp +++ b/src/misc/network/serverlist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CServer, CServerList) namespace swift::misc::network { - CServerList::CServerList() {} - CServerList::CServerList(const CSequence &other) : CSequence(other) {} bool CServerList::containsName(const QString &name) const diff --git a/src/misc/network/serverlist.h b/src/misc/network/serverlist.h index 13c63b496..aa2c31aeb 100644 --- a/src/misc/network/serverlist.h +++ b/src/misc/network/serverlist.h @@ -26,7 +26,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CServerList(); + CServerList() = default; //! Construct from a base class object. CServerList(const CSequence &other); diff --git a/src/misc/network/textmessage.h b/src/misc/network/textmessage.h index 25a10b02e..3668758b8 100644 --- a/src/misc/network/textmessage.h +++ b/src/misc/network/textmessage.h @@ -40,7 +40,7 @@ namespace swift::misc::network }; //! Default constructor. - CTextMessage() {} + CTextMessage() = default; //! Constructor, radio message CTextMessage(const QString &message, const physical_quantities::CFrequency &frequency, diff --git a/src/misc/network/textmessagelist.cpp b/src/misc/network/textmessagelist.cpp index c867a6056..9884f6a9f 100644 --- a/src/misc/network/textmessagelist.cpp +++ b/src/misc/network/textmessagelist.cpp @@ -16,8 +16,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CTextMessage, CTextMessageLis namespace swift::misc::network { - CTextMessageList::CTextMessageList() {} - CTextMessageList::CTextMessageList(const QString &message, const CCallsign &recipientCallsign) { CTextMessage pm(message, recipientCallsign); diff --git a/src/misc/network/textmessagelist.h b/src/misc/network/textmessagelist.h index 8c3ecda72..89f1977f9 100644 --- a/src/misc/network/textmessagelist.h +++ b/src/misc/network/textmessagelist.h @@ -35,7 +35,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CTextMessageList(); + CTextMessageList() = default; //! Constructor, single private message CTextMessageList(const QString &message, const aviation::CCallsign &recipientCallsign); diff --git a/src/misc/network/urlloglist.cpp b/src/misc/network/urlloglist.cpp index 9f9bfe5d3..17cb9bb2c 100644 --- a/src/misc/network/urlloglist.cpp +++ b/src/misc/network/urlloglist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUrlLog, CUrlLogList) namespace swift::misc::network { - CUrlLogList::CUrlLogList() {} - CUrlLogList::CUrlLogList(const CSequence &other) : CSequence(other) {} int CUrlLogList::addPendingUrl(const CUrl &url, int maxNumber) diff --git a/src/misc/network/urlloglist.h b/src/misc/network/urlloglist.h index e6ee9a576..ea1359a25 100644 --- a/src/misc/network/urlloglist.h +++ b/src/misc/network/urlloglist.h @@ -29,7 +29,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CUrlLogList(); + CUrlLogList() = default; //! Construct from a base class object. CUrlLogList(const CSequence &other); diff --git a/src/misc/network/userlist.cpp b/src/misc/network/userlist.cpp index ffeb662e2..7aeca2492 100644 --- a/src/misc/network/userlist.cpp +++ b/src/misc/network/userlist.cpp @@ -7,7 +7,5 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::network, CUser, CUserList) namespace swift::misc::network { - CUserList::CUserList() {} - CUserList::CUserList(const CSequence &other) : CSequence(other) {} } // namespace swift::misc::network diff --git a/src/misc/network/userlist.h b/src/misc/network/userlist.h index cfa03f7a3..d8cb5aa84 100644 --- a/src/misc/network/userlist.h +++ b/src/misc/network/userlist.h @@ -29,7 +29,7 @@ namespace swift::misc::network using CSequence::CSequence; //! Default constructor. - CUserList(); + CUserList() = default; //! Construct from a base class object. CUserList(const CSequence &other); diff --git a/src/misc/orderable.cpp b/src/misc/orderable.cpp index 5d63967ad..6938b9091 100644 --- a/src/misc/orderable.cpp +++ b/src/misc/orderable.cpp @@ -13,8 +13,6 @@ namespace swift::misc { - IOrderable::IOrderable() {} - IOrderable::IOrderable(int order) : m_order(order) {} QString IOrderable::getOrderAsString() const diff --git a/src/misc/orderable.h b/src/misc/orderable.h index 257c07d51..c258657c3 100644 --- a/src/misc/orderable.h +++ b/src/misc/orderable.h @@ -45,7 +45,7 @@ namespace swift::misc static bool canHandleIndex(CPropertyIndexRef index); //! Constructor - IOrderable(); + IOrderable() = default; //! Constructor IOrderable(int order); diff --git a/src/misc/platform.h b/src/misc/platform.h index f7c934c05..06c20142c 100644 --- a/src/misc/platform.h +++ b/src/misc/platform.h @@ -46,7 +46,7 @@ namespace swift::misc Q_DECLARE_FLAGS(Platform, PlatformFlag) //! Constructor - CPlatform() {} + CPlatform() = default; //! Constructor CPlatform(const QString &p); diff --git a/src/misc/platformset.cpp b/src/misc/platformset.cpp index 6cbf18b06..b8787e389 100644 --- a/src/misc/platformset.cpp +++ b/src/misc/platformset.cpp @@ -14,8 +14,6 @@ SWIFT_DEFINE_COLLECTION_MIXINS(swift::misc, CPlatform, CPlatformSet) namespace swift::misc { - CPlatformSet::CPlatformSet() {} - CPlatformSet::CPlatformSet(const CCollection &other) : CCollection(other) {} QStringList CPlatformSet::getPlatformNames() const diff --git a/src/misc/platformset.h b/src/misc/platformset.h index f457f3f65..fe3b219e0 100644 --- a/src/misc/platformset.h +++ b/src/misc/platformset.h @@ -25,7 +25,7 @@ namespace swift::misc public: //! Default constructor. - CPlatformSet(); + CPlatformSet() = default; //! Construct from a base class object. CPlatformSet(const CCollection &other); diff --git a/src/misc/pq/units.h b/src/misc/pq/units.h index 2d1f340f0..515519990 100644 --- a/src/misc/pq/units.h +++ b/src/misc/pq/units.h @@ -263,8 +263,8 @@ namespace swift::misc::physical_quantities } //! \copydoc CMeasurementUnit::makeRoundedQStringWithUnit - virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool withGroupSeparator = false, - bool i18n = false) const override; + QString makeRoundedQStringWithUnit(double value, int digits = -1, bool withGroupSeparator = false, + bool i18n = false) const override; //! Radians static CAngleUnit rad() @@ -947,8 +947,8 @@ namespace swift::misc::physical_quantities } //! \copydoc CMeasurementUnit::makeRoundedQStringWithUnit - virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool withGroupSeparator = false, - bool i18n = false) const override; + QString makeRoundedQStringWithUnit(double value, int digits = -1, bool withGroupSeparator = false, + bool i18n = false) const override; //! Second s static CTimeUnit s() diff --git a/src/misc/processinfo.h b/src/misc/processinfo.h index 5cd37b5c5..087db71fb 100644 --- a/src/misc/processinfo.h +++ b/src/misc/processinfo.h @@ -22,7 +22,7 @@ namespace swift::misc { public: //! Construct an object identifying an invalid process. - CProcessInfo() {} + CProcessInfo() = default; //! Construct an object identifying the process with the given PID. explicit CProcessInfo(qint64 pid) : m_pid(pid), m_name(processNameFromId(pid)) {} diff --git a/src/misc/promise.h b/src/misc/promise.h index 4ba1e6a76..500cfdea9 100644 --- a/src/misc/promise.h +++ b/src/misc/promise.h @@ -27,7 +27,7 @@ namespace swift::misc { public: CPromiseData() { this->reportStarted(); } - ~CPromiseData() + ~CPromiseData() override { if (this->isRunning()) { this->cancel(); } } diff --git a/src/misc/propertyindexlist.cpp b/src/misc/propertyindexlist.cpp index 14922f3c6..e6d385064 100644 --- a/src/misc/propertyindexlist.cpp +++ b/src/misc/propertyindexlist.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc, CPropertyIndex, CPropertyIndexList) namespace swift::misc { - CPropertyIndexList::CPropertyIndexList() {} - CPropertyIndexList::CPropertyIndexList(const CSequence &other) : CSequence(other) {} CPropertyIndexList CPropertyIndexList::copyFrontRemoved() const diff --git a/src/misc/propertyindexlist.h b/src/misc/propertyindexlist.h index 3885a2b28..5cdd48085 100644 --- a/src/misc/propertyindexlist.h +++ b/src/misc/propertyindexlist.h @@ -27,7 +27,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CPropertyIndexList(); + CPropertyIndexList() = default; //! Construct from a base class object. CPropertyIndexList(const CSequence &other); diff --git a/src/misc/provider.cpp b/src/misc/provider.cpp deleted file mode 100644 index 2de9bcccd..000000000 --- a/src/misc/provider.cpp +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include "misc/provider.h" - -namespace swift::misc -{ - IProvider::~IProvider() {} -} // namespace swift::misc diff --git a/src/misc/provider.h b/src/misc/provider.h index 8bb7a5297..3cf7a9e05 100644 --- a/src/misc/provider.h +++ b/src/misc/provider.h @@ -19,7 +19,7 @@ namespace swift::misc { public: //! Dtor - virtual ~IProvider(); + virtual ~IProvider() = default; //! Copy constructor IProvider(const IProvider &) = delete; @@ -44,7 +44,7 @@ namespace swift::misc IProviderAware(PROVIDER *provider = nullptr) { this->setProvider(provider); } //! Dtor - virtual ~IProviderAware() {} + virtual ~IProviderAware() = default; //! Has provider? bool hasProvider() const { return m_provider; } diff --git a/src/misc/sharedstate/datalinkdbus.h b/src/misc/sharedstate/datalinkdbus.h index 083c63aa0..a3539555d 100644 --- a/src/misc/sharedstate/datalinkdbus.h +++ b/src/misc/sharedstate/datalinkdbus.h @@ -42,7 +42,7 @@ namespace swift::misc CDataLinkDBus(QObject *parent = nullptr); //! Destructor. - virtual ~CDataLinkDBus() override; + ~CDataLinkDBus() override; //! Override identifier for testing purposes. void overrideIdentifier(const CIdentifier &); @@ -53,10 +53,10 @@ namespace swift::misc //! Initialize on client side. void initializeRemote(const QDBusConnection &connection, const QString &service); - virtual void publish(const CPassiveMutator *mutator) override; - virtual void publish(const CActiveMutator *mutator) override; - virtual void subscribe(const CPassiveObserver *observer) override; - virtual void subscribe(const CActiveObserver *observer) override; + void publish(const CPassiveMutator *mutator) override; + void publish(const CActiveMutator *mutator) override; + void subscribe(const CPassiveObserver *observer) override; + void subscribe(const CActiveObserver *observer) override; private: struct Channel diff --git a/src/misc/sharedstate/datalinklocal.h b/src/misc/sharedstate/datalinklocal.h index 9e8680f0b..6202fe3a0 100644 --- a/src/misc/sharedstate/datalinklocal.h +++ b/src/misc/sharedstate/datalinklocal.h @@ -30,12 +30,12 @@ namespace swift::misc::shared_state CDataLinkLocal(QObject *parent = nullptr); //! Destructor. - virtual ~CDataLinkLocal() override; + ~CDataLinkLocal() override; - virtual void publish(const CPassiveMutator *mutator) override; - virtual void publish(const CActiveMutator *mutator) override; - virtual void subscribe(const CPassiveObserver *observer) override; - virtual void subscribe(const CActiveObserver *observer) override; + void publish(const CPassiveMutator *mutator) override; + void publish(const CActiveMutator *mutator) override; + void subscribe(const CPassiveObserver *observer) override; + void subscribe(const CActiveObserver *observer) override; private: struct Channel diff --git a/src/misc/sharedstate/dbus/dupleximpl.h b/src/misc/sharedstate/dbus/dupleximpl.h index beac40800..8178a8016 100644 --- a/src/misc/sharedstate/dbus/dupleximpl.h +++ b/src/misc/sharedstate/dbus/dupleximpl.h @@ -33,30 +33,29 @@ namespace swift::misc CDuplex(CHub *hub, const CIdentifier &client, CDBusServer *server, QObject *parent = nullptr); //! Destructor. - virtual ~CDuplex() override; + ~CDuplex() override; public slots: //! \name Interface implementations //! @{ //! \copydoc swift::misc::shared_state::dbus::IDuplex::postEvent - virtual void postEvent(const QString &channel, const swift::misc::CVariant ¶m) override; + void postEvent(const QString &channel, const swift::misc::CVariant ¶m) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::setSubscription - virtual void setSubscription(const QString &channel, const swift::misc::CVariantList &filters) override; + void setSubscription(const QString &channel, const swift::misc::CVariantList &filters) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::requestPeerSubscriptions - virtual void requestPeerSubscriptions() override; + void requestPeerSubscriptions() override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::submitRequest - virtual void submitRequest(const QString &channel, const swift::misc::CVariant ¶m, - quint32 token) override; + void submitRequest(const QString &channel, const swift::misc::CVariant ¶m, quint32 token) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::advertise - virtual void advertise(const QString &channel) override; + void advertise(const QString &channel) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::withdraw - virtual void withdraw(const QString &channel) override; + void withdraw(const QString &channel) override; //! @} private: diff --git a/src/misc/sharedstate/dbus/duplexproxy.h b/src/misc/sharedstate/dbus/duplexproxy.h index 4371cfe8e..1b471c5da 100644 --- a/src/misc/sharedstate/dbus/duplexproxy.h +++ b/src/misc/sharedstate/dbus/duplexproxy.h @@ -31,26 +31,25 @@ namespace swift::misc //! @{ //! \copydoc swift::misc::shared_state::dbus::IDuplex::postEvent - virtual void postEvent(const QString &channel, const swift::misc::CVariant ¶m) override; + void postEvent(const QString &channel, const swift::misc::CVariant ¶m) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::setSubscription - virtual void setSubscription(const QString &channel, const swift::misc::CVariantList &filters) override; + void setSubscription(const QString &channel, const swift::misc::CVariantList &filters) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::requestPeerSubscriptions - virtual void requestPeerSubscriptions() override; + void requestPeerSubscriptions() override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::submitRequest - virtual void submitRequest(const QString &channel, const swift::misc::CVariant ¶m, - quint32 token) override; + void submitRequest(const QString &channel, const swift::misc::CVariant ¶m, quint32 token) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::reply - virtual void reply(const swift::misc::CVariant ¶m, quint32 token) override; + void reply(const swift::misc::CVariant ¶m, quint32 token) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::advertise - virtual void advertise(const QString &channel) override; + void advertise(const QString &channel) override; //! \copydoc swift::misc::shared_state::dbus::IDuplex::withdraw - virtual void withdraw(const QString &channel) override; + void withdraw(const QString &channel) override; //! @} private: diff --git a/src/misc/sharedstate/dbus/hubimpl.h b/src/misc/sharedstate/dbus/hubimpl.h index 07e1fd442..7f39d4681 100644 --- a/src/misc/sharedstate/dbus/hubimpl.h +++ b/src/misc/sharedstate/dbus/hubimpl.h @@ -33,15 +33,15 @@ namespace swift::misc CHub(CDBusServer *server, QObject *parent = nullptr); //! Destructor. - virtual ~CHub() override; + ~CHub() override; //! Returns a range containing all duplex objects. const auto &clients() const { return m_clients; } //! \name Interface implementations //! @{ - virtual bool isConnected() const override { return true; } - virtual std::pair, QFuture> getDuplex(const CIdentifier &) override; + bool isConnected() const override { return true; } + std::pair, QFuture> getDuplex(const CIdentifier &) override; //! @} public slots: @@ -49,16 +49,16 @@ namespace swift::misc //! @{ //! \copydoc swift::misc::shared_state::dbus::IHub::openDuplex - virtual bool openDuplex(const swift::misc::CIdentifier &client) override; + bool openDuplex(const swift::misc::CIdentifier &client) override; //! \copydoc swift::misc::shared_state::dbus::IHub::closeDuplex - virtual void closeDuplex(const swift::misc::CIdentifier &client) override; + void closeDuplex(const swift::misc::CIdentifier &client) override; //! @} protected: //! \name Interface implementations //! @{ - virtual QFuture openDuplexAsync(const CIdentifier &client) override; + QFuture openDuplexAsync(const CIdentifier &client) override; //! @} private: diff --git a/src/misc/sharedstate/dbus/hubproxy.h b/src/misc/sharedstate/dbus/hubproxy.h index 180f796f8..c45d38eed 100644 --- a/src/misc/sharedstate/dbus/hubproxy.h +++ b/src/misc/sharedstate/dbus/hubproxy.h @@ -29,12 +29,12 @@ namespace swift::misc CHubProxy(const QDBusConnection &connection, const QString &service, QObject *parent = nullptr); //! Destructor. - virtual ~CHubProxy() override; + ~CHubProxy() override; //! \name Interface implementations //! @{ - virtual bool isConnected() const override; - virtual std::pair, QFuture> getDuplex(const CIdentifier &) override; + bool isConnected() const override; + std::pair, QFuture> getDuplex(const CIdentifier &) override; //! @} public slots: @@ -42,16 +42,16 @@ namespace swift::misc //! @{ //! \copydoc swift::misc::shared_state::dbus::IHub::openDuplex - virtual bool openDuplex(const swift::misc::CIdentifier &client) override; + bool openDuplex(const swift::misc::CIdentifier &client) override; //! \copydoc swift::misc::shared_state::dbus::IHub::closeDuplex - virtual void closeDuplex(const swift::misc::CIdentifier &client) override; + void closeDuplex(const swift::misc::CIdentifier &client) override; //! @} protected: //! \name Interface implementations //! @{ - virtual QFuture openDuplexAsync(const CIdentifier &client) override; + QFuture openDuplexAsync(const CIdentifier &client) override; //! @} private: diff --git a/src/misc/sharedstate/listobserver.h b/src/misc/sharedstate/listobserver.h index 65376ee09..91e4784b8 100644 --- a/src/misc/sharedstate/listobserver.h +++ b/src/misc/sharedstate/listobserver.h @@ -67,7 +67,7 @@ namespace swift::misc::shared_state public: //! Subscribe using the given transport mechanism. - virtual void initialize(IDataLink *dataLink) override + void initialize(IDataLink *dataLink) override { CGenericListObserver::initialize(dataLink); if (std::is_same_v) { setFilter({}); } @@ -86,14 +86,8 @@ namespace swift::misc::shared_state virtual void onElementsReplaced(const T &values) = 0; private: - virtual void onGenericElementAdded(const CVariant &value) override final - { - onElementAdded(value.to()); - } - virtual void onGenericElementsReplaced(const CVariantList &values) override final - { - onElementsReplaced(values.to()); - } + void onGenericElementAdded(const CVariant &value) final { onElementAdded(value.to()); } + void onGenericElementsReplaced(const CVariantList &values) final { onElementsReplaced(values.to()); } }; } // namespace swift::misc::shared_state diff --git a/src/misc/sharedstate/scalarobserver.h b/src/misc/sharedstate/scalarobserver.h index 3f2fd1712..65b822947 100644 --- a/src/misc/sharedstate/scalarobserver.h +++ b/src/misc/sharedstate/scalarobserver.h @@ -67,7 +67,7 @@ namespace swift::misc::shared_state //! Called when the scalar value changes. virtual void onValueChanged(const T &value) = 0; - virtual void onGenericValueChanged(const CVariant &value) override final { onValueChanged(value.to()); } + void onGenericValueChanged(const CVariant &value) final { onValueChanged(value.to()); } }; } // namespace swift::misc::shared_state diff --git a/src/misc/simulation/aircraftmodel.h b/src/misc/simulation/aircraftmodel.h index 2cc21462c..575751e07 100644 --- a/src/misc/simulation/aircraftmodel.h +++ b/src/misc/simulation/aircraftmodel.h @@ -131,7 +131,7 @@ namespace swift::misc static void registerMetadata(); //! Default constructor. - CAircraftModel() {} + CAircraftModel() = default; //! Constructor. CAircraftModel(const QString &model, ModelType type); diff --git a/src/misc/simulation/aircraftmodelinterfaces.h b/src/misc/simulation/aircraftmodelinterfaces.h index 997652f03..0bed4da4f 100644 --- a/src/misc/simulation/aircraftmodelinterfaces.h +++ b/src/misc/simulation/aircraftmodelinterfaces.h @@ -20,8 +20,8 @@ namespace swift::misc::simulation //! @{ //! Ctor, dtor, copy operators (CLANG warnings) - IModelsSetable() {} - virtual ~IModelsSetable() {} + IModelsSetable() = default; + virtual ~IModelsSetable() = default; IModelsSetable(const IModelsSetable &) = default; IModelsSetable &operator=(const IModelsSetable &) = default; //! @} @@ -36,8 +36,8 @@ namespace swift::misc::simulation //! @{ //! Ctor, dtor, copy operators (CLANG warnings) - IModelsUpdatable() {} - virtual ~IModelsUpdatable() {} + IModelsUpdatable() = default; + virtual ~IModelsUpdatable() = default; IModelsUpdatable(const IModelsUpdatable &) = default; IModelsUpdatable &operator=(const IModelsUpdatable &) = default; //! @} @@ -52,8 +52,8 @@ namespace swift::misc::simulation //! @{ //! Ctor, dtor, copy operators (CLANG warnings) - IModelsForSimulatorSetable() {} - virtual ~IModelsForSimulatorSetable() {} + IModelsForSimulatorSetable() = default; + virtual ~IModelsForSimulatorSetable() = default; IModelsForSimulatorSetable(const IModelsForSimulatorSetable &) = default; IModelsForSimulatorSetable &operator=(const IModelsForSimulatorSetable &) = default; //! @} @@ -68,8 +68,8 @@ namespace swift::misc::simulation //! @{ //! Ctor, dtor, copy operators (CLANG warnings) - IModelsForSimulatorUpdatable() {} - virtual ~IModelsForSimulatorUpdatable() {} + IModelsForSimulatorUpdatable() = default; + virtual ~IModelsForSimulatorUpdatable() = default; IModelsForSimulatorUpdatable(const IModelsForSimulatorUpdatable &) = default; IModelsForSimulatorUpdatable &operator=(const IModelsForSimulatorUpdatable &) = default; //! @} @@ -84,8 +84,8 @@ namespace swift::misc::simulation //! @{ //! Ctor, dtor, copy operators (CLANG warnings) - ISimulatorSelectable() {} - virtual ~ISimulatorSelectable() {} + ISimulatorSelectable() = default; + virtual ~ISimulatorSelectable() = default; ISimulatorSelectable(const ISimulatorSelectable &) = default; ISimulatorSelectable &operator=(const ISimulatorSelectable &) = default; //! @} diff --git a/src/misc/simulation/aircraftmodellist.cpp b/src/misc/simulation/aircraftmodellist.cpp index 309e86526..f5bab0eaf 100644 --- a/src/misc/simulation/aircraftmodellist.cpp +++ b/src/misc/simulation/aircraftmodellist.cpp @@ -36,8 +36,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CAircraftModel, CAircraftM namespace swift::misc::simulation { - CAircraftModelList::CAircraftModelList() {} - CAircraftModelList::CAircraftModelList(const CSequence &other) : CSequence(other) {} bool CAircraftModelList::containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const diff --git a/src/misc/simulation/aircraftmodellist.h b/src/misc/simulation/aircraftmodellist.h index 2fd3c2127..a429e27cd 100644 --- a/src/misc/simulation/aircraftmodellist.h +++ b/src/misc/simulation/aircraftmodellist.h @@ -63,7 +63,7 @@ namespace swift::misc using CSequence::CSequence; //! Empty constructor. - CAircraftModelList(); + CAircraftModelList() = default; //! Construct from a base class object. CAircraftModelList(const CSequence &other); diff --git a/src/misc/simulation/aircraftmodelloader.cpp b/src/misc/simulation/aircraftmodelloader.cpp index ce08841fe..a7bf4ccbf 100644 --- a/src/misc/simulation/aircraftmodelloader.cpp +++ b/src/misc/simulation/aircraftmodelloader.cpp @@ -99,8 +99,6 @@ namespace swift::misc::simulation this->setObjectInfo(simulator); } - IAircraftModelLoader::~IAircraftModelLoader() {} - void IAircraftModelLoader::startLoading(LoadMode mode, const IAircraftModelLoader::ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) diff --git a/src/misc/simulation/aircraftmodelloader.h b/src/misc/simulation/aircraftmodelloader.h index b985f7139..b4d1274e1 100644 --- a/src/misc/simulation/aircraftmodelloader.h +++ b/src/misc/simulation/aircraftmodelloader.h @@ -90,7 +90,7 @@ namespace swift::misc::simulation using ModelConsolidationCallback = std::function; //! Destructor - virtual ~IAircraftModelLoader() override; + ~IAircraftModelLoader() override = default; //! Loading finished? virtual bool isLoadingFinished() const = 0; @@ -121,8 +121,8 @@ namespace swift::misc::simulation bool supportsSimulator(const CSimulatorInfo &simulator) const { return m_simulator == simulator; } // Interface implementations - virtual void setModels(const CAircraftModelList &models) override; - virtual int updateModels(const CAircraftModelList &models) override; + void setModels(const CAircraftModelList &models) override; + int updateModels(const CAircraftModelList &models) override; signals: //! Disk loading started @@ -192,12 +192,12 @@ namespace swift::misc::simulation CDummyModelLoader(const CSimulatorInfo &simulator, QObject *parent); //! IAircraftModelLoader::isLoadingFinished - virtual bool isLoadingFinished() const override; + bool isLoadingFinished() const override; protected: //! IAircraftModelLoader::startLoadingFromDisk - virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, - const QStringList &modelDirectories) override; + void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, + const QStringList &modelDirectories) override; private: qint64 m_loadingStartedTs = -1; diff --git a/src/misc/simulation/airspaceaircraftsnapshot.cpp b/src/misc/simulation/airspaceaircraftsnapshot.cpp index 6e8be78ac..60b994975 100644 --- a/src/misc/simulation/airspaceaircraftsnapshot.cpp +++ b/src/misc/simulation/airspaceaircraftsnapshot.cpp @@ -16,8 +16,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CAirspaceAircraftSnapsh namespace swift::misc::simulation { - CAirspaceAircraftSnapshot::CAirspaceAircraftSnapshot() {} - CAirspaceAircraftSnapshot::CAirspaceAircraftSnapshot(const CSimulatedAircraftList &allAircraft, bool restricted, bool renderingEnabled, int maxAircraft, const CLength &maxRenderedDistance) diff --git a/src/misc/simulation/airspaceaircraftsnapshot.h b/src/misc/simulation/airspaceaircraftsnapshot.h index f986c9397..123877c4f 100644 --- a/src/misc/simulation/airspaceaircraftsnapshot.h +++ b/src/misc/simulation/airspaceaircraftsnapshot.h @@ -29,7 +29,7 @@ namespace swift::misc::simulation { public: //! Default constructor - CAirspaceAircraftSnapshot(); + CAirspaceAircraftSnapshot() = default; //! Constructor CAirspaceAircraftSnapshot(const CSimulatedAircraftList &allAircraft, bool restricted = false, diff --git a/src/misc/simulation/backgroundvalidation.h b/src/misc/simulation/backgroundvalidation.h index 45ed7e088..b92acafe6 100644 --- a/src/misc/simulation/backgroundvalidation.h +++ b/src/misc/simulation/backgroundvalidation.h @@ -78,7 +78,7 @@ namespace swift::misc::simulation protected: //! \copydoc CContinuousWorker::beforeQuit - virtual void beforeQuit() noexcept override; + void beforeQuit() noexcept override; private: mutable QReadWriteLock m_lock; //!< lock snapshot diff --git a/src/misc/simulation/categorymatcher.h b/src/misc/simulation/categorymatcher.h index 8966f8b97..f1c435668 100644 --- a/src/misc/simulation/categorymatcher.h +++ b/src/misc/simulation/categorymatcher.h @@ -27,7 +27,7 @@ namespace swift::misc static const QStringList &getLogCategories(); //! Constructor - CCategoryMatcher() {} + CCategoryMatcher() = default; //! Used categories void setCategories(const aviation::CAircraftCategoryList &categories); diff --git a/src/misc/simulation/distributor.cpp b/src/misc/simulation/distributor.cpp index d0631dbd6..466fd271a 100644 --- a/src/misc/simulation/distributor.cpp +++ b/src/misc/simulation/distributor.cpp @@ -16,8 +16,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributor) namespace swift::misc::simulation { - CDistributor::CDistributor() {} - CDistributor::CDistributor(const QString &key) { this->setDbKey(unifyKeyOrAlias(key)); } CDistributor::CDistributor(const QString &id, const QString &description, const QString &alias1, diff --git a/src/misc/simulation/distributor.h b/src/misc/simulation/distributor.h index e98e9821b..8fbe8982d 100644 --- a/src/misc/simulation/distributor.h +++ b/src/misc/simulation/distributor.h @@ -42,7 +42,7 @@ namespace swift::misc::simulation }; //! Default constructor. - CDistributor(); + CDistributor() = default; //! Constructor CDistributor(const QString &key); diff --git a/src/misc/simulation/distributorlist.cpp b/src/misc/simulation/distributorlist.cpp index f4d54db4e..4753ce4d2 100644 --- a/src/misc/simulation/distributorlist.cpp +++ b/src/misc/simulation/distributorlist.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CDistributor, CDistributor namespace swift::misc::simulation { - CDistributorList::CDistributorList() {} - CDistributorList::CDistributorList(const CSequence &other) : CSequence(other) {} CDistributor CDistributorList::findByKeyOrAlias(const QString &keyOrAlias) const diff --git a/src/misc/simulation/distributorlist.h b/src/misc/simulation/distributorlist.h index 845b36987..ceebf9dd2 100644 --- a/src/misc/simulation/distributorlist.h +++ b/src/misc/simulation/distributorlist.h @@ -36,7 +36,7 @@ namespace swift::misc::simulation using CSequence::CSequence; //! Default constructor. - CDistributorList(); + CDistributorList() = default; //! Construct from a base class object. CDistributorList(const CSequence &other); diff --git a/src/misc/simulation/distributorlistpreferences.cpp b/src/misc/simulation/distributorlistpreferences.cpp index 306fd8dc4..13658da14 100644 --- a/src/misc/simulation/distributorlistpreferences.cpp +++ b/src/misc/simulation/distributorlistpreferences.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CDistributorListPrefere namespace swift::misc::simulation { - CDistributorListPreferences::CDistributorListPreferences() {} - const CDistributorList &CDistributorListPreferences::getDistributors(const CSimulatorInfo &simulator) const { Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator"); diff --git a/src/misc/simulation/distributorlistpreferences.h b/src/misc/simulation/distributorlistpreferences.h index 4d2ccecc6..46ec98d6e 100644 --- a/src/misc/simulation/distributorlistpreferences.h +++ b/src/misc/simulation/distributorlistpreferences.h @@ -29,7 +29,7 @@ namespace swift::misc::simulation { public: //! Default constructor. - CDistributorListPreferences(); + CDistributorListPreferences() = default; //! Get distributors const CDistributorList &getDistributors(const CSimulatorInfo &simulator) const; diff --git a/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp b/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp index 978286d56..44eb42633 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp +++ b/src/misc/simulation/fscommon/aircraftcfgentrieslist.cpp @@ -17,8 +17,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::fscommon, CAircraftCfgEntr namespace swift::misc::simulation::fscommon { - CAircraftCfgEntriesList::CAircraftCfgEntriesList() = default; - CAircraftCfgEntriesList::CAircraftCfgEntriesList(const CSequence &other) : CSequence(other) {} bool CAircraftCfgEntriesList::containsModelWithTitle(const QString &title, Qt::CaseSensitivity caseSensitivity) diff --git a/src/misc/simulation/fscommon/aircraftcfgentrieslist.h b/src/misc/simulation/fscommon/aircraftcfgentrieslist.h index cd345a347..a0953f83f 100644 --- a/src/misc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/misc/simulation/fscommon/aircraftcfgentrieslist.h @@ -35,7 +35,7 @@ namespace swift::misc::simulation::fscommon using CSequence::CSequence; //! Default constructor. - CAircraftCfgEntriesList(); + CAircraftCfgEntriesList() = default; //! Construct from a base class object. CAircraftCfgEntriesList(const CSequence &other); diff --git a/src/misc/simulation/fscommon/aircraftcfgparser.h b/src/misc/simulation/fscommon/aircraftcfgparser.h index 4fdc9bff5..9850f74bf 100644 --- a/src/misc/simulation/fscommon/aircraftcfgparser.h +++ b/src/misc/simulation/fscommon/aircraftcfgparser.h @@ -35,14 +35,14 @@ namespace swift::misc CAircraftCfgParser(const CSimulatorInfo &simInfo, QObject *parent = nullptr); //! Virtual destructor - virtual ~CAircraftCfgParser() override; + ~CAircraftCfgParser() override; //! Get parsed aircraft cfg entries list const CAircraftCfgEntriesList &getAircraftCfgEntriesList() const { return m_parsedCfgEntriesList; } //! \name Interface functions //! @{ - virtual bool isLoadingFinished() const override; + bool isLoadingFinished() const override; //! @} //! Parse a single file @@ -55,8 +55,8 @@ namespace swift::misc protected: //! \name Interface functions //! @{ - virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, - const QStringList &modelDirectories) override; + void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, + const QStringList &modelDirectories) override; //! @} private: diff --git a/src/misc/simulation/fscommon/vpilotmodelrule.cpp b/src/misc/simulation/fscommon/vpilotmodelrule.cpp index 0f5340af5..6ffb9fb9b 100644 --- a/src/misc/simulation/fscommon/vpilotmodelrule.cpp +++ b/src/misc/simulation/fscommon/vpilotmodelrule.cpp @@ -18,8 +18,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::fscommon, CVPilotModelR namespace swift::misc::simulation::fscommon { - CVPilotModelRule::CVPilotModelRule() {} - CVPilotModelRule::CVPilotModelRule(const QString &modelName, const QString &folder, const QString &typeCode, const QString &callsignPrefix, qint64 updated) : ITimestampBased(updated), m_modelName(modelName.trimmed().toUpper()), m_folder(folder.trimmed().toUpper()), diff --git a/src/misc/simulation/fscommon/vpilotmodelrule.h b/src/misc/simulation/fscommon/vpilotmodelrule.h index 85bc77923..ff85da35a 100644 --- a/src/misc/simulation/fscommon/vpilotmodelrule.h +++ b/src/misc/simulation/fscommon/vpilotmodelrule.h @@ -36,7 +36,7 @@ namespace swift::misc::simulation::fscommon }; //! Default constructor - CVPilotModelRule(); + CVPilotModelRule() = default; //! Default constructor. CVPilotModelRule(const QString &modelName, const QString &folder, const QString &typeCode, diff --git a/src/misc/simulation/fsx/simconnectutilities.cpp b/src/misc/simulation/fsx/simconnectutilities.cpp index f2853c6c8..d11bde8e0 100644 --- a/src/misc/simulation/fsx/simconnectutilities.cpp +++ b/src/misc/simulation/fsx/simconnectutilities.cpp @@ -15,8 +15,6 @@ using namespace swift::misc::aviation; namespace swift::misc::simulation::fsx { - CSimConnectUtilities::CSimConnectUtilities() {} - QString CSimConnectUtilities::resolveEnumToString(const DWORD id, const char *enumName) { const int i = CSimConnectUtilities::staticMetaObject.indexOfEnumerator(enumName); diff --git a/src/misc/simulation/fsx/simconnectutilities.h b/src/misc/simulation/fsx/simconnectutilities.h index d9f105bf1..707ec2493 100644 --- a/src/misc/simulation/fsx/simconnectutilities.h +++ b/src/misc/simulation/fsx/simconnectutilities.h @@ -193,7 +193,7 @@ namespace swift::misc::simulation::fsx static QString resolveEnumToString(const DWORD id, const char *enumName); //! Hidden constructor - CSimConnectUtilities(); + CSimConnectUtilities() = default; }; } // namespace swift::misc::simulation::fsx diff --git a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp index 51797bedb..afdff92e0 100644 --- a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp +++ b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp @@ -19,12 +19,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CInterpolationAndRender namespace swift::misc::simulation { - CInterpolationAndRenderingSetupBase::CInterpolationAndRenderingSetupBase() - { - // Experimental - // m_fixSceneryOffset = CBuildConfig::isLocalDeveloperDebugBuild(); - } - bool CInterpolationAndRenderingSetupBase::setSendingGndFlagToSimulator(bool sendFLag) { if (sendFLag == m_sendGndToSim) { return false; } @@ -151,8 +145,6 @@ namespace swift::misc::simulation index <= CInterpolationAndRenderingSetupBase::IndexFixSceneryOffset; } - CInterpolationAndRenderingSetupGlobal::CInterpolationAndRenderingSetupGlobal() {} - int CInterpolationAndRenderingSetupGlobal::InfiniteAircraft() { return 100; } bool CInterpolationAndRenderingSetupGlobal::isRenderingEnabled() const @@ -308,8 +300,6 @@ namespace swift::misc::simulation CValueObject::setPropertyByIndex(index, variant); } - CInterpolationAndRenderingSetupPerCallsign::CInterpolationAndRenderingSetupPerCallsign() {} - CInterpolationAndRenderingSetupPerCallsign::CInterpolationAndRenderingSetupPerCallsign( const CCallsign &callsign, const CInterpolationAndRenderingSetupGlobal &globalSetup) : CInterpolationAndRenderingSetupBase(globalSetup), m_callsign(callsign) diff --git a/src/misc/simulation/interpolation/interpolationrenderingsetup.h b/src/misc/simulation/interpolation/interpolationrenderingsetup.h index f4fa75d49..361c2ad55 100644 --- a/src/misc/simulation/interpolation/interpolationrenderingsetup.h +++ b/src/misc/simulation/interpolation/interpolationrenderingsetup.h @@ -125,7 +125,7 @@ namespace swift::misc protected: //! Constructor - CInterpolationAndRenderingSetupBase(); + CInterpolationAndRenderingSetupBase() = default; //! Can handle index? static bool canHandleIndex(int index); @@ -155,7 +155,7 @@ namespace swift::misc }; //! Constructor. - CInterpolationAndRenderingSetupGlobal(); + CInterpolationAndRenderingSetupGlobal() = default; //! Considered as "all aircraft" static int InfiniteAircraft(); @@ -239,7 +239,7 @@ namespace swift::misc }; //! Constructor - CInterpolationAndRenderingSetupPerCallsign(); + CInterpolationAndRenderingSetupPerCallsign() = default; //! Constructor from global setup CInterpolationAndRenderingSetupPerCallsign(const aviation::CCallsign &callsign, diff --git a/src/misc/simulation/interpolation/interpolationsetuplist.cpp b/src/misc/simulation/interpolation/interpolationsetuplist.cpp index c1d12090a..42b7a4a2a 100644 --- a/src/misc/simulation/interpolation/interpolationsetuplist.cpp +++ b/src/misc/simulation/interpolation/interpolationsetuplist.cpp @@ -8,8 +8,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CInterpolationAndRendering namespace swift::misc::simulation { - CInterpolationSetupList::CInterpolationSetupList() {} - CInterpolationSetupList::CInterpolationSetupList(const CInterpolationAndRenderingSetupPerCallsign &setup) { this->push_back(setup); diff --git a/src/misc/simulation/interpolation/interpolationsetuplist.h b/src/misc/simulation/interpolation/interpolationsetuplist.h index 8aaa83a74..3469888e8 100644 --- a/src/misc/simulation/interpolation/interpolationsetuplist.h +++ b/src/misc/simulation/interpolation/interpolationsetuplist.h @@ -28,7 +28,7 @@ namespace swift::misc::simulation using CSequence::CSequence; //! Default constructor. - CInterpolationSetupList(); + CInterpolationSetupList() = default; //! Single object CInterpolationSetupList(const CInterpolationAndRenderingSetupPerCallsign &setup); diff --git a/src/misc/simulation/interpolation/interpolatorlinear.h b/src/misc/simulation/interpolation/interpolatorlinear.h index e7a22146f..afce53b9d 100644 --- a/src/misc/simulation/interpolation/interpolatorlinear.h +++ b/src/misc/simulation/interpolation/interpolatorlinear.h @@ -27,7 +27,7 @@ namespace swift::misc //! Linear interpolator, calculation inbetween positions class SWIFT_MISC_EXPORT CInterpolatorLinear : public CInterpolator { - virtual void anchor() override; + void anchor() override; public: //! Constructor diff --git a/src/misc/simulation/interpolation/interpolatormulti.cpp b/src/misc/simulation/interpolation/interpolatormulti.cpp index c21a2598c..487e983bc 100644 --- a/src/misc/simulation/interpolation/interpolatormulti.cpp +++ b/src/misc/simulation/interpolation/interpolatormulti.cpp @@ -79,8 +79,6 @@ namespace swift::misc::simulation return ("Illegal mode"); } - CInterpolatorMultiWrapper::CInterpolatorMultiWrapper() {} - CInterpolatorMultiWrapper::CInterpolatorMultiWrapper(const aviation::CCallsign &callsign, ISimulationEnvironmentProvider *p1, IInterpolationSetupProvider *p2, IRemoteAircraftProvider *p3, diff --git a/src/misc/simulation/interpolation/interpolatormulti.h b/src/misc/simulation/interpolation/interpolatormulti.h index cfae82530..5cde6fd3a 100644 --- a/src/misc/simulation/interpolation/interpolatormulti.h +++ b/src/misc/simulation/interpolation/interpolatormulti.h @@ -56,7 +56,7 @@ namespace swift::misc::simulation { public: //! Default ctor, needed for QMap/QHash - CInterpolatorMultiWrapper(); + CInterpolatorMultiWrapper() = default; //! Constructor CInterpolatorMultiWrapper(const aviation::CCallsign &callsign, ISimulationEnvironmentProvider *p1, diff --git a/src/misc/simulation/interpolation/interpolatorspline.h b/src/misc/simulation/interpolation/interpolatorspline.h index a12dccd6e..372d786ee 100644 --- a/src/misc/simulation/interpolation/interpolatorspline.h +++ b/src/misc/simulation/interpolation/interpolatorspline.h @@ -17,7 +17,7 @@ namespace swift::misc::simulation //! Cubic spline interpolator class SWIFT_MISC_EXPORT CInterpolatorSpline : public CInterpolator { - virtual void anchor() override; + void anchor() override; public: //! Constructor diff --git a/src/misc/simulation/matchingscript.h b/src/misc/simulation/matchingscript.h index f2adf0040..886077461 100644 --- a/src/misc/simulation/matchingscript.h +++ b/src/misc/simulation/matchingscript.h @@ -55,7 +55,7 @@ namespace swift::misc::simulation public: //! Ctor - Q_INVOKABLE MSInOutValues() {} + Q_INVOKABLE MSInOutValues() = default; //! Ctor Q_INVOKABLE MSInOutValues(const QString &cs, const QString &csAsSet, const QString &flightNumber, @@ -248,7 +248,7 @@ namespace swift::misc::simulation public: //! Ctor - Q_INVOKABLE MSModelSet() {} + Q_INVOKABLE MSModelSet() = default; //! Get callsign const QString &getSimulator() const { return m_simulator; } diff --git a/src/misc/simulation/matchingstatistics.cpp b/src/misc/simulation/matchingstatistics.cpp index 67edec704..727a29bb4 100644 --- a/src/misc/simulation/matchingstatistics.cpp +++ b/src/misc/simulation/matchingstatistics.cpp @@ -7,8 +7,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CMatchingStatisticsEntry, namespace swift::misc::simulation { - CMatchingStatistics::CMatchingStatistics() {} - CMatchingStatistics::CMatchingStatistics(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/simulation/matchingstatistics.h b/src/misc/simulation/matchingstatistics.h index fe4498e7e..a6086e1f7 100644 --- a/src/misc/simulation/matchingstatistics.h +++ b/src/misc/simulation/matchingstatistics.h @@ -28,7 +28,7 @@ namespace swift::misc::simulation using CSequence::CSequence; //! Default constructor. - CMatchingStatistics(); + CMatchingStatistics() = default; //! Construct from a base class object. CMatchingStatistics(const CSequence &other); diff --git a/src/misc/simulation/matchingstatisticsentry.cpp b/src/misc/simulation/matchingstatisticsentry.cpp index 37c196b81..34cad2d10 100644 --- a/src/misc/simulation/matchingstatisticsentry.cpp +++ b/src/misc/simulation/matchingstatisticsentry.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CMatchingStatisticsEntr namespace swift::misc::simulation { - CMatchingStatisticsEntry::CMatchingStatisticsEntry() {} - CMatchingStatisticsEntry::CMatchingStatisticsEntry(EntryType type, const QString &sessionId, const QString &modelSetId, const QString &description, const QString &aircraftDesignator, diff --git a/src/misc/simulation/matchingstatisticsentry.h b/src/misc/simulation/matchingstatisticsentry.h index 5d3284d58..25aa59044 100644 --- a/src/misc/simulation/matchingstatisticsentry.h +++ b/src/misc/simulation/matchingstatisticsentry.h @@ -43,7 +43,7 @@ namespace swift::misc::simulation }; //! Default constructor. - CMatchingStatisticsEntry(); + CMatchingStatisticsEntry() = default; //! Constructor CMatchingStatisticsEntry(EntryType type, const QString &sessionId, const QString &modelSetId, diff --git a/src/misc/simulation/ownaircraftproviderdummy.h b/src/misc/simulation/ownaircraftproviderdummy.h index 40bef66fe..e95ef629f 100644 --- a/src/misc/simulation/ownaircraftproviderdummy.h +++ b/src/misc/simulation/ownaircraftproviderdummy.h @@ -47,67 +47,67 @@ namespace swift::misc static COwnAircraftProviderDummy *instance(); //! \copydoc IOwnAircraftProvider::getOwnAircraft - virtual CSimulatedAircraft getOwnAircraft() const override; + CSimulatedAircraft getOwnAircraft() const override; //! \copydoc IOwnAircraftProvider::getOwnCallsign - virtual aviation::CCallsign getOwnCallsign() const override; + aviation::CCallsign getOwnCallsign() const override; //! \copydoc IOwnAircraftProvider::getOwnComSystem - virtual aviation::CComSystem getOwnComSystem(aviation::CComSystem::ComUnit unit) const override; + aviation::CComSystem getOwnComSystem(aviation::CComSystem::ComUnit unit) const override; //! \copydoc IOwnAircraftProvider::getOwnTransponder - virtual aviation::CTransponder getOwnTransponder() const override; + aviation::CTransponder getOwnTransponder() const override; //! \copydoc IOwnAircraftProvider::getOwnAircraftPosition - virtual swift::misc::geo::CCoordinateGeodetic getOwnAircraftPosition() const override; + swift::misc::geo::CCoordinateGeodetic getOwnAircraftPosition() const override; //! \copydoc IOwnAircraftProvider::getOwnAircraftSituation - virtual swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; + swift::misc::aviation::CAircraftSituation getOwnAircraftSituation() const override; //! \copydoc IOwnAircraftProvider::getOwnAircraftParts - virtual swift::misc::aviation::CAircraftParts getOwnAircraftParts() const override; + swift::misc::aviation::CAircraftParts getOwnAircraftParts() const override; //! \copydoc IOwnAircraftProvider::getOwnAircraftModel - virtual swift::misc::simulation::CAircraftModel getOwnAircraftModel() const override; + swift::misc::simulation::CAircraftModel getOwnAircraftModel() const override; //! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft - virtual swift::misc::physical_quantities::CLength + swift::misc::physical_quantities::CLength getDistanceToOwnAircraft(const swift::misc::geo::ICoordinateGeodetic &position) const override; public slots: //! \copydoc IOwnAircraftProvider::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; + 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 IOwnAircraftProvider::updateActiveComFrequency - virtual bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, - swift::misc::aviation::CComSystem::ComUnit comUnit, - const swift::misc::CIdentifier &originator) override; + bool updateActiveComFrequency(const swift::misc::physical_quantities::CFrequency &frequency, + swift::misc::aviation::CComSystem::ComUnit comUnit, + const swift::misc::CIdentifier &originator) override; //! \copydoc IOwnAircraftProvider::updateSelcal - virtual bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; + bool updateSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; //! \copydoc IOwnAircraftProvider::updateOwnCallsign - virtual bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; + bool updateOwnCallsign(const swift::misc::aviation::CCallsign &callsign) override; //! \copydoc IOwnAircraftProvider::updateOwnModel - virtual bool updateOwnModel(const swift::misc::simulation::CAircraftModel &model) override; + bool updateOwnModel(const swift::misc::simulation::CAircraftModel &model) override; //! \copydoc IOwnAircraftProvider::updateOwnIcaoCodes - virtual bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, - const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; + bool updateOwnIcaoCodes(const swift::misc::aviation::CAircraftIcaoCode &aircraftIcaoCode, + const swift::misc::aviation::CAirlineIcaoCode &airlineIcaoCode) override; //! \copydoc IOwnAircraftProvider::updateOwnSituation - virtual bool updateOwnSituation(const swift::misc::aviation::CAircraftSituation &situation) override; + bool updateOwnSituation(const swift::misc::aviation::CAircraftSituation &situation) override; //! \copydoc IOwnAircraftProvider::updateOwnParts - virtual bool updateOwnParts(const swift::misc::aviation::CAircraftParts &parts) override; + bool updateOwnParts(const swift::misc::aviation::CAircraftParts &parts) override; //! \copydoc IOwnAircraftProvider::updateOwnCG - virtual bool updateOwnCG(const swift::misc::physical_quantities::CLength &cg) override; + bool updateOwnCG(const swift::misc::physical_quantities::CLength &cg) override; private: swift::misc::simulation::CSimulatedAircraft m_ownAircraft; diff --git a/src/misc/simulation/remoteaircraftprovider.cpp b/src/misc/simulation/remoteaircraftprovider.cpp index bea4817a7..d68b79f0d 100644 --- a/src/misc/simulation/remoteaircraftprovider.cpp +++ b/src/misc/simulation/remoteaircraftprovider.cpp @@ -18,10 +18,6 @@ using namespace swift::config; namespace swift::misc::simulation { - IRemoteAircraftProvider::IRemoteAircraftProvider() {} - - IRemoteAircraftProvider::~IRemoteAircraftProvider() {} - const QStringList &CRemoteAircraftProvider::getLogCategories() { static const QStringList cats { CLogCategories::matching(), CLogCategories::network() }; @@ -962,8 +958,6 @@ namespace swift::misc::simulation return removedCallsign; } - CRemoteAircraftAware::~CRemoteAircraftAware() {} - CSimulatedAircraftList CRemoteAircraftAware::getAircraftInRange() const { Q_ASSERT_X(this->provider(), Q_FUNC_INFO, "No object available"); diff --git a/src/misc/simulation/remoteaircraftprovider.h b/src/misc/simulation/remoteaircraftprovider.h index fe485d6b3..a0b7cffdd 100644 --- a/src/misc/simulation/remoteaircraftprovider.h +++ b/src/misc/simulation/remoteaircraftprovider.h @@ -49,7 +49,7 @@ namespace swift::misc static constexpr int MaxPartsAgePerCallsignSecs = 60; //!< How many seconds to keep parts for interpolation //! Destructor - virtual ~IRemoteAircraftProvider() override; + ~IRemoteAircraftProvider() override = default; //! Copy constructor IRemoteAircraftProvider(const IRemoteAircraftProvider &) = delete; @@ -292,7 +292,7 @@ namespace swift::misc protected: //! Constructor - IRemoteAircraftProvider(); + IRemoteAircraftProvider() = default; }; } // namespace simulation } // namespace swift::misc @@ -318,79 +318,74 @@ namespace swift::misc::simulation CRemoteAircraftProvider(QObject *parent); // remoteaircraftprovider - virtual CSimulatedAircraftList getAircraftInRange() const override; - virtual aviation::CCallsignSet getAircraftInRangeCallsigns() const override; - virtual CSimulatedAircraft getAircraftInRangeForCallsign(const aviation::CCallsign &callsign) const override; - virtual CAircraftModel getAircraftInRangeModelForCallsign(const aviation::CCallsign &callsign) const override; - virtual int getAircraftInRangeCount() const override; - virtual bool isAircraftInRange(const aviation::CCallsign &callsign) const override; - virtual bool isVtolAircraft(const aviation::CCallsign &callsign) const override; - virtual aviation::CAircraftSituationList - remoteAircraftSituations(const aviation::CCallsign &callsign) const override; - virtual aviation::CAircraftSituation remoteAircraftSituation(const aviation::CCallsign &callsign, - int index) const override; - virtual MillisecondsMinMaxMean + CSimulatedAircraftList getAircraftInRange() const override; + aviation::CCallsignSet getAircraftInRangeCallsigns() const override; + CSimulatedAircraft getAircraftInRangeForCallsign(const aviation::CCallsign &callsign) const override; + CAircraftModel getAircraftInRangeModelForCallsign(const aviation::CCallsign &callsign) const override; + int getAircraftInRangeCount() const override; + bool isAircraftInRange(const aviation::CCallsign &callsign) const override; + bool isVtolAircraft(const aviation::CCallsign &callsign) const override; + aviation::CAircraftSituationList remoteAircraftSituations(const aviation::CCallsign &callsign) const override; + aviation::CAircraftSituation remoteAircraftSituation(const aviation::CCallsign &callsign, + int index) const override; + MillisecondsMinMaxMean remoteAircraftSituationsTimestampDifferenceMinMaxMean(const aviation::CCallsign &callsign) const override; - virtual aviation::CAircraftSituationList latestRemoteAircraftSituations() const override; - virtual aviation::CAircraftSituationList latestOnGroundProviderElevations() const override; - virtual int remoteAircraftSituationsCount(const aviation::CCallsign &callsign) const override; - virtual aviation::CAircraftPartsList remoteAircraftParts(const aviation::CCallsign &callsign) const override; - virtual int remoteAircraftPartsCount(const aviation::CCallsign &callsign) const override; - virtual bool isRemoteAircraftSupportingParts(const aviation::CCallsign &callsign) const override; - virtual int getRemoteAircraftSupportingPartsCount() const override; - virtual aviation::CCallsignSet remoteAircraftSupportingParts() const override; - virtual aviation::CAircraftSituationChangeList + aviation::CAircraftSituationList latestRemoteAircraftSituations() const override; + aviation::CAircraftSituationList latestOnGroundProviderElevations() const override; + int remoteAircraftSituationsCount(const aviation::CCallsign &callsign) const override; + aviation::CAircraftPartsList remoteAircraftParts(const aviation::CCallsign &callsign) const override; + int remoteAircraftPartsCount(const aviation::CCallsign &callsign) const override; + bool isRemoteAircraftSupportingParts(const aviation::CCallsign &callsign) const override; + int getRemoteAircraftSupportingPartsCount() const override; + aviation::CCallsignSet remoteAircraftSupportingParts() const override; + aviation::CAircraftSituationChangeList remoteAircraftSituationChanges(const aviation::CCallsign &callsign) const override; - virtual int remoteAircraftSituationChangesCount(const aviation::CCallsign &callsign) const override; - virtual bool updateAircraftEnabled(const aviation::CCallsign &callsign, bool enabledForRendering) override; - virtual bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, - bool enabledForRendering) override; - virtual int updateMultipleAircraftEnabled(const aviation::CCallsignSet &callsigns, - bool enabledForRendering) override; - virtual bool updateAircraftModel(const aviation::CCallsign &callsign, const CAircraftModel &model, - const CIdentifier &originator) override; - virtual bool updateAircraftNetworkModel(const aviation::CCallsign &callsign, const CAircraftModel &model, - const CIdentifier &originator) override; - virtual bool updateFastPositionEnabled(const aviation::CCallsign &callsign, - bool enableFastPositonUpdates) override; - virtual bool updateAircraftRendered(const aviation::CCallsign &callsign, bool rendered) override; - virtual int updateMultipleAircraftRendered(const aviation::CCallsignSet &callsigns, bool rendered) override; - virtual int updateAircraftGroundElevation(const aviation::CCallsign &callsign, - const geo::CElevationPlane &elevation, - aviation::CAircraftSituation::GndElevationInfo info, - bool *setForOnGroundPosition) override; - virtual bool updateCG(const aviation::CCallsign &callsign, const physical_quantities::CLength &cg) override; - virtual bool updateCGAndModelString(const aviation::CCallsign &callsign, const physical_quantities::CLength &cg, - const QString &modelString) override; - virtual aviation::CCallsignSet updateCGForModel(const QString &modelString, - const physical_quantities::CLength &cg) override; - virtual physical_quantities::CLength getCGFromDB(const aviation::CCallsign &callsign) const override; - virtual physical_quantities::CLength getCGFromDB(const QString &modelString) const override; - virtual void rememberCGFromDB(const physical_quantities::CLength &cgFromDB, - const aviation::CCallsign &callsign) override; - virtual void rememberCGFromDB(const physical_quantities::CLength &cgFromDB, - const QString &modelString) override; - virtual void updateMarkAllAsNotRendered() override; - virtual CStatusMessageList getAircraftPartsHistory(const aviation::CCallsign &callsign) const override; - virtual bool isAircraftPartsHistoryEnabled() const override; - virtual void enableAircraftPartsHistory(bool enabled) override; - virtual int aircraftSituationsAdded() const override; - virtual int aircraftPartsAdded() const override; - virtual qint64 situationsLastModified(const aviation::CCallsign &callsign) const override; - virtual qint64 partsLastModified(const aviation::CCallsign &callsign) const override; - virtual geo::CElevationPlane averageElevationOfNonMovingAircraft(const aviation::CAircraftSituation &reference, - const physical_quantities::CLength &range, - int minValues = 1, - int sufficientValues = 2) const override; - virtual QList connectRemoteAircraftProviderSignals( + int remoteAircraftSituationChangesCount(const aviation::CCallsign &callsign) const override; + bool updateAircraftEnabled(const aviation::CCallsign &callsign, bool enabledForRendering) override; + bool setAircraftEnabledFlag(const swift::misc::aviation::CCallsign &callsign, + bool enabledForRendering) override; + int updateMultipleAircraftEnabled(const aviation::CCallsignSet &callsigns, bool enabledForRendering) override; + bool updateAircraftModel(const aviation::CCallsign &callsign, const CAircraftModel &model, + const CIdentifier &originator) override; + bool updateAircraftNetworkModel(const aviation::CCallsign &callsign, const CAircraftModel &model, + const CIdentifier &originator) override; + bool updateFastPositionEnabled(const aviation::CCallsign &callsign, bool enableFastPositonUpdates) override; + bool updateAircraftRendered(const aviation::CCallsign &callsign, bool rendered) override; + int updateMultipleAircraftRendered(const aviation::CCallsignSet &callsigns, bool rendered) override; + int updateAircraftGroundElevation(const aviation::CCallsign &callsign, const geo::CElevationPlane &elevation, + aviation::CAircraftSituation::GndElevationInfo info, + bool *setForOnGroundPosition) override; + bool updateCG(const aviation::CCallsign &callsign, const physical_quantities::CLength &cg) override; + bool updateCGAndModelString(const aviation::CCallsign &callsign, const physical_quantities::CLength &cg, + const QString &modelString) override; + aviation::CCallsignSet updateCGForModel(const QString &modelString, + const physical_quantities::CLength &cg) override; + physical_quantities::CLength getCGFromDB(const aviation::CCallsign &callsign) const override; + physical_quantities::CLength getCGFromDB(const QString &modelString) const override; + void rememberCGFromDB(const physical_quantities::CLength &cgFromDB, + const aviation::CCallsign &callsign) override; + void rememberCGFromDB(const physical_quantities::CLength &cgFromDB, const QString &modelString) override; + void updateMarkAllAsNotRendered() override; + CStatusMessageList getAircraftPartsHistory(const aviation::CCallsign &callsign) const override; + bool isAircraftPartsHistoryEnabled() const override; + void enableAircraftPartsHistory(bool enabled) override; + int aircraftSituationsAdded() const override; + int aircraftPartsAdded() const override; + qint64 situationsLastModified(const aviation::CCallsign &callsign) const override; + qint64 partsLastModified(const aviation::CCallsign &callsign) const override; + geo::CElevationPlane averageElevationOfNonMovingAircraft(const aviation::CAircraftSituation &reference, + const physical_quantities::CLength &range, + int minValues = 1, + int sufficientValues = 2) const override; + QList connectRemoteAircraftProviderSignals( QObject *receiver, std::function addedSituationSlot, std::function addedPartsSlot, std::function removedAircraftSlot, std::function aircraftSnapshotSlot) override; - virtual void enableReverseLookupMessages(ReverseLookupLogging enable) override; - virtual ReverseLookupLogging isReverseLookupMessagesEnabled() const override; - virtual swift::misc::CStatusMessageList + void enableReverseLookupMessages(ReverseLookupLogging enable) override; + ReverseLookupLogging isReverseLookupMessagesEnabled() const override; + swift::misc::CStatusMessageList getReverseLookupMessages(const swift::misc::aviation::CCallsign &callsign) const override; //! @{ @@ -404,7 +399,7 @@ namespace swift::misc::simulation //! @} //! \copydoc swift::misc::IProvider::asQObject - virtual QObject *asQObject() override { return this; } + QObject *asQObject() override { return this; } //! Clear all data void clear(); @@ -565,7 +560,7 @@ namespace swift::misc::simulation { public: //! Destructor - virtual ~CRemoteAircraftAware() override; + ~CRemoteAircraftAware() override = default; //! \copydoc IRemoteAircraftProvider::getAircraftInRange CSimulatedAircraftList getAircraftInRange() const; diff --git a/src/misc/simulation/remoteaircraftproviderdummy.h b/src/misc/simulation/remoteaircraftproviderdummy.h index e89491735..988f514de 100644 --- a/src/misc/simulation/remoteaircraftproviderdummy.h +++ b/src/misc/simulation/remoteaircraftproviderdummy.h @@ -41,8 +41,8 @@ namespace swift::misc::simulation //! @{ //! Members not implenented or fully implenented by CRemoteAircraftProvider //! \ingroup remoteaircraftprovider - virtual QObject *asQObject() override { return this; } - virtual CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override; + QObject *asQObject() override { return this; } + CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override; //! @} }; } // namespace swift::misc::simulation diff --git a/src/misc/simulation/settings/modelsettings.cpp b/src/misc/simulation/settings/modelsettings.cpp index 397bdcfa4..331f73927 100644 --- a/src/misc/simulation/settings/modelsettings.cpp +++ b/src/misc/simulation/settings/modelsettings.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CModelSetting namespace swift::misc::simulation::settings { - CModelSettings::CModelSettings() {} - QString CModelSettings::convertToQString(bool i18n) const { Q_UNUSED(i18n); diff --git a/src/misc/simulation/settings/modelsettings.h b/src/misc/simulation/settings/modelsettings.h index 4fc5aa024..316557c35 100644 --- a/src/misc/simulation/settings/modelsettings.h +++ b/src/misc/simulation/settings/modelsettings.h @@ -26,7 +26,7 @@ namespace swift::misc::simulation::settings }; //! Default constructor - CModelSettings(); + CModelSettings() = default; //! Allow excluded models? bool getAllowExcludedModels() const { return m_allowExcludeModels; } diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp index 5a1757663..613418e9a 100644 --- a/src/misc/simulation/settings/simulatorsettings.cpp +++ b/src/misc/simulation/settings/simulatorsettings.cpp @@ -44,8 +44,6 @@ namespace swift::misc::simulation::settings return u; } - CSimulatorSettings::CSimulatorSettings() {} - void CSimulatorSettings::setSimulatorDirectory(const QString &simulatorDirectory) { m_simulatorDirectory = simulatorDirectory.trimmed(); diff --git a/src/misc/simulation/settings/simulatorsettings.h b/src/misc/simulation/settings/simulatorsettings.h index c683177b3..056635ef7 100644 --- a/src/misc/simulation/settings/simulatorsettings.h +++ b/src/misc/simulation/settings/simulatorsettings.h @@ -55,7 +55,7 @@ namespace swift::misc::simulation::settings static const QString &cgSourceAsString(CGSource source); //! Default constructor - CSimulatorSettings(); + CSimulatorSettings() = default; //! Constructor CSimulatorSettings(const QString &simDir) : m_simulatorDirectory(simDir) {} @@ -160,7 +160,7 @@ namespace swift::misc::simulation::settings { public: //! Default constructor - CFsxP3DSettings() {} + CFsxP3DSettings() = default; //! Constructor CFsxP3DSettings(bool simulatedObject, bool sbOffsets) @@ -607,7 +607,7 @@ namespace swift::misc::simulation::settings Q_DECLARE_FLAGS(TextMessageType, TextMessageTypeFlag) //! Default constructor - CSimulatorMessagesSettings() {} + CSimulatorMessagesSettings() = default; //! Log severity void setTechnicalLogSeverity(CStatusMessage::StatusSeverity severity); diff --git a/src/misc/simulation/settings/swiftpluginsettings.cpp b/src/misc/simulation/settings/swiftpluginsettings.cpp index e28b4bfde..5d7bb9eae 100644 --- a/src/misc/simulation/settings/swiftpluginsettings.cpp +++ b/src/misc/simulation/settings/swiftpluginsettings.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CSwiftPluginS namespace swift::misc::simulation::settings { - CSwiftPluginSettings::CSwiftPluginSettings() {} - void CSwiftPluginSettings::setEmulatedSimulator(const CSimulatorInfo &simulator) { Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "need single simulator"); diff --git a/src/misc/simulation/settings/swiftpluginsettings.h b/src/misc/simulation/settings/swiftpluginsettings.h index fac15b3f8..297102e4e 100644 --- a/src/misc/simulation/settings/swiftpluginsettings.h +++ b/src/misc/simulation/settings/swiftpluginsettings.h @@ -30,7 +30,7 @@ namespace swift::misc::simulation::settings }; //! Default constructor - CSwiftPluginSettings(); + CSwiftPluginSettings() = default; //! Emulated simualtor CSimulatorInfo getEmulatedSimulator() const { return m_emulatedSimulator; } diff --git a/src/misc/simulation/settings/xswiftbussettings.cpp b/src/misc/simulation/settings/xswiftbussettings.cpp index 73c1ec585..ec689fd13 100644 --- a/src/misc/simulation/settings/xswiftbussettings.cpp +++ b/src/misc/simulation/settings/xswiftbussettings.cpp @@ -9,8 +9,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation::settings, CXSwiftBusSet namespace swift::misc::simulation::settings { - CXSwiftBusSettings::CXSwiftBusSettings() {} - CXSwiftBusSettings::CXSwiftBusSettings(const QString &json) { this->parseXSwiftBusStringQt(json); } QVariant CXSwiftBusSettings::propertyByIndex(CPropertyIndexRef index) const diff --git a/src/misc/simulation/settings/xswiftbussettings.h b/src/misc/simulation/settings/xswiftbussettings.h index 8daba1ced..8f674ef0b 100644 --- a/src/misc/simulation/settings/xswiftbussettings.h +++ b/src/misc/simulation/settings/xswiftbussettings.h @@ -40,7 +40,7 @@ namespace swift::misc::simulation::settings }; //! Default constructor - CXSwiftBusSettings(); + CXSwiftBusSettings() = default; //! From JSON constructor CXSwiftBusSettings(const QString &json); @@ -79,7 +79,7 @@ namespace swift::misc::simulation::settings void parseXSwiftBusStringQt(const QString &json) { this->parseXSwiftBusString(json.toStdString()); } //! Sets both timestamps - virtual void setCurrentUtcTime() override; + void setCurrentUtcTime() override; //! Valid settings? CStatusMessageList validate() const; @@ -89,7 +89,7 @@ namespace swift::misc::simulation::settings protected: //! \copydoc CXSwiftBusSettingsQtFree::objectUpdated - virtual void objectUpdated() override final; + void objectUpdated() override; private: SWIFT_METACLASS( diff --git a/src/misc/simulation/settings/xswiftbussettingsqtfree.h b/src/misc/simulation/settings/xswiftbussettingsqtfree.h index 13bf94083..b2e153dc2 100644 --- a/src/misc/simulation/settings/xswiftbussettingsqtfree.h +++ b/src/misc/simulation/settings/xswiftbussettingsqtfree.h @@ -19,10 +19,10 @@ namespace swift::misc::simulation::settings { protected: //! Constructor. - CXSwiftBusSettingsQtFree() {} + CXSwiftBusSettingsQtFree() = default; //! Destructor. - virtual ~CXSwiftBusSettingsQtFree() {} + virtual ~CXSwiftBusSettingsQtFree() = default; public: //! DBus server diff --git a/src/misc/simulation/simulatedaircraft.h b/src/misc/simulation/simulatedaircraft.h index 7d8ffcd47..0ecf5ba99 100644 --- a/src/misc/simulation/simulatedaircraft.h +++ b/src/misc/simulation/simulatedaircraft.h @@ -210,22 +210,19 @@ namespace swift::misc const physical_quantities::CSpeed &getGroundSpeed() const { return m_situation.getGroundSpeed(); } //! \copydoc swift::misc::geo::ICoordinateGeodetic::latitude - virtual geo::CLatitude latitude() const override { return m_situation.latitude(); } + geo::CLatitude latitude() const override { return m_situation.latitude(); } //! \copydoc swift::misc::geo::ICoordinateGeodetic::longitude - virtual geo::CLongitude longitude() const override { return m_situation.longitude(); } + geo::CLongitude longitude() const override { return m_situation.longitude(); } //! \copydoc swift::misc::geo::ICoordinateGeodetic::geodeticHeight const aviation::CAltitude &geodeticHeight() const override { return m_situation.geodeticHeight(); } //! \copydoc swift::misc::geo::ICoordinateGeodetic::normalVector - virtual QVector3D normalVector() const override { return m_situation.normalVector(); } + QVector3D normalVector() const override { return m_situation.normalVector(); } //! \copydoc swift::misc::geo::ICoordinateGeodetic::normalVectorDouble - virtual std::array normalVectorDouble() const override - { - return m_situation.normalVectorDouble(); - } + std::array normalVectorDouble() const override { return m_situation.normalVectorDouble(); } //! \copydoc swift::misc::aviation::CAircraftSituation::getGroundElevation const aviation::CAltitude &getGroundElevation() const { return m_situation.getGroundElevation(); } diff --git a/src/misc/simulation/simulatedaircraftlist.cpp b/src/misc/simulation/simulatedaircraftlist.cpp index 0b86bc85c..136cab0d6 100644 --- a/src/misc/simulation/simulatedaircraftlist.cpp +++ b/src/misc/simulation/simulatedaircraftlist.cpp @@ -25,8 +25,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatedAircraft, CSimul namespace swift::misc::simulation { - CSimulatedAircraftList::CSimulatedAircraftList() {} - CSimulatedAircraftList::CSimulatedAircraftList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/simulation/simulatedaircraftlist.h b/src/misc/simulation/simulatedaircraftlist.h index b445ba82e..565a48b1e 100644 --- a/src/misc/simulation/simulatedaircraftlist.h +++ b/src/misc/simulation/simulatedaircraftlist.h @@ -45,7 +45,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CSimulatedAircraftList(); + CSimulatedAircraftList() = default; //! Construct from a base class object. CSimulatedAircraftList(const CSequence &other); diff --git a/src/misc/simulation/simulatorinfo.cpp b/src/misc/simulation/simulatorinfo.cpp index 56d4ad93e..de1bb720c 100644 --- a/src/misc/simulation/simulatorinfo.cpp +++ b/src/misc/simulation/simulatorinfo.cpp @@ -27,8 +27,6 @@ SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::simulation, CSimulatorInfo) namespace swift::misc::simulation { - CSimulatorInfo::CSimulatorInfo() {} - CSimulatorInfo::CSimulatorInfo(const QString &identifierString) : m_simulator(identifierToSimulator(identifierString)) {} diff --git a/src/misc/simulation/simulatorinfo.h b/src/misc/simulation/simulatorinfo.h index ce9bda03c..e54c3cff1 100644 --- a/src/misc/simulation/simulatorinfo.h +++ b/src/misc/simulation/simulatorinfo.h @@ -61,7 +61,7 @@ namespace swift::misc::simulation static constexpr int NumberOfSimulators = 7; //! Default constructor - CSimulatorInfo(); + CSimulatorInfo() = default; //! Constructor CSimulatorInfo(const QString &identifierString); diff --git a/src/misc/simulation/simulatorinfolist.cpp b/src/misc/simulation/simulatorinfolist.cpp index 8df66ecea..967db56e2 100644 --- a/src/misc/simulation/simulatorinfolist.cpp +++ b/src/misc/simulation/simulatorinfolist.cpp @@ -11,8 +11,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorInfo, CSimulator namespace swift::misc::simulation { - CSimulatorInfoList::CSimulatorInfoList() {} - CSimulatorInfoList::CSimulatorInfoList(const CSequence &other) : CSequence(other) {} CSimulatorInfoList CSimulatorInfoList::withNoDuplicates() const diff --git a/src/misc/simulation/simulatorinfolist.h b/src/misc/simulation/simulatorinfolist.h index be90420d8..41c690f8a 100644 --- a/src/misc/simulation/simulatorinfolist.h +++ b/src/misc/simulation/simulatorinfolist.h @@ -27,7 +27,7 @@ namespace swift::misc::simulation using CSequence::CSequence; //! Default constructor. - CSimulatorInfoList(); + CSimulatorInfoList() = default; //! Construct from a base class object. CSimulatorInfoList(const CSequence &other); diff --git a/src/misc/simulation/simulatorinternals.h b/src/misc/simulation/simulatorinternals.h index fc50c91d0..672c25111 100644 --- a/src/misc/simulation/simulatorinternals.h +++ b/src/misc/simulation/simulatorinternals.h @@ -37,7 +37,7 @@ namespace swift::misc::simulation }; //! Default constructor - CSimulatorInternals() {} + CSimulatorInternals() = default; //! All values swift::misc::CNameVariantPairList getData() const { return this->m_data; } diff --git a/src/misc/simulation/simulatorplugininfolist.cpp b/src/misc/simulation/simulatorplugininfolist.cpp index c19afdb9d..44e558c66 100644 --- a/src/misc/simulation/simulatorplugininfolist.cpp +++ b/src/misc/simulation/simulatorplugininfolist.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation, CSimulatorPluginInfo, CSim namespace swift::misc::simulation { - CSimulatorPluginInfoList::CSimulatorPluginInfoList() {} - bool CSimulatorPluginInfoList::supportsSimulator(const QString &simulator) const { return std::find_if(begin(), end(), [&simulator](const CSimulatorPluginInfo &info) { diff --git a/src/misc/simulation/simulatorplugininfolist.h b/src/misc/simulation/simulatorplugininfolist.h index 1c2bcef52..08de5ee77 100644 --- a/src/misc/simulation/simulatorplugininfolist.h +++ b/src/misc/simulation/simulatorplugininfolist.h @@ -32,7 +32,7 @@ namespace swift::misc::simulation using CSequence::CSequence; //! Default constructor - CSimulatorPluginInfoList(); + CSimulatorPluginInfoList() = default; //! Construct from a base class object. CSimulatorPluginInfoList(const CSequence &other); diff --git a/src/misc/simulation/xplane/aircraftmodelloaderxplane.h b/src/misc/simulation/xplane/aircraftmodelloaderxplane.h index 24d7c300e..dda28f676 100644 --- a/src/misc/simulation/xplane/aircraftmodelloaderxplane.h +++ b/src/misc/simulation/xplane/aircraftmodelloaderxplane.h @@ -36,11 +36,11 @@ namespace swift::misc CAircraftModelLoaderXPlane(QObject *parent = nullptr); //! Virtual destructor - virtual ~CAircraftModelLoaderXPlane() override; + ~CAircraftModelLoaderXPlane() override; //! \name Interface functions //! @{ - virtual bool isLoadingFinished() const override; + bool isLoadingFinished() const override; //! @} //! Parsed or injected models @@ -49,8 +49,8 @@ namespace swift::misc protected: //! \name Interface functions //! @{ - virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, - const QStringList &modelDirectories) override; + void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, + const QStringList &modelDirectories) override; //! @} private: diff --git a/src/misc/simulation/xplane/navdatareference.cpp b/src/misc/simulation/xplane/navdatareference.cpp index 08cddca2c..c98b169f4 100644 --- a/src/misc/simulation/xplane/navdatareference.cpp +++ b/src/misc/simulation/xplane/navdatareference.cpp @@ -12,8 +12,6 @@ SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::simulation::xplane, CNavDataReference, namespace swift::misc::simulation::xplane { - CNavDataReference::CNavDataReference() = default; - CNavDataReference::CNavDataReference(int id, const geo::CLatitude &latitude, const geo::CLongitude &longitude) : m_id(id), m_position(latitude, longitude, {}) {} @@ -44,8 +42,6 @@ namespace swift::misc::simulation::xplane return QString::number(id()) + ":" + m_position.convertToQString(i18n); } - CNavDataReferenceList::CNavDataReferenceList() = default; - CNavDataReferenceList::CNavDataReferenceList(const CSequence &other) : CSequence(other) {} diff --git a/src/misc/simulation/xplane/navdatareference.h b/src/misc/simulation/xplane/navdatareference.h index d3e32b740..260b02b39 100644 --- a/src/misc/simulation/xplane/navdatareference.h +++ b/src/misc/simulation/xplane/navdatareference.h @@ -37,7 +37,7 @@ namespace swift::misc::simulation::xplane { public: //! Default constructor. - CNavDataReference(); + CNavDataReference() = default; //! Construct from a navdata reference ID and position. CNavDataReference(int id, const geo::CLatitude &latitude, const geo::CLongitude &longitude); @@ -48,14 +48,11 @@ namespace swift::misc::simulation::xplane //! Return the navdata reference ID. int id() const { return m_id; } - virtual geo::CLatitude latitude() const override { return m_position.latitude(); } - virtual geo::CLongitude longitude() const override { return m_position.longitude(); } - virtual const aviation::CAltitude &geodeticHeight() const override { return m_position.geodeticHeight(); } - virtual QVector3D normalVector() const override { return m_position.normalVector(); } - virtual std::array normalVectorDouble() const override - { - return this->m_position.normalVectorDouble(); - } + geo::CLatitude latitude() const override { return m_position.latitude(); } + geo::CLongitude longitude() const override { return m_position.longitude(); } + const aviation::CAltitude &geodeticHeight() const override { return m_position.geodeticHeight(); } + QVector3D normalVector() const override { return m_position.normalVector(); } + std::array normalVectorDouble() const override { return this->m_position.normalVectorDouble(); } //! \copydoc swift::misc::mixin::Index::propertyByIndex QVariant propertyByIndex(swift::misc::CPropertyIndexRef index) const; @@ -89,7 +86,7 @@ namespace swift::misc::simulation::xplane using CSequence::CSequence; //! Default constructor. - CNavDataReferenceList(); + CNavDataReferenceList() = default; //! Construct from a base class object. CNavDataReferenceList(const CSequence &other); diff --git a/src/misc/slot.h b/src/misc/slot.h index d1fda9fb1..f4bb3d352 100644 --- a/src/misc/slot.h +++ b/src/misc/slot.h @@ -70,7 +70,7 @@ namespace swift::misc { public: //! Construct an empty slot. - CSlot() {} + CSlot() = default; //! Construct a slot from the given member function of the given object. template diff --git a/src/misc/statusexception.h b/src/misc/statusexception.h index 5d824f482..15bd6b30e 100644 --- a/src/misc/statusexception.h +++ b/src/misc/statusexception.h @@ -32,13 +32,13 @@ namespace swift::misc CStatusException &operator=(const CStatusException &) = delete; //! Return null-terminated message string. - virtual const char *what() const noexcept override; + const char *what() const noexcept override; //! Return the contained status message. const CStatusMessage &status() const { return m_payload; } //! Destructor. - ~CStatusException() override {} + ~CStatusException() override = default; //! If the message is not empty then throw it. static void maybeThrow(const CStatusMessage &); diff --git a/src/misc/statusmessage.h b/src/misc/statusmessage.h index 2b01e0c0b..15a1492a0 100644 --- a/src/misc/statusmessage.h +++ b/src/misc/statusmessage.h @@ -159,7 +159,7 @@ namespace swift::misc { public: //! Default constructor. - CMessageBase() {} + CMessageBase() = default; //! Construct a message with some specific category. explicit CMessageBase(const CLogCategory &category) : m_categories({ category }) {} diff --git a/src/misc/test/testserviceinterface.cpp b/src/misc/test/testserviceinterface.cpp index c89c57a87..2139f4f20 100644 --- a/src/misc/test/testserviceinterface.cpp +++ b/src/misc/test/testserviceinterface.cpp @@ -27,8 +27,6 @@ namespace swift::misc::test : QDBusAbstractInterface(service, path, ITestServiceInterface::InterfaceName(), connection, parent) {} - ITestServiceInterface::~ITestServiceInterface() {} - int ITestServiceInterface::pingTests(ITestServiceInterface &testServiceInterface, bool verbose) { int errors = 0; diff --git a/src/misc/test/testserviceinterface.h b/src/misc/test/testserviceinterface.h index 881efbcca..6db058d79 100644 --- a/src/misc/test/testserviceinterface.h +++ b/src/misc/test/testserviceinterface.h @@ -68,7 +68,7 @@ namespace swift::misc::test QObject *parent = nullptr); //! Destructor - virtual ~ITestServiceInterface(); + ~ITestServiceInterface() override = default; //! Ping via DBus, tests object marshalling/unmarshalling static int pingTests(ITestServiceInterface &testServiceInterface, bool verbose); diff --git a/src/misc/timestampbased.cpp b/src/misc/timestampbased.cpp index eaf5ed9d9..90696954c 100644 --- a/src/misc/timestampbased.cpp +++ b/src/misc/timestampbased.cpp @@ -12,8 +12,6 @@ namespace swift::misc { - ITimestampBased::ITimestampBased() {} - ITimestampBased::ITimestampBased(qint64 msSincePoch) : m_timestampMSecsSinceEpoch(msSincePoch) {} ITimestampBased::ITimestampBased(const QDateTime ×tamp) diff --git a/src/misc/timestampbased.h b/src/misc/timestampbased.h index 749ca6e57..97ef2b6fb 100644 --- a/src/misc/timestampbased.h +++ b/src/misc/timestampbased.h @@ -150,7 +150,7 @@ namespace swift::misc protected: //! Constructor - ITimestampBased(); + ITimestampBased() = default; //! Constructor ITimestampBased(qint64 msSincePoch); diff --git a/src/misc/variant.h b/src/misc/variant.h index 873edca60..d7a82f14d 100644 --- a/src/misc/variant.h +++ b/src/misc/variant.h @@ -70,7 +70,7 @@ namespace swift::misc public: //! Default constructor. - CVariant() {} + CVariant() = default; //! Copy constructor. CVariant(const CVariant &) = default; diff --git a/src/misc/variantlist.h b/src/misc/variantlist.h index 75db1cfec..c67f59c56 100644 --- a/src/misc/variantlist.h +++ b/src/misc/variantlist.h @@ -32,7 +32,7 @@ namespace swift::misc using CSequence::CSequence; //! Default constructor. - CVariantList() {} + CVariantList() = default; //! Construct from a base class object. CVariantList(const CSequence &other); diff --git a/src/misc/variantmap.h b/src/misc/variantmap.h index 2d6aae1a6..c42a72927 100644 --- a/src/misc/variantmap.h +++ b/src/misc/variantmap.h @@ -38,7 +38,7 @@ namespace swift::misc using CDictionary::CDictionary; //! Default constructor. - CVariantMap() {} + CVariantMap() = default; //! Copy constructor. CVariantMap(const CVariantMap &) = default; diff --git a/src/misc/variantprivate.h b/src/misc/variantprivate.h index 6fd09f55f..b6c9f87fe 100644 --- a/src/misc/variantprivate.h +++ b/src/misc/variantprivate.h @@ -71,7 +71,7 @@ namespace swift::misc const QString &operationName() const { return m_operationName; } - ~CVariantException() {} + ~CVariantException() override = default; private: QString m_operationName; @@ -224,42 +224,39 @@ namespace swift::misc struct CValueObjectMetaInfo : public IValueObjectMetaInfo { CValueObjectMetaInfo(); - virtual ~CValueObjectMetaInfo() override; + ~CValueObjectMetaInfo() override; static CValueObjectMetaInfo *instance(const T &); CValueObjectMetaInfo(const CValueObjectMetaInfo &) = delete; CValueObjectMetaInfo &operator=(const CValueObjectMetaInfo &) = delete; - virtual QString toQString(const void *object, bool i18n) const override; - virtual QJsonObject toJson(const void *object) const override; - virtual void convertFromJson(const QJsonObject &json, void *object) const override; - virtual QJsonObject toMemoizedJson(const void *object) const override; - virtual void convertFromMemoizedJson(const QJsonObject &json, void *object, - bool allowFallbackToJson) const override; - virtual void unmarshall(const QDBusArgument &arg, void *object) const override; - virtual size_t getValueHash(const void *object) const override; - virtual int getMetaTypeId() const override; - virtual const void *upCastTo(const void *object, int metaTypeId) const override; - virtual int compareImpl(const void *lhs, const void *rhs) const override; - virtual void setPropertyByIndex(void *object, const QVariant &variant, - CPropertyIndexRef index) const override; - virtual void propertyByIndex(const void *object, QVariant &o_variant, - swift::misc::CPropertyIndexRef index) const override; - virtual bool equalsPropertyByIndex(const void *object, const QVariant &compareValue, - CPropertyIndexRef index) const override; - virtual int toIcon(const void *object) const override; - virtual bool matches(const void *object, const CVariant &value) const override; + QString toQString(const void *object, bool i18n) const override; + QJsonObject toJson(const void *object) const override; + void convertFromJson(const QJsonObject &json, void *object) const override; + QJsonObject toMemoizedJson(const void *object) const override; + void convertFromMemoizedJson(const QJsonObject &json, void *object, + bool allowFallbackToJson) const override; + void unmarshall(const QDBusArgument &arg, void *object) const override; + size_t getValueHash(const void *object) const override; + int getMetaTypeId() const override; + const void *upCastTo(const void *object, int metaTypeId) const override; + int compareImpl(const void *lhs, const void *rhs) const override; + void setPropertyByIndex(void *object, const QVariant &variant, CPropertyIndexRef index) const override; + void propertyByIndex(const void *object, QVariant &o_variant, + swift::misc::CPropertyIndexRef index) const override; + bool equalsPropertyByIndex(const void *object, const QVariant &compareValue, + CPropertyIndexRef index) const override; + int toIcon(const void *object) const override; + bool matches(const void *object, const CVariant &value) const override; static const T &cast(const void *object); static T &cast(void *object); }; template - CValueObjectMetaInfo::CValueObjectMetaInfo() - {} + CValueObjectMetaInfo::CValueObjectMetaInfo() = default; template - CValueObjectMetaInfo::~CValueObjectMetaInfo() - {} + CValueObjectMetaInfo::~CValueObjectMetaInfo() = default; template CValueObjectMetaInfo *CValueObjectMetaInfo::instance(const T &) { diff --git a/src/misc/weather/metardecoder.cpp b/src/misc/weather/metardecoder.cpp index cc814f808..66b4495ec 100644 --- a/src/misc/weather/metardecoder.cpp +++ b/src/misc/weather/metardecoder.cpp @@ -922,7 +922,7 @@ namespace swift::misc::weather CMetarDecoder::CMetarDecoder() { allocateDecoders(); } - CMetarDecoder::~CMetarDecoder() {} + CMetarDecoder::~CMetarDecoder() = default; // Needs to stay in .cpp because of IMetarDecoderPart CMetar CMetarDecoder::decode(const QString &metarString) const { diff --git a/src/plugins/simulator/emulated/simulatoremulated.h b/src/plugins/simulator/emulated/simulatoremulated.h index 1942d8982..3dfe870a6 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.h +++ b/src/plugins/simulator/emulated/simulatoremulated.h @@ -43,39 +43,37 @@ namespace swift::simplugin::emulated swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr); //! Destructor - virtual ~CSimulatorEmulated() override; + ~CSimulatorEmulated() override; // functions implemented - virtual bool connectTo() override; - virtual bool disconnectFrom() override; - virtual void unload() override; - virtual bool isConnected() const override; - virtual bool isPaused() const override; - virtual bool isSimulating() const override; - virtual bool changeRemoteAircraftModel(const swift::misc::simulation::CSimulatedAircraft &aircraft) override; - virtual bool changeRemoteAircraftEnabled(const swift::misc::simulation::CSimulatedAircraft &aircraft) override; - virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, - const swift::misc::CIdentifier &originator) override; - virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; - virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; - virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; - virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; - virtual swift::misc::CStatusMessageList + bool connectTo() override; + bool disconnectFrom() override; + void unload() override; + bool isConnected() const override; + bool isPaused() const override; + bool isSimulating() const override; + bool changeRemoteAircraftModel(const swift::misc::simulation::CSimulatedAircraft &aircraft) override; + bool changeRemoteAircraftEnabled(const swift::misc::simulation::CSimulatedAircraft &aircraft) override; + bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, + const swift::misc::CIdentifier &originator) override; + bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; + void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; + void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; + bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; + swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; - virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftSituation &situation, - const swift::misc::aviation::CAircraftParts &parts) override; - virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, - const swift::misc::aviation::CCallsign &callsign) override; + bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override; + bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, + const swift::misc::aviation::CCallsign &callsign) override; // ----- functions just logged ------- - virtual bool - logicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override; - virtual bool logicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; - virtual int - physicallyRemoveMultipleRemoteAircraft(const swift::misc::aviation::CCallsignSet &callsigns) override; + bool logicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override; + bool logicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; + int physicallyRemoveMultipleRemoteAircraft(const swift::misc::aviation::CCallsignSet &callsigns) override; // functions logged and used //! \ingroup swiftdotcommands @@ -84,7 +82,7 @@ namespace swift::simplugin::emulated //! .drv hide hide emulated driver window swift::simplugin::emulated::CSimulatorEmulated //! //! \copydoc swift::core::ISimulator::parseCommandLine - virtual bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; + bool parseCommandLine(const QString &commandLine, const swift::misc::CIdentifier &originator) override; //! UI setter void setCombinedStatus(bool connected, bool simulating, bool paused); @@ -131,13 +129,12 @@ namespace swift::simplugin::emulated void internalAircraftChanged(); protected: - virtual bool - physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override; - virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; - virtual int physicallyRemoveAllRemoteAircraft() override; + bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &remoteAircraft) override; + bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; + int physicallyRemoveAllRemoteAircraft() override; //! \copydoc swift::core::ISimulator::parseDetails - virtual bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override; + bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override; private: //! Set object name @@ -195,13 +192,13 @@ namespace swift::simplugin::emulated protected: //! \copydoc swift::core::ISimulatorListener::startImpl - virtual void startImpl() override; + void startImpl() override; //! \copydoc swift::core::ISimulatorListener::stopImpl - virtual void stopImpl() override; + void stopImpl() override; //! \copydoc swift::core::ISimulatorListener::stopImpl - virtual void checkImpl() override; + void checkImpl() override; }; } // namespace swift::simplugin::emulated diff --git a/src/plugins/simulator/emulated/simulatoremulatedfactory.h b/src/plugins/simulator/emulated/simulatoremulatedfactory.h index c3a73b418..936c9bac7 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedfactory.h +++ b/src/plugins/simulator/emulated/simulatoremulatedfactory.h @@ -23,14 +23,13 @@ namespace swift::simplugin::emulated public: //! \copydoc swift::core::ISimulatorFactory::create - virtual swift::core::ISimulator * - create(const swift::misc::simulation::CSimulatorPluginInfo &info, - swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, - swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, - swift::misc::network::IClientProvider *clientProvider) override; + swift::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 swift::core::ISimulatorFactory::createListener - virtual swift::core::ISimulatorListener * + swift::core::ISimulatorListener * createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override; }; } // namespace swift::simplugin::emulated diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp index 7d1217934..86d2f4052 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.cpp @@ -96,7 +96,7 @@ namespace swift::simplugin::emulated this->updateWindowTitleAndUiValues(simulator->getSimulatorInfo()); } - CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog() {} + CSimulatorEmulatedMonitorDialog::~CSimulatorEmulatedMonitorDialog() = default; void CSimulatorEmulatedMonitorDialog::appendStatusMessageToList(const swift::misc::CStatusMessage &statusMessage) { diff --git a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h index 21b6a06c1..9bbd19964 100644 --- a/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h +++ b/src/plugins/simulator/emulated/simulatoremulatedmonitordialog.h @@ -39,7 +39,7 @@ namespace swift::simplugin::emulated explicit CSimulatorEmulatedMonitorDialog(CSimulatorEmulated *simulator, QWidget *parent = nullptr); //! Dtor - virtual ~CSimulatorEmulatedMonitorDialog() override; + ~CSimulatorEmulatedMonitorDialog() override; //! Append status message void appendStatusMessageToList(const swift::misc::CStatusMessage &statusMessage); diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h index b15348208..1c37ba1b3 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h @@ -24,7 +24,7 @@ namespace swift::simplugin::emulated CSimulatorEmulatedConfig(QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorEmulatedConfig() override {} + ~CSimulatorEmulatedConfig() override = default; //! \copydoc swift::gui::IPluginConfig::createConfigWindow() swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override; diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp index a934947f4..576be7d4f 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.cpp @@ -17,5 +17,5 @@ namespace swift::simplugin::emulated connect(ui->bb_Close, &QDialogButtonBox::rejected, this, &CSimulatorEmulatedConfigWidget::close); } - CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget() {} + CSimulatorEmulatedConfigWidget::~CSimulatorEmulatedConfigWidget() = default; } // namespace swift::simplugin::emulated diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h index 909d4241e..43f825d08 100644 --- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h +++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfigwidget.h @@ -28,7 +28,7 @@ namespace swift::simplugin::emulated explicit CSimulatorEmulatedConfigWidget(QWidget *parent = nullptr); //! Dtor - virtual ~CSimulatorEmulatedConfigWidget(); + ~CSimulatorEmulatedConfigWidget() override; private: QScopedPointer ui; diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp index 866a3ee17..02ec254d9 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp @@ -13,8 +13,6 @@ using namespace swift::misc::simulation; namespace swift::simplugin::flightgear { - CFlightgearMPAircraft::CFlightgearMPAircraft() {} - CFlightgearMPAircraft::CFlightgearMPAircraft(const CSimulatedAircraft &aircraft, ISimulator *simulator, CInterpolationLogger *logger) : m_aircraft(aircraft), diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h index 0a116cf3d..1f71a1a38 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.h @@ -31,7 +31,7 @@ namespace swift::simplugin::flightgear swift::misc::simulation::CInterpolationLogger *logger); //! Destructor - ~CFlightgearMPAircraft() {} + ~CFlightgearMPAircraft() = default; //! Set simulated aircraft void setSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &simulatedAircraft); diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.h b/src/plugins/simulator/flightgear/simulatorflightgear.h index 6f8201e48..7fbe5cdcc 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.h +++ b/src/plugins/simulator/flightgear/simulatorflightgear.h @@ -119,42 +119,41 @@ namespace swift::simplugin::flightgear swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorFlightgear() override; + ~CSimulatorFlightgear() override; //! \name ISimulator implementations //! @{ - virtual bool connectTo() override; - virtual bool disconnectFrom() override; - virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, - const swift::misc::CIdentifier &originator) override; - virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; - virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; - virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; - virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; - virtual void unload() override; - virtual QString getStatisticsSimulatorSpecific() const override; - virtual void resetAircraftStatistics() override; - virtual swift::misc::CStatusMessageList + bool connectTo() override; + bool disconnectFrom() override; + bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, + const swift::misc::CIdentifier &originator) override; + bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; + void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; + void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; + bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; + swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; + void unload() override; + QString getStatisticsSimulatorSpecific() const override; + void resetAircraftStatistics() override; + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; - virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftSituation &situation, - const swift::misc::aviation::CAircraftParts &parts) override; - virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, - const swift::misc::aviation::CCallsign &callsign) override; + bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override; + bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, + const swift::misc::aviation::CCallsign &callsign) override; //! @} protected: //! \name ISimulator implementations //! @{ - virtual bool isConnected() const override; - virtual bool - physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override; - virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; - virtual int physicallyRemoveAllRemoteAircraft() override; - virtual void clearAllRemoteAircraftData() override; - virtual bool isPaused() const override { return false; } + bool isConnected() const override; + bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override; + bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; + int physicallyRemoveAllRemoteAircraft() override; + void clearAllRemoteAircraftData() override; + bool isPaused() const override { return false; } //! @} private slots: @@ -259,13 +258,13 @@ namespace swift::simplugin::flightgear protected: //! \copydoc swift::core::ISimulatorListener::startImpl - virtual void startImpl() override; + void startImpl() override; //! \copydoc swift::core::ISimulatorListener::stopImpl - virtual void stopImpl() override; + void stopImpl() override; //! \copydoc swift::core::ISimulatorListener::checkImpl - virtual void checkImpl() override; + void checkImpl() override; private: void checkConnection(); @@ -292,14 +291,13 @@ namespace swift::simplugin::flightgear public: //! \copydoc swift::core::ISimulatorFactory::create - virtual swift::core::ISimulator * - create(const swift::misc::simulation::CSimulatorPluginInfo &info, - swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, - swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, - swift::misc::network::IClientProvider *clientProvider) override; + swift::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 swift::core::ISimulatorFactory::createListener - virtual swift::core::ISimulatorListener * + swift::core::ISimulatorListener * createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorFlightgearListener(info); diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h index dc0d26d6a..e0fa7c898 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfig.h @@ -34,7 +34,7 @@ namespace swift::simplugin::flightgear CSimulatorFlightgearConfig(QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorFlightgearConfig() {} + ~CSimulatorFlightgearConfig() override = default; //! \copydoc swift::gui::IPluginConfig::createConfigWindow() swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override; diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp index 6c297c8a3..fa1f424c9 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.cpp @@ -32,7 +32,7 @@ namespace swift::simplugin::flightgear connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorFlightgearConfigWindow::close); } - CSimulatorFlightgearConfigWindow::~CSimulatorFlightgearConfigWindow() {} + CSimulatorFlightgearConfigWindow::~CSimulatorFlightgearConfigWindow() = default; CFGSwiftBusSettings CSimulatorFlightgearConfigWindow::getSettingsFromUI() const { diff --git a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h index 762904da1..9f9233f4e 100644 --- a/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h +++ b/src/plugins/simulator/flightgearconfig/simulatorflightgearconfigwindow.h @@ -32,7 +32,7 @@ namespace swift::simplugin::flightgear CSimulatorFlightgearConfigWindow(QWidget *parent); //! Dtor. - virtual ~CSimulatorFlightgearConfigWindow(); + ~CSimulatorFlightgearConfigWindow() override; private: //! Settings have been accepted diff --git a/src/plugins/simulator/plugincommon/simulatorplugincommon.h b/src/plugins/simulator/plugincommon/simulatorplugincommon.h index 613a8e7e5..a5d2a0811 100644 --- a/src/plugins/simulator/plugincommon/simulatorplugincommon.h +++ b/src/plugins/simulator/plugincommon/simulatorplugincommon.h @@ -28,11 +28,11 @@ namespace swift::simplugin::common public: //! Destructor - virtual ~CSimulatorPluginCommon() override; + ~CSimulatorPluginCommon() override; // --------- ISimulator implementations ------------ - virtual void unload() override; - virtual bool disconnectFrom() override; + void unload() override; + bool disconnectFrom() override; protected: //! Constructor @@ -45,7 +45,7 @@ namespace swift::simplugin::common //! 
         //! .drv intdisplay interpolation log display
         //!
- virtual bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override; + bool parseDetails(const swift::misc::CSimpleCommandParser &parser) override; //! Register help static void registerHelp(); diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 4725dc5f9..4403c33c1 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -123,49 +123,48 @@ namespace swift::simplugin::xplane swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorXPlane() override; + ~CSimulatorXPlane() override; //! \name ISimulator implementations //! @{ - virtual bool connectTo() override; - virtual bool disconnectFrom() override; - virtual bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, - const swift::misc::CIdentifier &originator) override; - virtual bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, - const swift::misc::CIdentifier &originator) override; - virtual void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; - virtual void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; - virtual bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; - virtual swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; - virtual bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; - virtual void unload() override; - virtual QString getStatisticsSimulatorSpecific() const override; - virtual void resetAircraftStatistics() override; - virtual swift::misc::CStatusMessageList + bool connectTo() override; + bool disconnectFrom() override; + bool updateOwnSimulatorCockpit(const swift::misc::simulation::CSimulatedAircraft &aircraft, + const swift::misc::CIdentifier &originator) override; + bool updateOwnSimulatorSelcal(const swift::misc::aviation::CSelcal &selcal, + const swift::misc::CIdentifier &originator) override; + void displayStatusMessage(const swift::misc::CStatusMessage &message) const override; + void displayTextMessage(const swift::misc::network::CTextMessage &message) const override; + bool isPhysicallyRenderedAircraft(const swift::misc::aviation::CCallsign &callsign) const override; + swift::misc::aviation::CCallsignSet physicallyRenderedAircraft() const override; + bool followAircraft(const swift::misc::aviation::CCallsign &callsign) override; + void unload() override; + QString getStatisticsSimulatorSpecific() const override; + void resetAircraftStatistics() override; + swift::misc::CStatusMessageList getInterpolationMessages(const swift::misc::aviation::CCallsign &callsign) const override; - virtual bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, - const swift::misc::aviation::CAircraftSituation &situation, - const swift::misc::aviation::CAircraftParts &parts) override; - virtual void callbackReceivedRequestedElevation(const swift::misc::geo::CElevationPlane &plane, - const swift::misc::aviation::CCallsign &callsign, - bool isWater) override; - virtual void setFlightNetworkConnected(bool connected) override; + bool testSendSituationAndParts(const swift::misc::aviation::CCallsign &callsign, + const swift::misc::aviation::CAircraftSituation &situation, + const swift::misc::aviation::CAircraftParts &parts) override; + void callbackReceivedRequestedElevation(const swift::misc::geo::CElevationPlane &plane, + const swift::misc::aviation::CCallsign &callsign, + bool isWater) override; + void setFlightNetworkConnected(bool connected) override; //! @} //! \copydoc swift::misc::simulation::ISimulationEnvironmentProvider::requestElevation - virtual bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, - const swift::misc::aviation::CCallsign &callsign) override; + bool requestElevation(const swift::misc::geo::ICoordinateGeodetic &reference, + const swift::misc::aviation::CCallsign &callsign) override; protected: //! \name ISimulator implementations //! @{ - virtual bool isConnected() const override; - virtual bool - physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override; - virtual bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; - virtual int physicallyRemoveAllRemoteAircraft() override; - virtual void clearAllRemoteAircraftData() override; - virtual bool isPaused() const override + bool isConnected() const override; + bool physicallyAddRemoteAircraft(const swift::misc::simulation::CSimulatedAircraft &newRemoteAircraft) override; + bool physicallyRemoveRemoteAircraft(const swift::misc::aviation::CCallsign &callsign) override; + int physicallyRemoveAllRemoteAircraft() override; + void clearAllRemoteAircraftData() override; + bool isPaused() const override { //! \todo XP: provide correct pause state return false; @@ -307,13 +306,13 @@ namespace swift::simplugin::xplane protected: //! \copydoc swift::core::ISimulatorListener::startImpl - virtual void startImpl() override; + void startImpl() override; //! \copydoc swift::core::ISimulatorListener::stopImpl - virtual void stopImpl() override; + void stopImpl() override; //! \copydoc swift::core::ISimulatorListener::checkImpl - virtual void checkImpl() override; + void checkImpl() override; private: void checkConnection(); @@ -341,14 +340,13 @@ namespace swift::simplugin::xplane public: //! \copydoc swift::core::ISimulatorFactory::create - virtual swift::core::ISimulator * - create(const swift::misc::simulation::CSimulatorPluginInfo &info, - swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider, - swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider, - swift::misc::network::IClientProvider *clientProvider) override; + swift::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 swift::core::ISimulatorFactory::createListener - virtual swift::core::ISimulatorListener * + swift::core::ISimulatorListener * createListener(const swift::misc::simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index f42bccde3..dd3381a52 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -13,8 +13,6 @@ using namespace swift::misc::simulation; namespace swift::simplugin::xplane { - CXPlaneMPAircraft::CXPlaneMPAircraft() {} - CXPlaneMPAircraft::CXPlaneMPAircraft(const CSimulatedAircraft &aircraft, ISimulator *simulator, CInterpolationLogger *logger) : m_aircraft(aircraft), diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 7c676998b..339e05f83 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -23,14 +23,14 @@ namespace swift::simplugin::xplane { public: //! Constructor - CXPlaneMPAircraft(); + CXPlaneMPAircraft() = default; //! Constructor providing initial situation/parts CXPlaneMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft, swift::core::ISimulator *simulator, swift::misc::simulation::CInterpolationLogger *logger); //! Destructor - ~CXPlaneMPAircraft() {} + ~CXPlaneMPAircraft() = default; //! Set simulated aircraft void setSimulatedAircraft(const swift::misc::simulation::CSimulatedAircraft &simulatedAircraft); diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h index b46a3c3bd..1456ed7aa 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h @@ -34,7 +34,7 @@ namespace swift::simplugin::xplane CSimulatorXPlaneConfig(QObject *parent = nullptr); //! Dtor - virtual ~CSimulatorXPlaneConfig() override {} + ~CSimulatorXPlaneConfig() override = default; //! \copydoc swift::gui::IPluginConfig::createConfigWindow() swift::gui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override; diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp index d2e969abc..91b3dc01d 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp @@ -42,7 +42,7 @@ namespace swift::simplugin::xplane connect(ui->bb_OkCancel, &QDialogButtonBox::rejected, this, &CSimulatorXPlaneConfigWindow::close); } - CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow() {} + CSimulatorXPlaneConfigWindow::~CSimulatorXPlaneConfigWindow() = default; void CSimulatorXPlaneConfigWindow::onSettingsAccepted() { diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h index 051462274..0dedde9b8 100644 --- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h +++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h @@ -32,7 +32,7 @@ namespace swift::simplugin::xplane CSimulatorXPlaneConfigWindow(QWidget *parent); //! Dtor. - virtual ~CSimulatorXPlaneConfigWindow() override; + ~CSimulatorXPlaneConfigWindow() override; private: //! Settings from UI diff --git a/src/sound/notificationplayer.h b/src/sound/notificationplayer.h index bac7adaad..3ff597be2 100644 --- a/src/sound/notificationplayer.h +++ b/src/sound/notificationplayer.h @@ -26,7 +26,7 @@ namespace swift::sound CNotificationPlayer(QObject *parent = nullptr); //! Destructor - virtual ~CNotificationPlayer() override {} + ~CNotificationPlayer() override = default; //! Play notification sound void play(swift::misc::audio::CNotificationSounds::NotificationFlag notification, int volume = 100); diff --git a/src/sound/sampleprovider/bufferedwaveprovider.h b/src/sound/sampleprovider/bufferedwaveprovider.h index fec0174f6..2049c3647 100644 --- a/src/sound/sampleprovider/bufferedwaveprovider.h +++ b/src/sound/sampleprovider/bufferedwaveprovider.h @@ -28,7 +28,7 @@ namespace swift::sound::sample_provider void addSamples(const QVector &samples); //! ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Bytes from buffer int getBufferedBytes() const { return m_audioBuffer.size(); } diff --git a/src/sound/sampleprovider/equalizersampleprovider.h b/src/sound/sampleprovider/equalizersampleprovider.h index 721494d7f..007416de9 100644 --- a/src/sound/sampleprovider/equalizersampleprovider.h +++ b/src/sound/sampleprovider/equalizersampleprovider.h @@ -31,7 +31,7 @@ namespace swift::sound::sample_provider CEqualizerSampleProvider(ISampleProvider *sourceProvider, EqualizerPresets preset, QObject *parent = nullptr); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Bypassing? void setBypassEffects(bool value) { m_bypass = value; } diff --git a/src/sound/sampleprovider/mixingsampleprovider.h b/src/sound/sampleprovider/mixingsampleprovider.h index 6eea28721..54b1bfb51 100644 --- a/src/sound/sampleprovider/mixingsampleprovider.h +++ b/src/sound/sampleprovider/mixingsampleprovider.h @@ -25,7 +25,7 @@ namespace swift::sound::sample_provider void addMixerInput(ISampleProvider *provider); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; private: QVector m_sources; diff --git a/src/sound/sampleprovider/pinknoisegenerator.h b/src/sound/sampleprovider/pinknoisegenerator.h index 380940315..84cc5b105 100644 --- a/src/sound/sampleprovider/pinknoisegenerator.h +++ b/src/sound/sampleprovider/pinknoisegenerator.h @@ -26,7 +26,7 @@ namespace swift::sound::sample_provider CPinkNoiseGenerator(QObject *parent = nullptr) : ISampleProvider(parent) {} //! Read samples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Gain void setGain(double gain) { m_gain = gain; } diff --git a/src/sound/sampleprovider/resourcesoundsampleprovider.h b/src/sound/sampleprovider/resourcesoundsampleprovider.h index c61958c57..138ad423c 100644 --- a/src/sound/sampleprovider/resourcesoundsampleprovider.h +++ b/src/sound/sampleprovider/resourcesoundsampleprovider.h @@ -20,10 +20,10 @@ namespace swift::sound::sample_provider CResourceSoundSampleProvider(const CResourceSound &resourceSound, QObject *parent = nullptr); //! copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! copydoc ISampleProvider::isFinished - virtual bool isFinished() const override { return m_isFinished; } + bool isFinished() const override { return m_isFinished; } //! @{ //! Looping diff --git a/src/sound/sampleprovider/sampleprovider.h b/src/sound/sampleprovider/sampleprovider.h index 3cdad1015..e5f75cf25 100644 --- a/src/sound/sampleprovider/sampleprovider.h +++ b/src/sound/sampleprovider/sampleprovider.h @@ -24,7 +24,7 @@ namespace swift::sound::sample_provider ISampleProvider(QObject *parent = nullptr) : QObject(parent) {} //! Dtor - virtual ~ISampleProvider() override {} + ~ISampleProvider() override = default; //! Read samples virtual int readSamples(QVector &samples, qint64 count) = 0; diff --git a/src/sound/sampleprovider/sawtoothgenerator.h b/src/sound/sampleprovider/sawtoothgenerator.h index b29e9a047..de90607b5 100644 --- a/src/sound/sampleprovider/sawtoothgenerator.h +++ b/src/sound/sampleprovider/sawtoothgenerator.h @@ -26,7 +26,7 @@ namespace swift::sound::sample_provider CSawToothGenerator(double frequency, QObject *parent = nullptr); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Set the gain void setGain(double gain) { m_gain = gain; } diff --git a/src/sound/sampleprovider/simplecompressoreffect.h b/src/sound/sampleprovider/simplecompressoreffect.h index f84dd55ca..59b7d0d3e 100644 --- a/src/sound/sampleprovider/simplecompressoreffect.h +++ b/src/sound/sampleprovider/simplecompressoreffect.h @@ -26,7 +26,7 @@ namespace swift::sound::sample_provider CSimpleCompressorEffect(ISampleProvider *source, QObject *parent = nullptr); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Enable void setEnabled(bool enabled); diff --git a/src/sound/sampleprovider/sinusgenerator.h b/src/sound/sampleprovider/sinusgenerator.h index e76002606..0be09561d 100644 --- a/src/sound/sampleprovider/sinusgenerator.h +++ b/src/sound/sampleprovider/sinusgenerator.h @@ -23,7 +23,7 @@ namespace swift::sound::sample_provider CSinusGenerator(double frequencyHz, QObject *parent = nullptr); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! Set the gain void setGain(double gain) { m_gain = gain; } diff --git a/src/sound/sampleprovider/volumesampleprovider.h b/src/sound/sampleprovider/volumesampleprovider.h index 6ca19f228..80288f117 100644 --- a/src/sound/sampleprovider/volumesampleprovider.h +++ b/src/sound/sampleprovider/volumesampleprovider.h @@ -21,7 +21,7 @@ namespace swift::sound::sample_provider CVolumeSampleProvider(ISampleProvider *sourceProvider, QObject *parent = nullptr); //! \copydoc ISampleProvider::readSamples - virtual int readSamples(QVector &samples, qint64 count) override; + int readSamples(QVector &samples, qint64 count) override; //! @{ //! Gain ratio, value a amplitude need to be multiplied with diff --git a/src/sound/selcalplayer.h b/src/sound/selcalplayer.h index 965a36400..a6b30fe13 100644 --- a/src/sound/selcalplayer.h +++ b/src/sound/selcalplayer.h @@ -27,7 +27,7 @@ namespace swift::sound CSelcalPlayer(const swift::misc::audio::CAudioDeviceInfo &device, QObject *parent = nullptr); //! Destructor - virtual ~CSelcalPlayer() override; + ~CSelcalPlayer() override; //! Stop the player thread void gracefulShutdown(); diff --git a/src/sound/threadedtonepairplayer.h b/src/sound/threadedtonepairplayer.h index b941167f2..8ec4a8765 100644 --- a/src/sound/threadedtonepairplayer.h +++ b/src/sound/threadedtonepairplayer.h @@ -34,7 +34,7 @@ namespace swift::sound const swift::misc::audio::CAudioDeviceInfo &device); //! Destructor - virtual ~CThreadedTonePairPlayer() override = default; + ~CThreadedTonePairPlayer() override = default; //! Play the list of tones. //! If the player is currently active, this call will be ignored. @@ -48,10 +48,10 @@ namespace swift::sound protected: //! \copydoc swift::misc::CContinuousWorker::initialize - virtual void initialize() override; + void initialize() override; //! \copydoc swift::misc::CContinuousWorker::beforeQuit - virtual void beforeQuit() noexcept override; + void beforeQuit() noexcept override; private: void handleStateChanged(QAudio::State newState); diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp index a9f9e1fb9..bd80fec1a 100644 --- a/src/swiftcore/swiftcore.cpp +++ b/src/swiftcore/swiftcore.cpp @@ -72,7 +72,7 @@ CSwiftCore::CSwiftCore(QWidget *parent) &CCoreFacade::parseCommandLine); } -CSwiftCore::~CSwiftCore() {} +CSwiftCore::~CSwiftCore() = default; void CSwiftCore::initStyleSheet() { diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h index 02089f2d8..37960aa20 100644 --- a/src/swiftcore/swiftcore.h +++ b/src/swiftcore/swiftcore.h @@ -45,7 +45,7 @@ public: CSwiftCore(QWidget *parent = nullptr); //! Destructor - virtual ~CSwiftCore() override; + ~CSwiftCore() override; private: //! @{ diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index f5d55cab6..e399f4042 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -59,7 +59,7 @@ void CSwiftData::initStyleSheet() this->setStyleSheet(s); } -CSwiftData::~CSwiftData() {} +CSwiftData::~CSwiftData() = default; void CSwiftData::closeEvent(QCloseEvent *event) { diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 4989e913d..2b278cb5c 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -44,14 +44,14 @@ public: CSwiftData(QWidget *parent = nullptr); //! Destructor - virtual ~CSwiftData() override; + ~CSwiftData() override; protected: //! \name QMainWindow events //! @{ //! \copydoc QMainWindow::closeEvent - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; //! @} private: diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp index 78a0781b3..ff4442190 100644 --- a/src/swiftguistandard/swiftguistd.cpp +++ b/src/swiftguistandard/swiftguistd.cpp @@ -86,7 +86,7 @@ SwiftGuiStd::SwiftGuiStd(swift::gui::CEnableForFramelessWindow::WindowMode windo this->init(); } -SwiftGuiStd::~SwiftGuiStd() {} +SwiftGuiStd::~SwiftGuiStd() = default; void SwiftGuiStd::mouseMoveEvent(QMouseEvent *event) { diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h index 659a3d0e3..6220cf9af 100644 --- a/src/swiftguistandard/swiftguistd.h +++ b/src/swiftguistandard/swiftguistd.h @@ -79,7 +79,7 @@ public: SwiftGuiStd(WindowMode windowMode, QWidget *parent = nullptr); //! Destructor - virtual ~SwiftGuiStd() override; + ~SwiftGuiStd() override; signals: //! Main info area has changed @@ -91,19 +91,19 @@ protected: //! @{ //! \copydoc QMainWindow::mouseMoveEvent - virtual void mouseMoveEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; //! \copydoc QMainWindow::mousePressEvent - virtual void mousePressEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; //! \copydoc QMainWindow::mouseReleaseEvent - virtual void mouseReleaseEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; //! \copydoc QMainWindow::closeEvent - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; //! \copydoc QMainWindow::changeEvent - virtual void changeEvent(QEvent *event) override; + void changeEvent(QEvent *event) override; //! @} //! Get a minimize action which minimizes the window diff --git a/src/swiftguistandard/swiftguistdapplication.h b/src/swiftguistandard/swiftguistdapplication.h index 047e10623..9a5f6ae36 100644 --- a/src/swiftguistandard/swiftguistdapplication.h +++ b/src/swiftguistandard/swiftguistdapplication.h @@ -31,10 +31,10 @@ public: protected: //! Parsing of special CMD args - virtual bool parsingHookIn() override; + bool parsingHookIn() override; //! Start facade by cmd arguments - virtual swift::misc::CStatusMessageList startHookIn() override; + swift::misc::CStatusMessageList startHookIn() override; private: static swift::core::CCoreFacadeConfig coreModeToCoreFacadeConfig(swift::core::CoreModes::CoreMode, diff --git a/src/swiftlauncher/swiftlauncher.h b/src/swiftlauncher/swiftlauncher.h index 4ad08b49b..025dc7e3b 100644 --- a/src/swiftlauncher/swiftlauncher.h +++ b/src/swiftlauncher/swiftlauncher.h @@ -87,9 +87,9 @@ public: protected: //! Mouse events for frameless window //! @{ - virtual void mousePressEvent(QMouseEvent *event) override; - virtual void mouseMoveEvent(QMouseEvent *event) override; - virtual void mouseReleaseEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; //! @} private slots: diff --git a/src/xswiftbus/service.cpp b/src/xswiftbus/service.cpp index ec810ab8a..f3f0ea152 100644 --- a/src/xswiftbus/service.cpp +++ b/src/xswiftbus/service.cpp @@ -95,6 +95,7 @@ namespace XSwiftBus m_framePeriodSampler->show(); } + // Explicitly in cpp file to allow use of forward declaration CService::~CService() = default; void CService::onAircraftModelChanged() diff --git a/tests/core/fsd/testfsdclient/testfsdclient.cpp b/tests/core/fsd/testfsdclient/testfsdclient.cpp index 35cf4d4cc..182cbcf1d 100644 --- a/tests/core/fsd/testfsdclient/testfsdclient.cpp +++ b/tests/core/fsd/testfsdclient/testfsdclient.cpp @@ -46,7 +46,7 @@ namespace SwiftFsdTest explicit CTestFSDClient(QObject *parent = nullptr) : QObject(parent) {} //! Destructor - virtual ~CTestFSDClient() {} + ~CTestFSDClient() override = default; private slots: void initTestCase(); diff --git a/tests/core/fsd/testfsdmessages/testfsdmessages.cpp b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp index 28db8be8d..ae043cfce 100644 --- a/tests/core/fsd/testfsdmessages/testfsdmessages.cpp +++ b/tests/core/fsd/testfsdmessages/testfsdmessages.cpp @@ -61,7 +61,7 @@ namespace MiscTest explicit CTestFsdMessages(QObject *parent = nullptr) : QObject(parent) {} //! Destructor - virtual ~CTestFsdMessages() {} + ~CTestFsdMessages() override = default; private slots: void testAddAtc(); diff --git a/tests/misc/testcompress/testcompress.cpp b/tests/misc/testcompress/testcompress.cpp index dd975dd71..c67f3d55a 100644 --- a/tests/misc/testcompress/testcompress.cpp +++ b/tests/misc/testcompress/testcompress.cpp @@ -36,7 +36,7 @@ namespace MiscTest explicit CTestCompress(QObject *parent = nullptr) : QObject(parent) {} //! Destructor - virtual ~CTestCompress() {} + ~CTestCompress() override = default; private slots: //! Uncompress file diff --git a/tests/misc/testsharedstate/testsharedstate.h b/tests/misc/testsharedstate/testsharedstate.h index 6a40b20a0..c9c89825e 100644 --- a/tests/misc/testsharedstate/testsharedstate.h +++ b/tests/misc/testsharedstate/testsharedstate.h @@ -71,7 +71,7 @@ namespace MiscTest public: //! Ctor CTestScalarObserver(QObject *parent) : CScalarObserver(parent) {} - virtual void onValueChanged(const int &) override {} + void onValueChanged(const int &) override {} }; //! List mutator subclass @@ -107,10 +107,10 @@ namespace MiscTest //! @{ //! \copydoc swift::misc::shared_state::CListObserver::onElementAdded - virtual void onElementAdded(const int &) override {} + void onElementAdded(const int &) override {} //! \copydoc swift::misc::shared_state::CListObserver::onElementsReplaced - virtual void onElementsReplaced(const QList &) override {} + void onElementsReplaced(const QList &) override {} //! @} }; } // namespace MiscTest diff --git a/tests/misc/testvalueobject.h b/tests/misc/testvalueobject.h index ac84aed42..0f089e917 100644 --- a/tests/misc/testvalueobject.h +++ b/tests/misc/testvalueobject.h @@ -41,7 +41,7 @@ namespace swift::misc }; //! Default constructor. - CTestValueObject() {} + CTestValueObject() = default; //! Constructor. CTestValueObject(const QString &name, const QString &description) : m_name(name), m_description(description) {}