refs #413 Access control of convertToQString changed from protected to public.

2026-03-22 14:55:36 +08:00 · 2015-04-30 21:11:12 +01:00
parent 97d83e5e41
commit b64ae55a86
61 changed files with 24 additions and 78 deletions
--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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) {}

--- 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;

--- 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
            {
--- 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);

--- 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;

--- 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) {}

--- 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;

--- 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);

--- 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;

--- 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;

--- 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
--- 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<C<T>>(); }

--- 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
--- 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;

--- 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;

--- 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;

--- 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;

--- 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<CLatitude, CEarthAngle<CLatitude>>
        {
-        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;

--- 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<CLongitude, CEarthAngle<CLongitude>>
        {
-        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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- a/src/blackmisc/network/aircraftmapping.h
+++ b/src/blackmisc/network/aircraftmapping.h
@@ -25,11 +25,10 @@ namespace BlackMisc
        class BLACKMISC_EXPORT CAircraftMapping : public CValueObject<CAircraftMapping>
        {

-        protected:
+        public:
            //! \copydoc CValueObject::convertToQString
            virtual QString convertToQString(bool i18n = false) const override;

-        public:
            //! Properties
            enum ColumnIndex
            {
--- 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;

--- 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;

--- 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;

--- 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;

--- 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<CVoiceCapabilities> &allCapabilities();

-        protected:
            //! \copydoc CValueObject::convertToQString
            virtual QString convertToQString(bool i18n = false) const override;

--- 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;

--- 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
            {
--- 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
--- a/src/blackmisc/pq/pqstring.h
+++ b/src/blackmisc/pq/pqstring.h
@@ -29,11 +29,10 @@ namespace BlackMisc
         */
        class BLACKMISC_EXPORT CPqString : public CValueObject<CPqString>
        {
-        protected:
+        public:
            //! \copydoc CValueObject::convertToQString
            virtual QString convertToQString(bool i18n = false) const override;

-        public:
            //! Number separators / group separators
            enum SeparatorMode
            {
--- a/src/blackmisc/propertyindex.h
+++ b/src/blackmisc/propertyindex.h
@@ -127,10 +127,10 @@ namespace BlackMisc
            return static_cast<int>(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;

--- 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<CPropertyIndex, CVariant> m_values; //!< values
-        bool m_wildcard; //!< wildcard
-
        //! \copydoc CValueObject::convertToQString
        virtual QString convertToQString(bool i18n = false) const override;

+    protected:
+        QMap<CPropertyIndex, CVariant> m_values; //!< values
+        bool m_wildcard; //!< wildcard
+
    public:
        //! \copydoc CValueObject::marshallToDbus
        void marshallToDbus(QDBusArgument &argument) const;
--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;

--- 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;