From 6b40cde8622eff101879b4723a0e2d8acefa5e57 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 5 May 2015 17:08:30 +0100 Subject: [PATCH] refs #413 Make all value class methods non-virtual. toCVariant() and convertFromCVariant() are now deprecated, use CVariant::from() and CVariant::to() instead. --- src/blackmisc/audio/audiodeviceinfo.h | 2 +- src/blackmisc/audio/audiodeviceinfolist.h | 4 +- src/blackmisc/audio/voiceroom.h | 6 +-- src/blackmisc/audio/voiceroomlist.h | 4 +- src/blackmisc/aviation/aircraft.h | 8 +-- src/blackmisc/aviation/aircraftengine.h | 2 +- src/blackmisc/aviation/aircraftenginelist.h | 4 +- src/blackmisc/aviation/aircrafticao.h | 6 +-- src/blackmisc/aviation/aircraftlights.h | 6 +-- src/blackmisc/aviation/aircraftlist.h | 4 +- src/blackmisc/aviation/aircraftparts.h | 6 +-- src/blackmisc/aviation/aircraftpartslist.h | 4 +- src/blackmisc/aviation/aircraftsituation.h | 6 +-- .../aviation/aircraftsituationlist.h | 4 +- src/blackmisc/aviation/airport.h | 6 +-- src/blackmisc/aviation/airporticao.h | 2 +- src/blackmisc/aviation/airportlist.h | 4 +- src/blackmisc/aviation/altitude.h | 8 +-- src/blackmisc/aviation/atcstation.h | 8 +-- src/blackmisc/aviation/atcstationlist.h | 4 +- src/blackmisc/aviation/avionicsbase.h | 5 +- src/blackmisc/aviation/callsign.h | 8 +-- src/blackmisc/aviation/callsignset.h | 4 +- src/blackmisc/aviation/flightplan.h | 4 +- src/blackmisc/aviation/heading.h | 2 +- src/blackmisc/aviation/informationmessage.h | 2 +- src/blackmisc/aviation/modulator.h | 6 +-- src/blackmisc/aviation/selcal.h | 2 +- src/blackmisc/aviation/track.h | 2 +- src/blackmisc/aviation/transponder.h | 6 +-- src/blackmisc/containerbase.h | 6 +-- src/blackmisc/dictionary.h | 6 +-- src/blackmisc/eveventhotkeyfunction.h | 2 +- src/blackmisc/evoriginator.h | 2 +- src/blackmisc/geo/coordinategeodetic.h | 8 +-- src/blackmisc/geo/earthangle.h | 4 +- src/blackmisc/geo/latitude.h | 2 +- src/blackmisc/geo/longitude.h | 2 +- src/blackmisc/hardware/joystickbutton.h | 6 +-- src/blackmisc/hardware/keyboardkey.h | 6 +-- src/blackmisc/hardware/keyboardkeylist.h | 2 +- src/blackmisc/hotkeyfunction.h | 2 +- src/blackmisc/icon.h | 2 +- src/blackmisc/iconlist.h | 2 +- src/blackmisc/logcategory.h | 2 +- src/blackmisc/logcategorylist.h | 2 +- src/blackmisc/logpattern.h | 2 +- src/blackmisc/namevariantpair.h | 8 +-- src/blackmisc/namevariantpairlist.h | 4 +- src/blackmisc/network/aircraftmapping.h | 6 +-- src/blackmisc/network/aircraftmappinglist.h | 4 +- src/blackmisc/network/client.h | 8 +-- src/blackmisc/network/clientlist.h | 2 +- src/blackmisc/network/server.h | 6 +-- src/blackmisc/network/serverlist.h | 4 +- src/blackmisc/network/textmessage.h | 10 ++-- src/blackmisc/network/textmessagelist.h | 4 +- src/blackmisc/network/user.h | 8 +-- src/blackmisc/network/userlist.h | 4 +- src/blackmisc/network/voicecapabilities.h | 4 +- src/blackmisc/pixmap.h | 4 +- src/blackmisc/pq/angle.h | 2 +- src/blackmisc/pq/measurementunit.h | 5 +- src/blackmisc/pq/physicalquantity.h | 10 ++-- src/blackmisc/pq/pqstring.h | 2 +- src/blackmisc/pq/time.h | 4 +- src/blackmisc/propertyindex.h | 4 +- src/blackmisc/propertyindexlist.h | 4 +- src/blackmisc/propertyindexvariantmap.h | 6 +-- src/blackmisc/setaudio.h | 4 +- src/blackmisc/setkeyboardhotkey.h | 6 +-- src/blackmisc/setkeyboardhotkeylist.h | 4 +- src/blackmisc/setnetwork.h | 4 +- src/blackmisc/simulation/aircraftmodel.h | 6 +-- src/blackmisc/simulation/aircraftmodellist.h | 4 +- .../simulation/fscommon/aircraftcfgentries.h | 6 +-- .../fscommon/aircraftcfgentrieslist.h | 4 +- src/blackmisc/simulation/setsimulator.h | 4 +- src/blackmisc/simulation/simulatedaircraft.h | 6 +-- .../simulation/simulatedaircraftlist.h | 4 +- src/blackmisc/simulation/simulatorinfolist.h | 2 +- .../simulation/simulatorplugininfo.h | 2 +- src/blackmisc/simulation/simulatorsetup.h | 6 +-- src/blackmisc/statusmessage.h | 8 +-- src/blackmisc/statusmessagelist.h | 4 +- src/blackmisc/timestampbased.h | 3 ++ src/blackmisc/valueobject.h | 54 +++++++++---------- src/blackmisc/variant.h | 14 ++--- src/blackmisc/variantlist.h | 4 +- tests/blackmisc/testvalueobject.h | 6 +-- 90 files changed, 234 insertions(+), 231 deletions(-) diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index c515d56ef..7bb2975c5 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -81,7 +81,7 @@ namespace BlackMisc } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAudioDeviceInfo) diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index 5d5e22f31..718b9d7b7 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -44,10 +44,10 @@ namespace BlackMisc int count(CAudioDeviceInfo::DeviceType type) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h index b28f4300c..08f02ae79 100644 --- a/src/blackmisc/audio/voiceroom.h +++ b/src/blackmisc/audio/voiceroom.h @@ -86,10 +86,10 @@ namespace BlackMisc bool isAtis() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Protocol prefix "vvl" static const QString &protocol() { static QString p("vvl"); return p; } @@ -101,7 +101,7 @@ namespace BlackMisc static const QString &protocolComplete() { static QString p("vvl://"); return p; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CVoiceRoom) diff --git a/src/blackmisc/audio/voiceroomlist.h b/src/blackmisc/audio/voiceroomlist.h index 03444b821..0074bc768 100644 --- a/src/blackmisc/audio/voiceroomlist.h +++ b/src/blackmisc/audio/voiceroomlist.h @@ -37,10 +37,10 @@ namespace BlackMisc CVoiceRoomList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! \brief Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/aircraft.h b/src/blackmisc/aviation/aircraft.h index c0c202634..eeb1b2a89 100644 --- a/src/blackmisc/aviation/aircraft.h +++ b/src/blackmisc/aviation/aircraft.h @@ -58,7 +58,7 @@ namespace BlackMisc CAircraft(const CCallsign &callsign, const BlackMisc::Network::CUser &user, const CAircraftSituation &situation); //! \copydoc CValueObject::toIcon() - virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); } + BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); } //! Get callsign. const CCallsign &getCallsign() const { return m_callsign; } @@ -267,13 +267,13 @@ namespace BlackMisc bool isVtol() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraft) diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index d1a802e97..ab2eb33e1 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -43,7 +43,7 @@ namespace BlackMisc void setOn(bool on) { m_on = on; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftEngine) diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index 8f665bfd8..3c1e91203 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -42,10 +42,10 @@ namespace BlackMisc bool isEngineOn(int engineNumber) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson QJsonObject toJson() const; diff --git a/src/blackmisc/aviation/aircrafticao.h b/src/blackmisc/aviation/aircrafticao.h index 466fa6563..0e2d9a674 100644 --- a/src/blackmisc/aviation/aircrafticao.h +++ b/src/blackmisc/aviation/aircrafticao.h @@ -139,10 +139,10 @@ namespace BlackMisc bool isVtol() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Valid designator? static bool isValidDesignator(const QString &designator); @@ -154,7 +154,7 @@ namespace BlackMisc static bool isValidAirlineDesignator(const QString &airline); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftIcao) diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h index d2ea7c093..89260bd58 100644 --- a/src/blackmisc/aviation/aircraftlights.h +++ b/src/blackmisc/aviation/aircraftlights.h @@ -43,10 +43,10 @@ namespace BlackMisc CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Strobes lights on? bool isStrobeOn() const { return m_strobeOn; } @@ -97,7 +97,7 @@ namespace BlackMisc static CAircraftLights allLightsOff(); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftLights) diff --git a/src/blackmisc/aviation/aircraftlist.h b/src/blackmisc/aviation/aircraftlist.h index c22f4703b..2edc5aafc 100644 --- a/src/blackmisc/aviation/aircraftlist.h +++ b/src/blackmisc/aviation/aircraftlist.h @@ -49,10 +49,10 @@ namespace BlackMisc bool updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index 3b6135336..20f017994 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -60,10 +60,10 @@ namespace BlackMisc {} //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Get aircraft lights CAircraftLights getLights() const { return m_lights; } @@ -120,7 +120,7 @@ namespace BlackMisc void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftParts) diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index 7324713c1..5e4086214 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -36,10 +36,10 @@ namespace BlackMisc CAircraftPartsList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index b229bbb9c..0902fde3e 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -71,10 +71,10 @@ namespace BlackMisc //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Get position const BlackMisc::Geo::CCoordinateGeodetic &getPosition() const { return this->m_position; } @@ -144,7 +144,7 @@ namespace BlackMisc void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftSituation) diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index 174761937..a9dba3953 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -36,10 +36,10 @@ namespace BlackMisc CAircraftSituationList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h index d703fcfa5..5387b0cc4 100644 --- a/src/blackmisc/aviation/airport.h +++ b/src/blackmisc/aviation/airport.h @@ -97,13 +97,13 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAirport) diff --git a/src/blackmisc/aviation/airporticao.h b/src/blackmisc/aviation/airporticao.h index cf66facf5..012318d8e 100644 --- a/src/blackmisc/aviation/airporticao.h +++ b/src/blackmisc/aviation/airporticao.h @@ -52,7 +52,7 @@ namespace BlackMisc static bool isValidIcaoDesignator(const QString &icaoCode); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAirportIcao) diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 0b456d3e9..b97c94099 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -48,10 +48,10 @@ namespace BlackMisc CAirport findFirstByIcao(const CAirportIcao &icao, const CAirport &ifNotFound = CAirport()) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index 0e1165eea..860b2cb7e 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -49,7 +49,7 @@ namespace BlackMisc }; //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! Default constructor: 0 Altitude true CAltitude() : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {} @@ -82,13 +82,13 @@ namespace BlackMisc void toMeanSeaLevel(); //! \copydoc CValueObject::parseFromString(const QString &value) - virtual void parseFromString(const QString &value) override; + void parseFromString(const QString &value); //! \copydoc CValueObject::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) - virtual void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) override; + void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode); //! \copydoc CValueObject::toIcon - BlackMisc::CIcon toIcon() const override; + BlackMisc::CIcon toIcon() const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAltitude) diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 02d7a4568..6b2c7ed8e 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -67,7 +67,7 @@ namespace BlackMisc const CInformationMessage &atis = CInformationMessage(CInformationMessage::ATIS), const CInformationMessage &metar = CInformationMessage(CInformationMessage::METAR)); //! \copydoc CValueObject::toIcon() - virtual BlackMisc::CIcon toIcon() const override { return this->m_callsign.toIcon(); } + BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); } //! Has booking times? bool hasBookingTimes() const @@ -243,13 +243,13 @@ namespace BlackMisc const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAtcStation) diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 22ea83ae2..b69806a63 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -60,10 +60,10 @@ namespace BlackMisc bool updateFromVatsimDataFileStation(CAtcStation &stationToBeUpdated) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/avionicsbase.h b/src/blackmisc/aviation/avionicsbase.h index 1d0f93ce0..641948e22 100644 --- a/src/blackmisc/aviation/avionicsbase.h +++ b/src/blackmisc/aviation/avionicsbase.h @@ -40,6 +40,9 @@ namespace BlackMisc //! \brief Constructor CAvionicsBase(const QString &name) : m_name(name) {} + //! Destructor + virtual ~CAvionicsBase() = default; + //! \brief Set name void setName(const QString &name) { @@ -48,7 +51,7 @@ namespace BlackMisc public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override { Q_UNUSED(i18n); return ""; } + QString convertToQString(bool i18n = false) const { Q_UNUSED(i18n); return ""; } //! \brief Name QString getName() const diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index 59f652d7a..b4c42019d 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -89,13 +89,13 @@ namespace BlackMisc bool equalsString(const QString &callsignString) const; //! \copydoc CValueObject::toIcon() - virtual BlackMisc::CIcon toIcon() const override { return convertToIcon(*this); } + BlackMisc::CIcon toIcon() const { return convertToIcon(*this); } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Valid callsign? static bool isValidCallsign(const QString &callsign); @@ -113,7 +113,7 @@ namespace BlackMisc static const CIcon &convertToIcon(const CCallsign &callsign); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: //! Unify the callsign diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index fd568c3cb..b4c734b3b 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -33,10 +33,10 @@ namespace BlackMisc CCallsignSet(const CCollection &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 57f97e26a..34eb6e3a3 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -180,10 +180,10 @@ namespace BlackMisc const QString &getRemarks() const { return m_remarks; } //! \copydoc CValueObject::toIcon - virtual CIcon toIcon() const override; + CIcon toIcon() const; //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CFlightPlan) diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h index 8a882e89d..0a8e6e684 100644 --- a/src/blackmisc/aviation/heading.h +++ b/src/blackmisc/aviation/heading.h @@ -46,7 +46,7 @@ namespace BlackMisc }; //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! \brief Default constructor: 0 heading true CHeading() : CValueObject(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {} diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h index c0ae108f5..79cd14dfa 100644 --- a/src/blackmisc/aviation/informationmessage.h +++ b/src/blackmisc/aviation/informationmessage.h @@ -91,7 +91,7 @@ namespace BlackMisc bool isEmpty() const { return this->m_message.isEmpty(); } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CInformationMessage) diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index ed832082b..4b004be50 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -77,13 +77,13 @@ namespace BlackMisc void setEnabled(bool enable); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: //! Default constructor diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h index d970954ef..1694ad501 100644 --- a/src/blackmisc/aviation/selcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -71,7 +71,7 @@ namespace BlackMisc static const QStringList &codePairs(); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSelcal) diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h index b9bc08c4c..5d525b714 100644 --- a/src/blackmisc/aviation/track.h +++ b/src/blackmisc/aviation/track.h @@ -75,7 +75,7 @@ namespace BlackMisc ReferenceNorth getReferenceNorth() const { return m_north; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CTrack) diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h index 54e3e6388..326de5aad 100644 --- a/src/blackmisc/aviation/transponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -160,10 +160,10 @@ namespace BlackMisc } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Is valid transponder code? static bool isValidTransponderCode(const QString &transponderCode); @@ -172,7 +172,7 @@ namespace BlackMisc static bool isValidTransponderCode(qint32 transponderMode); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: //! Default value? diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index 609ddfe65..690a17b07 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -113,10 +113,10 @@ namespace BlackMisc public: //! \copydoc BlackMisc::CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(derived()); } + QVariant toQVariant() const { return QVariant::fromValue(derived()); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant< C >(&derived(), variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant< C >(&derived(), variant); } //! Simplifies composition, returns 0 for performance friend uint qHash(const C &) { return 0; } @@ -148,7 +148,7 @@ namespace BlackMisc } //! \copydoc BlackMisc::CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override + QString convertToQString(bool i18n = false) const { QString str; for (const auto &value : derived()) { str += (str.isEmpty() ? "{" : ", ") + CContainerHelper::stringify(value, i18n); } diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index fa39697ab..3b96743c1 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -227,10 +227,10 @@ namespace BlackMisc } //! \copydoc CValueObject::toQVariant() - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::toJson QJsonObject toJson() const @@ -404,7 +404,7 @@ namespace BlackMisc //! \copydoc BlackMisc::CValueObject::convertToQString //! \todo Fix brackets - virtual QString convertToQString(bool i18n = false) const override + QString convertToQString(bool i18n = false) const { QString str = "{"; for (auto it = m_impl.cbegin(); it != m_impl.end(); ++it) diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h index 09dfc92a7..2554536a0 100644 --- a/src/blackmisc/eveventhotkeyfunction.h +++ b/src/blackmisc/eveventhotkeyfunction.h @@ -42,7 +42,7 @@ namespace BlackMisc bool getFunctionArgument() const { return m_hotkeyFuncArgument; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CEventHotkeyFunction) diff --git a/src/blackmisc/evoriginator.h b/src/blackmisc/evoriginator.h index 07f7bdda3..02aa3b303 100644 --- a/src/blackmisc/evoriginator.h +++ b/src/blackmisc/evoriginator.h @@ -57,7 +57,7 @@ namespace BlackMisc bool isFromSameProcessName() const; //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(COriginator) diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 73500d1ce..b1c61a476 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -57,7 +57,7 @@ namespace BlackMisc virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const = 0; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! Latitude as string QString latitudeAsString() const { return this->latitude().toQString(true); } @@ -152,10 +152,10 @@ namespace BlackMisc virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_geodeticHeight; } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Switch unit of latitude / longitude CCoordinateGeodetic &switchUnit(const BlackMisc::PhysicalQuantities::CAngleUnit &unit); @@ -176,7 +176,7 @@ namespace BlackMisc static CCoordinateGeodetic fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const BlackMisc::PhysicalQuantities::CLength &geodeticHeight = {}); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CCoordinateGeodetic) diff --git a/src/blackmisc/geo/earthangle.h b/src/blackmisc/geo/earthangle.h index 14e8bc77d..dc9c40b88 100644 --- a/src/blackmisc/geo/earthangle.h +++ b/src/blackmisc/geo/earthangle.h @@ -55,7 +55,7 @@ namespace BlackMisc LATorLON operator *(double multiply) const; //! \copydoc CValueObject::toIcon - CIcon toIcon() const override; + CIcon toIcon() const; /*! * Latitude / Longitude from a WGS string such as @@ -76,7 +76,7 @@ namespace BlackMisc public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: //! Easy access to derived class (CRTP template parameter) diff --git a/src/blackmisc/geo/latitude.h b/src/blackmisc/geo/latitude.h index 18b96d9bc..c90c4ad4e 100644 --- a/src/blackmisc/geo/latitude.h +++ b/src/blackmisc/geo/latitude.h @@ -33,7 +33,7 @@ namespace BlackMisc { public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const + QString convertToQString(bool i18n = false) const { QString s(CEarthAngle::convertToQString(i18n)); if (!this->isZeroEpsilonConsidered()) diff --git a/src/blackmisc/geo/longitude.h b/src/blackmisc/geo/longitude.h index 3c91fc277..4d1e96da0 100644 --- a/src/blackmisc/geo/longitude.h +++ b/src/blackmisc/geo/longitude.h @@ -32,7 +32,7 @@ namespace BlackMisc { public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const + QString convertToQString(bool i18n = false) const { QString s(CEarthAngle::convertToQString(i18n)); if (!this->isZeroEpsilonConsidered()) diff --git a/src/blackmisc/hardware/joystickbutton.h b/src/blackmisc/hardware/joystickbutton.h index 72fa269b3..f40c3a638 100644 --- a/src/blackmisc/hardware/joystickbutton.h +++ b/src/blackmisc/hardware/joystickbutton.h @@ -55,10 +55,10 @@ namespace BlackMisc void setButtonObject(const BlackMisc::Hardware::CJoystickButton &button); //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const CPropertyIndex &index) const; + CVariant propertyByIndex(const CPropertyIndex &index) const; //! Button index to string static QString buttonIndexToString(qint32 buttonIndex); @@ -70,7 +70,7 @@ namespace BlackMisc static qint32 getInvalidIndex() { return m_invalidIndex; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CJoystickButton) diff --git a/src/blackmisc/hardware/keyboardkey.h b/src/blackmisc/hardware/keyboardkey.h index 4bdb6ce14..d4d69ac4a 100644 --- a/src/blackmisc/hardware/keyboardkey.h +++ b/src/blackmisc/hardware/keyboardkey.h @@ -181,10 +181,10 @@ namespace BlackMisc bool equalsWithRelaxedModifiers(const CKeyboardKey &key) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! Modifier to string static QString modifierToString(Modifier modifier); @@ -204,7 +204,7 @@ namespace BlackMisc static QString toStringRepresentation(int key); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CKeyboardKey) diff --git a/src/blackmisc/hardware/keyboardkeylist.h b/src/blackmisc/hardware/keyboardkeylist.h index 92deaf05e..f8220a9db 100644 --- a/src/blackmisc/hardware/keyboardkeylist.h +++ b/src/blackmisc/hardware/keyboardkeylist.h @@ -35,7 +35,7 @@ namespace BlackMisc CKeyboardKeyList(const CSequence &baseClass); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h index 2256bb549..71db77c9c 100644 --- a/src/blackmisc/hotkeyfunction.h +++ b/src/blackmisc/hotkeyfunction.h @@ -92,7 +92,7 @@ namespace BlackMisc } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CHotkeyFunction) diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index 19c5c001b..e12876572 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -65,7 +65,7 @@ namespace BlackMisc operator QPixmap() const { return this->toPixmap(); } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! Icon for given index static const CIcon &iconByIndex(CIcons::IconIndex index); diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h index 86f2a718f..ceee8c90c 100644 --- a/src/blackmisc/iconlist.h +++ b/src/blackmisc/iconlist.h @@ -39,7 +39,7 @@ namespace BlackMisc CIcon findByIndex(CIcons::IconIndex index) const; //! \copydoc CValueObject::asQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! Register metadata of unit and quantity static void registerMetadata(); diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index dd5054352..8740b84d8 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -106,7 +106,7 @@ namespace BlackMisc bool contains(const QString &substring) const { return m_string.contains(substring); } //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CLogCategory) diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index 90113a7f4..521e3652d 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -98,7 +98,7 @@ namespace BlackMisc static void registerMetadata(); //! \copydoc BlackMisc::CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: /* diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h index 1aa3f891a..e898a9944 100644 --- a/src/blackmisc/logpattern.h +++ b/src/blackmisc/logpattern.h @@ -83,7 +83,7 @@ namespace BlackMisc bool isProperSubsetOf(const CLogPattern &other) const; //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! \copydoc CValueObject::marshallToDbus() void marshallToDbus(QDBusArgument &argument) const; diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index a4c83e96b..e60f69e63 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -52,19 +52,19 @@ namespace BlackMisc void setVariant(const CVariant &variant) { m_variant = variant; } //! \copydoc CValueObject::toIcon() - virtual BlackMisc::CIcon toIcon() const override; + BlackMisc::CIcon toIcon() const; //! Has icon bool hasIcon() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CNameVariantPair) diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index 099e0ae36..0fc943398 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -50,10 +50,10 @@ namespace BlackMisc bool addOrReplaceValue(const QString &name, const CVariant &value, const CIcon &icon = CIcon()); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/aircraftmapping.h b/src/blackmisc/network/aircraftmapping.h index 278a81b7d..7b12a611b 100644 --- a/src/blackmisc/network/aircraftmapping.h +++ b/src/blackmisc/network/aircraftmapping.h @@ -27,7 +27,7 @@ namespace BlackMisc public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! Properties enum ColumnIndex @@ -45,10 +45,10 @@ namespace BlackMisc CAircraftMapping(const QString &source, const QString &packageName, const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model); //! \copydoc CValueObject::propertyByIndex - CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! ICAO void setIcao(const BlackMisc::Aviation::CAircraftIcao &icao) { this->m_icao = icao; } diff --git a/src/blackmisc/network/aircraftmappinglist.h b/src/blackmisc/network/aircraftmappinglist.h index 88a04eb47..a2c981815 100644 --- a/src/blackmisc/network/aircraftmappinglist.h +++ b/src/blackmisc/network/aircraftmappinglist.h @@ -53,10 +53,10 @@ namespace BlackMisc CAircraftMappingList findByModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index 49641a917..f72fecd66 100644 --- a/src/blackmisc/network/client.h +++ b/src/blackmisc/network/client.h @@ -120,16 +120,16 @@ namespace BlackMisc void setAircraftModel(const BlackMisc::Simulation::CAircraftModel &model) { this->m_model = model; } //! \copydoc CValueObject::toIcon() - virtual CIcon toIcon() const override { return this->m_user.toIcon(); } + CIcon toIcon() const { return this->m_user.toIcon(); } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CClient) diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h index d0b8b5829..b4317e0c9 100644 --- a/src/blackmisc/network/clientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -40,7 +40,7 @@ namespace BlackMisc CClientList(const CSequence &other); //! QVariant, required for DBus QVariant lists - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 71ba68f11..c1d42352c 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -86,13 +86,13 @@ namespace BlackMisc BlackMisc::CStatusMessageList validate() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CServer) diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index 9cbaa5111..dc1e0aa35 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -34,10 +34,10 @@ namespace BlackMisc CServerList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h index 86a240faa..203a337fa 100644 --- a/src/blackmisc/network/textmessage.h +++ b/src/blackmisc/network/textmessage.h @@ -148,19 +148,19 @@ namespace BlackMisc QString getSelcalCode() const; //! As icon, not implement by all classes - virtual CIcon toIcon() const override; + CIcon toIcon() const; //! As pixmap, required for most GUI views - virtual QPixmap toPixmap() const override; + QPixmap toPixmap() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CTextMessage) diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h index c0605dde5..5256a3671 100644 --- a/src/blackmisc/network/textmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -82,10 +82,10 @@ namespace BlackMisc void markAsSent(); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h index 7ba6f5e70..5b5e028f5 100644 --- a/src/blackmisc/network/user.h +++ b/src/blackmisc/network/user.h @@ -116,13 +116,13 @@ namespace BlackMisc void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { m_callsign = callsign; } //! \copydoc CValueObject::toIcon() - virtual BlackMisc::CIcon toIcon() const override { return this->getCallsign().toIcon(); } + BlackMisc::CIcon toIcon() const { return this->getCallsign().toIcon(); } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); /*! * This and another user exchange missing data. @@ -137,7 +137,7 @@ namespace BlackMisc static QString beautifyRealName(const QString &realName); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CUser) diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index 1cbd0f19d..e48dd2663 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -35,10 +35,10 @@ namespace BlackMisc CUserList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h index 63d774f26..6287a905d 100644 --- a/src/blackmisc/network/voicecapabilities.h +++ b/src/blackmisc/network/voicecapabilities.h @@ -54,7 +54,7 @@ namespace BlackMisc bool isUnknown() const { return m_voiceCapabilities == Unknown; } //! \copydoc CValueObject::toIcon() - virtual CIcon toIcon() const override; + CIcon toIcon() const; //! From enum static const CVoiceCapabilities &fromVoiceCapabilities(VoiceCapabilities capabilities); @@ -69,7 +69,7 @@ namespace BlackMisc static const QList &allCapabilities(); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CVoiceCapabilities) diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h index f5ac28305..633052989 100644 --- a/src/blackmisc/pixmap.h +++ b/src/blackmisc/pixmap.h @@ -46,10 +46,10 @@ namespace BlackMisc bool isNull() const; //! \copydoc CValueObject::toPixmap - virtual QPixmap toPixmap() const override; + QPixmap toPixmap() const; //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(BlackMisc::CPixmap) diff --git a/src/blackmisc/pq/angle.h b/src/blackmisc/pq/angle.h index f2def0392..680b1d4df 100644 --- a/src/blackmisc/pq/angle.h +++ b/src/blackmisc/pq/angle.h @@ -59,7 +59,7 @@ namespace BlackMisc CAngleUnit::sexagesimalDegMin()) {} //! \copydoc CValueObject::toIcon - virtual BlackMisc::CIcon toIcon() const override; + BlackMisc::CIcon toIcon() const; //! Value as factor of PI (e.g. 0.5PI) double piFactor() const; diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index ac07740a8..4c18c26c7 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -248,8 +248,11 @@ namespace BlackMisc // } public: + //! Destructor + virtual ~CMeasurementUnit() = default; + //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override + QString convertToQString(bool i18n = false) const { return this->getSymbol(i18n); } diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index 238b2ff3c..bbbc84dc2 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -211,19 +211,19 @@ namespace BlackMisc void convertFromJson(const QJsonObject &json); //! Parse to string, with specified separator - virtual void parseFromString(const QString &value, CPqString::SeparatorMode mode); + void parseFromString(const QString &value, CPqString::SeparatorMode mode); //! \copydoc CValueObject::parseFromString - virtual void parseFromString(const QString &value) override; + void parseFromString(const QString &value); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: //! Default constructor diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h index 1e2786a11..fca2c75b4 100644 --- a/src/blackmisc/pq/pqstring.h +++ b/src/blackmisc/pq/pqstring.h @@ -31,7 +31,7 @@ namespace BlackMisc { public: //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! Number separators / group separators enum SeparatorMode diff --git a/src/blackmisc/pq/time.h b/src/blackmisc/pq/time.h index e09ff654e..b976f5b7e 100644 --- a/src/blackmisc/pq/time.h +++ b/src/blackmisc/pq/time.h @@ -57,10 +57,10 @@ namespace BlackMisc CTime(const QString &unitString) : CValueObject(0, CTimeUnit::nullUnit()) { this->parseFromString(unitString); } //! From string hh:mm, or hh:mm:ss, or time units such as s, min - virtual void parseFromString(const QString &time) override; + void parseFromString(const QString &time); //! From string hh:mm, or hh:mm:ss, or time units such as s, min - virtual void parseFromString(const QString &time, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) override; + void parseFromString(const QString &time, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode); //! To Qt time //! \warning sign not considered diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 44291cccd..a7966a86d 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -128,11 +128,11 @@ namespace BlackMisc } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: //! \copydoc CValueObject::parseFromString - virtual void parseFromString(const QString &indexes) override; + void parseFromString(const QString &indexes); private: BLACK_ENABLE_TUPLE_CONVERSION(CPropertyIndex) diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index eac5f4025..b25a44b0b 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -35,10 +35,10 @@ namespace BlackMisc CPropertyIndexList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 6c6ddc40b..b609c1b45 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -144,13 +144,13 @@ namespace BlackMisc friend uint qHash(const CPropertyIndexVariantMap &vm) { return vm.getValueHash(); } //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; protected: QMap m_values; //!< values diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h index 887be1b39..deaa5b308 100644 --- a/src/blackmisc/setaudio.h +++ b/src/blackmisc/setaudio.h @@ -44,13 +44,13 @@ namespace BlackMisc void setNotificationFlag(BlackSound::CNotificationSounds::Notification notification, bool value); //! \copydoc BlackCore::IContextSettings::value - virtual BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); + BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); //! Init with meaningful default values void initDefaultValues(); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSettingsAudio) diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 7f0c6bcee..73a43a0fd 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -83,13 +83,13 @@ namespace BlackMisc static QString toStringRepresentation(int key) { return Hardware::CKeyboardKey::toStringRepresentation(key); } //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSettingKeyboardHotkey) diff --git a/src/blackmisc/setkeyboardhotkeylist.h b/src/blackmisc/setkeyboardhotkeylist.h index 0077b1af0..ffc2f01fe 100644 --- a/src/blackmisc/setkeyboardhotkeylist.h +++ b/src/blackmisc/setkeyboardhotkeylist.h @@ -48,10 +48,10 @@ namespace BlackMisc void initAsHotkeyList(bool reset = true); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index 7f4149a47..f2b8e181f 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -92,13 +92,13 @@ namespace BlackMisc void addTrafficNetworkServer(const BlackMisc::Network::CServer &server) { m_trafficNetworkServers.push_back(server); } //! \copydoc BlackCore::IContextSettings::value - virtual BlackMisc::CStatusMessage value(const QString &path, const QString &command, const CVariant &value, bool &changedFlag); + BlackMisc::CStatusMessage value(const QString &path, const QString &command, const CVariant &value, bool &changedFlag); //! Init with meaningful default values void initDefaultValues(); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSettingsNetwork) diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 6c2185e00..79958245f 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -66,10 +66,10 @@ namespace BlackMisc CAircraftModel(const BlackMisc::Aviation::CAircraft &aircraft); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Corresponding callsign if applicable const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_callsign; } @@ -141,7 +141,7 @@ namespace BlackMisc static QString modelTypeToString(ModelType type); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftModel) diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index 4e3aef6df..b8be872b1 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -34,7 +34,7 @@ namespace BlackMisc CAircraftModelList(const CSequence &other); //! QVariant, required for DBus QVariant lists - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! Contains model string bool containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const; @@ -52,7 +52,7 @@ namespace BlackMisc QStringList getSortedModelStrings() const; //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata static void registerMetadata(); diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h index 427952b3f..d3cd9b6b9 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h @@ -123,13 +123,13 @@ namespace BlackMisc QString getThumbnailFileName() const; //! \copydoc CValueObject::propertyByIndex - virtual BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CAircraftCfgEntries) diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h index bcf1ab1d2..606441dcf 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h @@ -91,10 +91,10 @@ namespace BlackMisc CAircraftCfgEntriesList findByTitle(const QString &title, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Do not include the following directories for FS static const QStringList &excludeDirectories() diff --git a/src/blackmisc/simulation/setsimulator.h b/src/blackmisc/simulation/setsimulator.h index 303c6f762..d1fe16d56 100644 --- a/src/blackmisc/simulation/setsimulator.h +++ b/src/blackmisc/simulation/setsimulator.h @@ -76,10 +76,10 @@ namespace BlackMisc void initDefaultValues(); //! \copydoc BlackCore::IContextSettings::value - virtual BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); + BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSettingsSimulator) diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 93a826768..6aa96b34c 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -46,10 +46,10 @@ namespace BlackMisc const BlackMisc::Network::CClient &client = {}); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Get model const BlackMisc::Simulation::CAircraftModel &getModel() const { return m_model; } @@ -106,7 +106,7 @@ namespace BlackMisc void setPartsSynchronized(bool synchronized) { m_partsSynchronized = synchronized; } //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSimulatedAircraft) diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 36adb20d0..1520e8255 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -63,10 +63,10 @@ namespace BlackMisc bool isRendered(const BlackMisc::Aviation::CCallsign &callsign) const; //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! To aircraft list BlackMisc::Aviation::CAircraftList toAircraftList() const; diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h index 7e7fdaa10..959d143cb 100644 --- a/src/blackmisc/simulation/simulatorinfolist.h +++ b/src/blackmisc/simulation/simulatorinfolist.h @@ -33,7 +33,7 @@ namespace BlackMisc CSimulatorPluginInfoList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! Is simulator supported bool supportsSimulator(const QString &simulator); diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h index 2e164654f..606e1cdbd 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.h +++ b/src/blackmisc/simulation/simulatorplugininfo.h @@ -72,7 +72,7 @@ namespace BlackMisc const QString &getDescription() const { return m_description; } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSimulatorPluginInfo) diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h index 624c0cdcf..955a00cca 100644 --- a/src/blackmisc/simulation/simulatorsetup.h +++ b/src/blackmisc/simulation/simulatorsetup.h @@ -61,16 +61,16 @@ namespace BlackMisc QString getSimulatorInstallationDirectory() const; //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! Register metadata void static registerMetadata(); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CSimulatorSetup) diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index 3056339f0..c7a9d3237 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -113,7 +113,7 @@ namespace BlackMisc void addCategories(const CLogCategoryList &categories) { this->m_categories.push_back(categories); } //! Representing icon - virtual CIcon toIcon() const override { return convertToIcon(*this); } + CIcon toIcon() const { return convertToIcon(*this); } //! Severity as string const QString &getSeverityAsString() const; @@ -128,10 +128,10 @@ namespace BlackMisc static const QStringList &allSeverityStrings(); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! To HTML QString toHtml() const; @@ -140,7 +140,7 @@ namespace BlackMisc static const CIcon &convertToIcon(const CStatusMessage &statusMessage); //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CStatusMessage) diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index 3f6edf181..159cffd5e 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -49,10 +49,10 @@ namespace BlackMisc void addCategories(const CLogCategoryList &categories); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! Register metadata of unit and quantity static void registerMetadata(); diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h index 1908147e7..6c00f7a12 100644 --- a/src/blackmisc/timestampbased.h +++ b/src/blackmisc/timestampbased.h @@ -91,6 +91,9 @@ namespace BlackMisc static bool canHandleIndex(const BlackMisc::CPropertyIndex &index); protected: + //! Destructor + virtual ~ITimestampBased() {} + //! \copydoc CValueObject::propertyByIndex virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 50ac5c54a..c3be24075 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -73,14 +73,6 @@ namespace BlackMisc //! Base class is alias of itself using base_type = CEmpty; - //! Parse from string, e.g. 100km/h - //! \todo Here to avoid name hiding in PQ classes. Fix during policy refactoring. - virtual void parseFromString(const QString &) { qFatal("Not implemented"); } - - //! String for QString conversion - //! \todo Here because pure virtual. Move to CValueObject when all dynamic polymorphism is removed. - virtual QString convertToQString(bool i18n = false) const = 0; - protected: //! Protected default constructor CEmpty() = default; @@ -182,21 +174,23 @@ namespace BlackMisc } //! Method to return CVariant + //! \deprecated Use CVariant::to() instead. CVariant toCVariant() const; //! Set from CVariant + //! \deprecated Use CVariant::from() instead. void convertFromCVariant(const CVariant &variant); //! Return QVariant, used with DBus QVariant lists - //! \todo remove virtual - virtual QVariant toQVariant() const + //! \deprecated Use QVariant::fromValue() instead. + QVariant toQVariant() const { return Private::MetaTypeHelper::maybeToQVariant(*derived()); } //! Set from QVariant - //! \todo remove virtual - virtual void convertFromQVariant(const QVariant &variant) + //! \deprecated Use QVariant::value() instead. + void convertFromQVariant(const QVariant &variant) { return Private::MetaTypeHelper::maybeConvertFromQVariant(*derived(), variant); } @@ -596,13 +590,13 @@ namespace BlackMisc QString toQString(bool i18n = false) const { return derived()->convertToQString(i18n); } //! Cast to pretty-printed QString - virtual QString toFormattedQString(bool i18n = false) const { return derived()->toQString(i18n); } + QString toFormattedQString(bool i18n = false) const { return derived()->toQString(i18n); } //! To std string std::string toStdString(bool i18n = false) const { return derived()->convertToQString(i18n).toStdString(); } //! String for streaming operators - virtual QString stringForStreaming() const { return derived()->convertToQString(); } + QString stringForStreaming() const { return derived()->convertToQString(); } private: const Derived *derived() const { return static_cast(this); } @@ -621,16 +615,16 @@ namespace BlackMisc CPropertyIndexList apply(const BlackMisc::CPropertyIndexVariantMap &indexMap, bool skipEqualValues = false); // implemented later due to cyclic include dependency //! Set property by index - virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index); // implemented later due to cyclic include dependency + void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index); // implemented later due to cyclic include dependency //! Property by index - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; // implemented later due to cyclic include dependency + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; // implemented later due to cyclic include dependency //! Property by index as String - virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const; // implemented later due to cyclic include dependency + QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const; // implemented later due to cyclic include dependency //! Is given variant equal to value of property index? - virtual bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const; // implemented later due to cyclic include dependency + bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const; // implemented later due to cyclic include dependency private: const Derived *derived() const { return static_cast(this); } @@ -649,16 +643,16 @@ namespace BlackMisc CPropertyIndexList apply(const BlackMisc::CPropertyIndexVariantMap &indexMap, bool skipEqualValues = false); // implemented later due to cyclic include dependency //! Set property by index - virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { derived()->Derived::base_type::setPropertyByIndex(variant, index); } + void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) { derived()->Derived::base_type::setPropertyByIndex(variant, index); } //! Property by index - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; // implemented later due to cyclic include dependency + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; // implemented later due to cyclic include dependency //! Property by index as String - virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const { return derived()->Derived::base_type::propertyByIndexAsString(index, i18n); } + QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const { return derived()->Derived::base_type::propertyByIndexAsString(index, i18n); } //! Is given variant equal to value of property index? - virtual bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const { return derived()->Derived::base_type::equalsPropertyByIndex(compareValue, index); } + bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const { return derived()->Derived::base_type::equalsPropertyByIndex(compareValue, index); } private: const Derived *derived() const { return static_cast(this); } @@ -670,10 +664,10 @@ namespace BlackMisc { public: //! As icon, not implemented by all classes - virtual CIcon toIcon() const; // implemented later due to cyclic include dependency + CIcon toIcon() const; // implemented later due to cyclic include dependency //! As pixmap, required for most GUI views - virtual QPixmap toPixmap() const; // implemented later due to cyclic include dependency + QPixmap toPixmap() const; // implemented later due to cyclic include dependency private: const Derived *derived() const { return static_cast(this); } @@ -711,9 +705,6 @@ namespace BlackMisc //! Base class using base_type = Base; - //! Destructor - virtual ~CValueObject() {} - //! Base class enums enum ColumnIndex { @@ -726,7 +717,7 @@ namespace BlackMisc using Mixin::String::toQString; //! \copydoc BlackMisc::Mixin::String::toFormattedQString - virtual QString toFormattedQString(bool i18n = false) const override { return this->Mixin::String::toQString(i18n); } + using Mixin::String::toFormattedQString; //! \copydoc BlackMisc::Mixin::String::toStdString using Mixin::String::toStdString; @@ -791,12 +782,15 @@ namespace BlackMisc //! Copy assignment operator. CValueObject &operator =(const CValueObject &) = default; + //! Destructor + ~CValueObject() = default; + + public: //! \copydoc BlackMisc::Mixin::MetaType::getMetaTypeId using Mixin::MetaType::getMetaTypeId; - public: //! \copydoc BlackMisc::Mixin::String::stringForStreaming - virtual QString stringForStreaming() const override { return this->Mixin::String::stringForStreaming(); } + using Mixin::String::stringForStreaming; //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus using Mixin::DBusByTuple::value>::marshallToDbus; diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index 4ea826a78..96613982c 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -131,10 +131,10 @@ namespace BlackMisc const QVariant &getQVariant() const { return m_v; } //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return getQVariant(); } + QVariant toQVariant() const { return getQVariant(); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &v) override { m_v = v; } + void convertFromQVariant(const QVariant &v) { m_v = v; } //! True if this variant can be converted to the type with the given metatype ID. bool canConvert(int typeId) const { return m_v.canConvert(typeId); } @@ -146,7 +146,7 @@ namespace BlackMisc bool convert(int typeId) { return m_v.convert(typeId); } //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; //! Convert this variant to a bool. bool toBool() const { return m_v.toBool(); } @@ -216,16 +216,16 @@ namespace BlackMisc friend int compare(const CVariant &a, const CVariant &b) { return compareImpl(a, b); } //! \copydoc CValueObject::setPropertyByIndex - virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index); //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::propertyByIndexAsString - virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const override; + QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const; //! \copydoc CValueObject::equalsPropertyByIndex - virtual bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const override; + bool equalsPropertyByIndex(const CVariant &compareValue, const CPropertyIndex &index) const; private: QVariant m_v; diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index 97320d605..e0d0f5f16 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -33,10 +33,10 @@ namespace BlackMisc CVariantList(const CSequence &other); //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } + QVariant toQVariant() const { return QVariant::fromValue(*this); } //! \copydoc CValueObject::convertFromQVariant - virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } //! \brief Register metadata static void registerMetadata(); diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h index 6fd4f4a7c..ea9361df9 100644 --- a/tests/blackmisc/testvalueobject.h +++ b/tests/blackmisc/testvalueobject.h @@ -52,13 +52,13 @@ namespace BlackMisc void setDescription(const QString &description) { m_description = description; } //! \copydoc CValueObject::propertyByIndex - virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; + CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; //! \copydoc CValueObject::setPropertyByIndex - void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index); //! \copydoc CValueObject::convertToQString() - virtual QString convertToQString(bool i18n = false) const override; + QString convertToQString(bool i18n = false) const; private: BLACK_ENABLE_TUPLE_CONVERSION(CTestValueObject)