diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h index a017cc8e1..c515d56ef 100644 --- a/src/blackmisc/audio/audiodeviceinfo.h +++ b/src/blackmisc/audio/audiodeviceinfo.h @@ -80,7 +80,6 @@ namespace BlackMisc return CAudioDeviceInfo(InputDevice, defaultDeviceIndex(), "default"); } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h index a107530cf..b28f4300c 100644 --- a/src/blackmisc/audio/voiceroom.h +++ b/src/blackmisc/audio/voiceroom.h @@ -100,7 +100,6 @@ namespace BlackMisc */ static const QString &protocolComplete() { static QString p("vvl://"); return p; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircraft.h b/src/blackmisc/aviation/aircraft.h index 01e1f139b..c0c202634 100644 --- a/src/blackmisc/aviation/aircraft.h +++ b/src/blackmisc/aviation/aircraft.h @@ -272,7 +272,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h index c57086d96..d1a802e97 100644 --- a/src/blackmisc/aviation/aircraftengine.h +++ b/src/blackmisc/aviation/aircraftengine.h @@ -42,7 +42,6 @@ namespace BlackMisc //! Set to on/off void setOn(bool on) { m_on = on; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircrafticao.h b/src/blackmisc/aviation/aircrafticao.h index d0ea1db00..466fa6563 100644 --- a/src/blackmisc/aviation/aircrafticao.h +++ b/src/blackmisc/aviation/aircrafticao.h @@ -153,7 +153,6 @@ namespace BlackMisc //! Valid designator? static bool isValidAirlineDesignator(const QString &airline); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h index 72d378e1f..d2ea7c093 100644 --- a/src/blackmisc/aviation/aircraftlights.h +++ b/src/blackmisc/aviation/aircraftlights.h @@ -96,7 +96,6 @@ namespace BlackMisc //! Returns object with all lights switched off static CAircraftLights allLightsOff(); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index d40d17c16..3b6135336 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -119,7 +119,6 @@ namespace BlackMisc //! Corresponding callsign void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 125c09977..b229bbb9c 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -143,7 +143,6 @@ namespace BlackMisc //! Corresponding callsign void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { this->m_correspondingCallsign = callsign; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h index 69d0d89db..d703fcfa5 100644 --- a/src/blackmisc/aviation/airport.h +++ b/src/blackmisc/aviation/airport.h @@ -102,7 +102,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/airporticao.h b/src/blackmisc/aviation/airporticao.h index 2ea38c760..cf66facf5 100644 --- a/src/blackmisc/aviation/airporticao.h +++ b/src/blackmisc/aviation/airporticao.h @@ -51,7 +51,6 @@ namespace BlackMisc //! Valid ICAO designator static bool isValidIcaoDesignator(const QString &icaoCode); - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index 62223ea6a..0e1165eea 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -48,11 +48,9 @@ namespace BlackMisc FlightLevel //!< Flight level }; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; - public: //! Default constructor: 0 Altitude true CAltitude() : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {} diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index b52e9c152..02d7a4568 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -248,7 +248,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/avionicsbase.h b/src/blackmisc/aviation/avionicsbase.h index 5688c394a..1d0f93ce0 100644 --- a/src/blackmisc/aviation/avionicsbase.h +++ b/src/blackmisc/aviation/avionicsbase.h @@ -46,10 +46,10 @@ namespace BlackMisc this->m_name = name; } + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override { Q_UNUSED(i18n); return ""; } - public: //! \brief Name QString getName() const { diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index d41c527a2..59f652d7a 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/src/blackmisc/aviation/callsign.h @@ -112,10 +112,10 @@ namespace BlackMisc //! Representing icon static const CIcon &convertToIcon(const CCallsign &callsign); - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; + protected: //! Unify the callsign static QString unifyCallsign(const QString &callsign); diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 23bdcd11b..57f97e26a 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -182,7 +182,6 @@ namespace BlackMisc //! \copydoc CValueObject::toIcon virtual CIcon toIcon() const override; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h index 0712cb6bd..8a882e89d 100644 --- a/src/blackmisc/aviation/heading.h +++ b/src/blackmisc/aviation/heading.h @@ -45,11 +45,9 @@ namespace BlackMisc True = 1 //!< true north }; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; - public: //! \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 10414e421..c0ae108f5 100644 --- a/src/blackmisc/aviation/informationmessage.h +++ b/src/blackmisc/aviation/informationmessage.h @@ -90,7 +90,6 @@ namespace BlackMisc //! Is empty? bool isEmpty() const { return this->m_message.isEmpty(); } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h index 2307e4054..ed832082b 100644 --- a/src/blackmisc/aviation/modulator.h +++ b/src/blackmisc/aviation/modulator.h @@ -82,6 +82,9 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; + //! \copydoc CValueObject::convertToQString + virtual QString convertToQString(bool i18n = false) const override; + protected: //! Default constructor CModulator(); @@ -89,9 +92,6 @@ namespace BlackMisc //! Constructor CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency); - //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; - //! Set active frequency void setFrequencyActiveKHz(double frequencyKHz); diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h index 9b1f22e72..d970954ef 100644 --- a/src/blackmisc/aviation/selcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -70,7 +70,6 @@ namespace BlackMisc //! All valid code pairs: AB, AC, AD ... static const QStringList &codePairs(); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h index d75041bad..b9bc08c4c 100644 --- a/src/blackmisc/aviation/track.h +++ b/src/blackmisc/aviation/track.h @@ -74,7 +74,6 @@ namespace BlackMisc //! \brief Get reference north (magnetic or true) ReferenceNorth getReferenceNorth() const { return m_north; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h index cfebb8cec..54e3e6388 100644 --- a/src/blackmisc/aviation/transponder.h +++ b/src/blackmisc/aviation/transponder.h @@ -171,13 +171,13 @@ namespace BlackMisc //! Is valid transponder code? static bool isValidTransponderCode(qint32 transponderMode); + //! \copydoc CValueObject::convertToQString + virtual QString convertToQString(bool i18n = false) const override; + protected: //! Default value? virtual bool isDefaultValue() const { return this->m_transponderCode == 0; } - //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; - private: BLACK_ENABLE_TUPLE_CONVERSION(CTransponder) int m_transponderCode; //!< Transponder code diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index 7755a4913..609ddfe65 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -147,7 +147,6 @@ namespace BlackMisc } } - protected: // CValueObject overrides //! \copydoc BlackMisc::CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override { @@ -157,6 +156,7 @@ namespace BlackMisc return str += "}"; } + protected: //! \copydoc BlackMisc::CValueObject::getMetaTypeId int getMetaTypeId() const { return qMetaTypeId>(); } diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index 0349f6230..fa39697ab 100644 --- a/src/blackmisc/dictionary.h +++ b/src/blackmisc/dictionary.h @@ -402,7 +402,6 @@ namespace BlackMisc //! Test for inequality. bool operator !=(const CDictionary &other) const { return !(*this == other); } - protected: //! \copydoc BlackMisc::CValueObject::convertToQString //! \todo Fix brackets virtual QString convertToQString(bool i18n = false) const override diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h index 68bef99e0..09dfc92a7 100644 --- a/src/blackmisc/eveventhotkeyfunction.h +++ b/src/blackmisc/eveventhotkeyfunction.h @@ -41,7 +41,6 @@ namespace BlackMisc //! Get boolean hotkey function argument bool getFunctionArgument() const { return m_hotkeyFuncArgument; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/evoriginator.h b/src/blackmisc/evoriginator.h index 434d2271c..07f7bdda3 100644 --- a/src/blackmisc/evoriginator.h +++ b/src/blackmisc/evoriginator.h @@ -56,7 +56,6 @@ namespace BlackMisc //! Check if originating from the same process name bool isFromSameProcessName() const; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 2b1017f29..73500d1ce 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -175,7 +175,6 @@ namespace BlackMisc //! Coordinate by WGS84 position data static CCoordinateGeodetic fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const BlackMisc::PhysicalQuantities::CLength &geodeticHeight = {}); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/geo/earthangle.h b/src/blackmisc/geo/earthangle.h index c04e4406f..14e8bc77d 100644 --- a/src/blackmisc/geo/earthangle.h +++ b/src/blackmisc/geo/earthangle.h @@ -74,6 +74,7 @@ namespace BlackMisc //! Init by CAngle value CEarthAngle(const BlackMisc::PhysicalQuantities::CAngle &angle); + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/geo/latitude.h b/src/blackmisc/geo/latitude.h index 4226046c3..18b96d9bc 100644 --- a/src/blackmisc/geo/latitude.h +++ b/src/blackmisc/geo/latitude.h @@ -31,7 +31,7 @@ namespace BlackMisc //! Latitude class BLACKMISC_EXPORT CLatitude : public CValueObject> { - protected: + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const { @@ -43,7 +43,6 @@ namespace BlackMisc return s; } - public: //! Default constructor CLatitude() = default; diff --git a/src/blackmisc/geo/longitude.h b/src/blackmisc/geo/longitude.h index fbde73e25..3c91fc277 100644 --- a/src/blackmisc/geo/longitude.h +++ b/src/blackmisc/geo/longitude.h @@ -30,7 +30,7 @@ namespace BlackMisc //! Longitude class BLACKMISC_EXPORT CLongitude : public CValueObject> { - protected: + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const { @@ -40,7 +40,6 @@ namespace BlackMisc return s; } - public: //! Default constructor CLongitude() = default; diff --git a/src/blackmisc/hardware/joystickbutton.h b/src/blackmisc/hardware/joystickbutton.h index f3d14a84c..72fa269b3 100644 --- a/src/blackmisc/hardware/joystickbutton.h +++ b/src/blackmisc/hardware/joystickbutton.h @@ -69,7 +69,6 @@ namespace BlackMisc //! Invalid button index static qint32 getInvalidIndex() { return m_invalidIndex; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/hardware/keyboardkey.h b/src/blackmisc/hardware/keyboardkey.h index e069d3067..4bdb6ce14 100644 --- a/src/blackmisc/hardware/keyboardkey.h +++ b/src/blackmisc/hardware/keyboardkey.h @@ -203,7 +203,6 @@ namespace BlackMisc */ static QString toStringRepresentation(int key); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h index 12db8b547..2256bb549 100644 --- a/src/blackmisc/hotkeyfunction.h +++ b/src/blackmisc/hotkeyfunction.h @@ -91,7 +91,6 @@ namespace BlackMisc return hotkeyFunction; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h index 6ba277766..c08dbef57 100644 --- a/src/blackmisc/icon.h +++ b/src/blackmisc/icon.h @@ -63,7 +63,6 @@ namespace BlackMisc //! Implicit conversion operator QPixmap() const { return this->toPixmap(); } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h index 68105f4ca..dd5054352 100644 --- a/src/blackmisc/logcategory.h +++ b/src/blackmisc/logcategory.h @@ -105,7 +105,6 @@ namespace BlackMisc //! Returns true if the category string contains the given substring. bool contains(const QString &substring) const { return m_string.contains(substring); } - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index b192fde63..90113a7f4 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -97,7 +97,6 @@ namespace BlackMisc //! Register metadata static void registerMetadata(); - protected: //! \copydoc BlackMisc::CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h index e79fcc43d..1aa3f891a 100644 --- a/src/blackmisc/logpattern.h +++ b/src/blackmisc/logpattern.h @@ -82,11 +82,9 @@ namespace BlackMisc //! topological sorting algorithm, to sort patterns by their generality. bool isProperSubsetOf(const CLogPattern &other) const; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; - public: //! \copydoc CValueObject::marshallToDbus() void marshallToDbus(QDBusArgument &argument) const; diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index cf966877f..a4c83e96b 100644 --- a/src/blackmisc/namevariantpair.h +++ b/src/blackmisc/namevariantpair.h @@ -63,7 +63,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/network/aircraftmapping.h b/src/blackmisc/network/aircraftmapping.h index 106c5096e..278a81b7d 100644 --- a/src/blackmisc/network/aircraftmapping.h +++ b/src/blackmisc/network/aircraftmapping.h @@ -25,11 +25,10 @@ namespace BlackMisc class BLACKMISC_EXPORT CAircraftMapping : public CValueObject { - protected: + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; - public: //! Properties enum ColumnIndex { diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index f38a218d3..49641a917 100644 --- a/src/blackmisc/network/client.h +++ b/src/blackmisc/network/client.h @@ -128,7 +128,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index eb00ab88e..71ba68f11 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -91,7 +91,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h index d5c9ed017..86a240faa 100644 --- a/src/blackmisc/network/textmessage.h +++ b/src/blackmisc/network/textmessage.h @@ -159,7 +159,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h index 46b8ef08d..7ba6f5e70 100644 --- a/src/blackmisc/network/user.h +++ b/src/blackmisc/network/user.h @@ -136,7 +136,6 @@ namespace BlackMisc //! Beautify real name, e.g. "JOE DoE" -> "Joe Doe"; static QString beautifyRealName(const QString &realName); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h index 6e3227725..63d774f26 100644 --- a/src/blackmisc/network/voicecapabilities.h +++ b/src/blackmisc/network/voicecapabilities.h @@ -68,7 +68,6 @@ namespace BlackMisc //! All capabilities as list static const QList &allCapabilities(); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h index de7c93a9c..f5ac28305 100644 --- a/src/blackmisc/pixmap.h +++ b/src/blackmisc/pixmap.h @@ -48,7 +48,6 @@ namespace BlackMisc //! \copydoc CValueObject::toPixmap virtual QPixmap toPixmap() const override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index 36da00787..ac07740a8 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -247,13 +247,13 @@ namespace BlackMisc // return this->getName(false); // } + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override { return this->getSymbol(i18n); } - public: //! \copydoc CValueObject::marshallToDbus void marshallToDbus(QDBusArgument &argument) const { diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index 1e3278274..238b2ff3c 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -222,8 +222,10 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: + //! \copydoc CValueObject::convertToQString + virtual QString convertToQString(bool i18n = false) const override; + protected: //! Default constructor //! \todo Remove as part of MS' CValueObject refactoring CPhysicalQuantity(); @@ -234,9 +236,6 @@ namespace BlackMisc //! Constructor by parsed string, e.g. 10m CPhysicalQuantity(const QString &unitString); - //! \copydoc CValueObject::convertToQString - virtual QString convertToQString(bool i18n = false) const override; - private: double m_value; //!< numeric part MU m_unit; //!< unit part diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h index ab381d25a..1e2786a11 100644 --- a/src/blackmisc/pq/pqstring.h +++ b/src/blackmisc/pq/pqstring.h @@ -29,11 +29,10 @@ namespace BlackMisc */ class BLACKMISC_EXPORT CPqString : public CValueObject { - protected: + public: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; - public: //! Number separators / group separators enum SeparatorMode { diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 3b881aebf..44291cccd 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -127,10 +127,10 @@ namespace BlackMisc return static_cast(ev) == l.first(); } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; + protected: //! \copydoc CValueObject::parseFromString virtual void parseFromString(const QString &indexes) override; diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index 12013a01b..6c6ddc40b 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/src/blackmisc/propertyindexvariantmap.h @@ -149,14 +149,13 @@ namespace BlackMisc //! \copydoc CValueObject::convertFromQVariant virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } - protected: - - QMap m_values; //!< values - bool m_wildcard; //!< wildcard - //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; + protected: + QMap m_values; //!< values + bool m_wildcard; //!< wildcard + public: //! \copydoc CValueObject::marshallToDbus void marshallToDbus(QDBusArgument &argument) const; diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h index 58011f30f..887be1b39 100644 --- a/src/blackmisc/setaudio.h +++ b/src/blackmisc/setaudio.h @@ -49,7 +49,6 @@ namespace BlackMisc //! Init with meaningful default values void initDefaultValues(); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h index 27b925cef..7f0c6bcee 100644 --- a/src/blackmisc/setkeyboardhotkey.h +++ b/src/blackmisc/setkeyboardhotkey.h @@ -88,7 +88,6 @@ namespace BlackMisc //! \copydoc CValueObject::propertyByIndex virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index 1b7cb6dad..7f4149a47 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -97,7 +97,6 @@ namespace BlackMisc //! Init with meaningful default values void initDefaultValues(); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index e2342fef8..6c2185e00 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -140,7 +140,6 @@ namespace BlackMisc //! Model type static QString modelTypeToString(ModelType type); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h index a875484c0..427952b3f 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h @@ -128,7 +128,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex virtual void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/setsimulator.h b/src/blackmisc/simulation/setsimulator.h index 67424c40e..303c6f762 100644 --- a/src/blackmisc/simulation/setsimulator.h +++ b/src/blackmisc/simulation/setsimulator.h @@ -78,7 +78,6 @@ namespace BlackMisc //! \copydoc BlackCore::IContextSettings::value virtual BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 4db1b893b..93a826768 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -105,7 +105,6 @@ namespace BlackMisc //! Set the synchronisation flag void setPartsSynchronized(bool synchronized) { m_partsSynchronized = synchronized; } - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h index 71676919f..2e164654f 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.h +++ b/src/blackmisc/simulation/simulatorplugininfo.h @@ -71,7 +71,6 @@ namespace BlackMisc //! Description const QString &getDescription() const { return m_description; } - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h index d8d9c3de7..624c0cdcf 100644 --- a/src/blackmisc/simulation/simulatorsetup.h +++ b/src/blackmisc/simulation/simulatorsetup.h @@ -69,7 +69,6 @@ namespace BlackMisc //! Register metadata void static registerMetadata(); - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index aa4a7f72c..3056339f0 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -139,7 +139,6 @@ namespace BlackMisc //! Representing icon static const CIcon &convertToIcon(const CStatusMessage &statusMessage); - protected: //! \copydoc CValueObject::convertToQString virtual QString convertToQString(bool i18n = false) const override; diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index f7058d5c6..eef30e061 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -84,11 +84,11 @@ namespace BlackMisc //! \todo Here to avoid name hiding in PQ classes. Fix during policy refactoring. virtual void parseFromString(const QString &) { qFatal("Not implemented"); } - protected: //! 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; diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h index 6da313164..6fd4f4a7c 100644 --- a/tests/blackmisc/testvalueobject.h +++ b/tests/blackmisc/testvalueobject.h @@ -57,7 +57,6 @@ namespace BlackMisc //! \copydoc CValueObject::setPropertyByIndex void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override; - protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override;