flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-08 12:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 Make all value class methods non-virtual.

Browse Source 
toCVariant() and convertFromCVariant() are now deprecated,
use CVariant::from() and CVariant::to() instead.
This commit is contained in:
Mathew Sutcliffe
2015-05-05 17:08:30 +01:00
parent fe08792bef
commit 6b40cde862
90 changed files with 234 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/audio/audiodeviceinfo.h
View File

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

4
src/blackmisc/audio/audiodeviceinfolist.h
View File

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

6
src/blackmisc/audio/voiceroom.h
View File

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

4
src/blackmisc/audio/voiceroomlist.h
View File

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

8
src/blackmisc/aviation/aircraft.h
View File

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

2
src/blackmisc/aviation/aircraftengine.h
View File

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

4
src/blackmisc/aviation/aircraftenginelist.h
View File

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

6
src/blackmisc/aviation/aircrafticao.h
View File

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

6
src/blackmisc/aviation/aircraftlights.h
View File

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

4
src/blackmisc/aviation/aircraftlist.h
View File

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

6
src/blackmisc/aviation/aircraftparts.h
View File

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

4
src/blackmisc/aviation/aircraftpartslist.h
View File

@@ -36,10 +36,10 @@ namespace BlackMisc
CAircraftPartsList(const CSequence<CAircraftParts> &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();

6
src/blackmisc/aviation/aircraftsituation.h
View File

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

4
src/blackmisc/aviation/aircraftsituationlist.h
View File

@@ -36,10 +36,10 @@ namespace BlackMisc
CAircraftSituationList(const CSequence<CAircraftSituation> &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();

6
src/blackmisc/aviation/airport.h
View File

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

2
src/blackmisc/aviation/airporticao.h
View File

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

4
src/blackmisc/aviation/airportlist.h
View File

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

8
src/blackmisc/aviation/altitude.h
View File

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

8
src/blackmisc/aviation/atcstation.h
View File

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

4
src/blackmisc/aviation/atcstationlist.h
View File

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

5
src/blackmisc/aviation/avionicsbase.h
View File

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

8
src/blackmisc/aviation/callsign.h
View File

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

4
src/blackmisc/aviation/callsignset.h
View File

@@ -33,10 +33,10 @@ namespace BlackMisc
CCallsignSet(const CCollection<CCallsign> &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();

4
src/blackmisc/aviation/flightplan.h
View File

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

2
src/blackmisc/aviation/heading.h
View File

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

2
src/blackmisc/aviation/informationmessage.h
View File

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

6
src/blackmisc/aviation/modulator.h
View File

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

2
src/blackmisc/aviation/selcal.h
View File

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

2
src/blackmisc/aviation/track.h
View File

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

6
src/blackmisc/aviation/transponder.h
View File

@@ -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?

6
src/blackmisc/containerbase.h
View File

@@ -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<T> >(&derived(), variant); }
void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant< C<T> >(&derived(), variant); }
//! Simplifies composition, returns 0 for performance
friend uint qHash(const C<T> &) { 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); }

6
src/blackmisc/dictionary.h
View File

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

2
src/blackmisc/eveventhotkeyfunction.h
View File

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

2
src/blackmisc/evoriginator.h
View File

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

8
src/blackmisc/geo/coordinategeodetic.h
View File

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

4
src/blackmisc/geo/earthangle.h
View File

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

2
src/blackmisc/geo/latitude.h
View File

@@ -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())

2
src/blackmisc/geo/longitude.h
View File

@@ -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())

6
src/blackmisc/hardware/joystickbutton.h
View File

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

6
src/blackmisc/hardware/keyboardkey.h
View File

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

2
src/blackmisc/hardware/keyboardkeylist.h
View File

@@ -35,7 +35,7 @@ namespace BlackMisc
CKeyboardKeyList(const CSequence<CKeyboardKey> &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();

2
src/blackmisc/hotkeyfunction.h
View File

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

2
src/blackmisc/icon.h
View File

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

2
src/blackmisc/iconlist.h
View File

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

2
src/blackmisc/logcategory.h
View File

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

2
src/blackmisc/logcategorylist.h
View File

@@ -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:
/*

2
src/blackmisc/logpattern.h
View File

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

8
src/blackmisc/namevariantpair.h
View File

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

4
src/blackmisc/namevariantpairlist.h
View File

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

6
src/blackmisc/network/aircraftmapping.h
View File

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

4
src/blackmisc/network/aircraftmappinglist.h
View File

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

8
src/blackmisc/network/client.h
View File

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

2
src/blackmisc/network/clientlist.h
View File

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

6
src/blackmisc/network/server.h
View File

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

4
src/blackmisc/network/serverlist.h
View File

@@ -34,10 +34,10 @@ namespace BlackMisc
CServerList(const CSequence<CServer> &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();

10
src/blackmisc/network/textmessage.h
View File

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

4
src/blackmisc/network/textmessagelist.h
View File

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

8
src/blackmisc/network/user.h
View File

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

4
src/blackmisc/network/userlist.h
View File

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

4
src/blackmisc/network/voicecapabilities.h
View File

@@ -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<CVoiceCapabilities> &allCapabilities();
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CVoiceCapabilities)

4
src/blackmisc/pixmap.h
View File

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

2
src/blackmisc/pq/angle.h
View File

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

5
src/blackmisc/pq/measurementunit.h
View File

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

10
src/blackmisc/pq/physicalquantity.h
View File

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

2
src/blackmisc/pq/pqstring.h
View File

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

4
src/blackmisc/pq/time.h
View File

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

4
src/blackmisc/propertyindex.h
View File

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

4
src/blackmisc/propertyindexlist.h
View File

@@ -35,10 +35,10 @@ namespace BlackMisc
CPropertyIndexList(const CSequence<CPropertyIndex> &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();

6
src/blackmisc/propertyindexvariantmap.h
View File

@@ -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<CPropertyIndex, CVariant> m_values; //!< values

4
src/blackmisc/setaudio.h
View File

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

6
src/blackmisc/setkeyboardhotkey.h
View File

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

4
src/blackmisc/setkeyboardhotkeylist.h
View File

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

4
src/blackmisc/setnetwork.h
View File

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

6
src/blackmisc/simulation/aircraftmodel.h
View File

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

4
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -34,7 +34,7 @@ namespace BlackMisc
CAircraftModelList(const CSequence<CAircraftModel> &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();

6
src/blackmisc/simulation/fscommon/aircraftcfgentries.h
View File

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

4
src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h
View File

@@ -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()

4
src/blackmisc/simulation/setsimulator.h
View File

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

6
src/blackmisc/simulation/simulatedaircraft.h
View File

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

4
src/blackmisc/simulation/simulatedaircraftlist.h
View File

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

2
src/blackmisc/simulation/simulatorinfolist.h
View File

@@ -33,7 +33,7 @@ namespace BlackMisc
CSimulatorPluginInfoList(const CSequence<CSimulatorPluginInfo> &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);

2
src/blackmisc/simulation/simulatorplugininfo.h
View File

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

6
src/blackmisc/simulation/simulatorsetup.h
View File

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

8
src/blackmisc/statusmessage.h
View File

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

4
src/blackmisc/statusmessagelist.h
View File

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

3
src/blackmisc/timestampbased.h
View File

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

54
src/blackmisc/valueobject.h
View File

@@ -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<Derived>::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<Derived>::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<const Derived *>(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<const Derived *>(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<const Derived *>(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<const Derived *>(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<Derived>::toQString;
//! \copydoc BlackMisc::Mixin::String::toFormattedQString
virtual QString toFormattedQString(bool i18n = false) const override { return this->Mixin::String<Derived>::toQString(i18n); }
using Mixin::String<Derived>::toFormattedQString;
//! \copydoc BlackMisc::Mixin::String::toStdString
using Mixin::String<Derived>::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<Derived>::getMetaTypeId;
public:
//! \copydoc BlackMisc::Mixin::String::stringForStreaming
virtual QString stringForStreaming() const override { return this->Mixin::String<Derived>::stringForStreaming(); }
using Mixin::String<Derived>::stringForStreaming;
//! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
using Mixin::DBusByTuple<Derived, Policy::DBus::IsMetaTuple<Derived, Base>::value>::marshallToDbus;

14
src/blackmisc/variant.h
View File

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

4
src/blackmisc/variantlist.h
View File

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