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

refs #91 & #124 using override and \copydoc throughout blackmisc

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-02-16 23:52:42 +00:00
parent 3c8d4819e9
commit 35e0c3e085
49 changed files with 405 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/blackmisc/avaircraft.h
View File

@@ -39,9 +39,9 @@ namespace BlackMisc
: m_callsign(callsign), m_pilot(user), m_situation(situation), m_distanceToPlane(-1.0, BlackMisc::PhysicalQuantities::CLengthUnit::NM()) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -139,17 +139,17 @@ namespace BlackMisc
const BlackMisc::PhysicalQuantities::CSpeed &getGroundSpeed() const { return this->m_situation.getGroundSpeed(); }
/*!
* \brief Get latitude
* \copydoc ICoordinateGeodetic::latitude
*/
virtual const BlackMisc::Geo::CLatitude &latitude() const { return this->m_situation.latitude(); }
virtual const BlackMisc::Geo::CLatitude &latitude() const override { return this->m_situation.latitude(); }
/*!
* \brief Get longitude
* \copydoc ICoordinateGeodetic::longitude
*/
virtual const BlackMisc::Geo::CLongitude &longitude() const { return this->m_situation.longitude(); }
virtual const BlackMisc::Geo::CLongitude &longitude() const override { return this->m_situation.longitude(); }
/*!
* \brief Get height (height of current position)
* \copydoc CCoordinateGeodetic::height
*/
const BlackMisc::PhysicalQuantities::CLength &getHeight() const { return this->m_situation.getHeight(); }
@@ -259,9 +259,9 @@ namespace BlackMisc
bool operator !=(const CAircraft &other) const;
/*!
* \brief Value hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -297,35 +297,23 @@ namespace BlackMisc
virtual void setPropertyByIndex(const QVariant &variant, int index) override;
protected:
/*!
* \copydoc CValueObject::convertToQString()
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \copydoc CValueObject::marshallToDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::marshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::marshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
CCallsign m_callsign;

2
src/blackmisc/avaircrafticao.h
View File

@@ -135,7 +135,7 @@ namespace BlackMisc
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;

6
src/blackmisc/avaircraftsituation.h
View File

@@ -77,10 +77,10 @@ namespace BlackMisc
void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; }
//! \copydoc ICoordinateGeodetic::latitude()
virtual const BlackMisc::Geo::CLatitude &latitude() const { return this->m_position.latitude(); }
virtual const BlackMisc::Geo::CLatitude &latitude() const override { return this->m_position.latitude(); }
//! \copydoc ICoordinateGeodetic::longitude()
virtual const BlackMisc::Geo::CLongitude &longitude() const { return this->m_position.longitude(); }
virtual const BlackMisc::Geo::CLongitude &longitude() const override { return this->m_position.longitude(); }
//! \copydoc CCoordinateGeodetic::height
const BlackMisc::PhysicalQuantities::CLength &getHeight() const { return this->m_position.height(); }
@@ -128,7 +128,7 @@ namespace BlackMisc
bool operator !=(const CAircraftSituation &other) const;
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
//! \brief Register metadata
static void registerMetadata();

27
src/blackmisc/avaltitude.h
View File

@@ -33,38 +33,34 @@ namespace BlackMisc
protected:
/*!
* \brief Specific stream operation for Altitude
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n) const;
virtual QString convertToQString(bool i18n) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -120,10 +116,9 @@ namespace BlackMisc
}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

8
src/blackmisc/avatcstation.h
View File

@@ -82,7 +82,7 @@ namespace BlackMisc
const CInformationMessage &atis = CInformationMessage(CInformationMessage::ATIS), const CInformationMessage &metar = CInformationMessage(CInformationMessage::METAR));
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -268,13 +268,13 @@ namespace BlackMisc
//! Set booked until
void setBookedUntilUtc(const QDateTime &until) { this->m_bookedUntilUtc = until; }
//! \brief Latitude
//! \copydoc ICoordinateGeodetic::latitude
virtual const BlackMisc::Geo::CLatitude &latitude() const override
{
return this->getPosition().latitude();
}
//! \brief Longitude
//! \copydoc ICoordinateGeodetic::longitude
virtual const BlackMisc::Geo::CLongitude &longitude() const override
{
return this->getPosition().longitude();
@@ -297,7 +297,7 @@ namespace BlackMisc
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;

40
src/blackmisc/avcallsign.h
View File

@@ -103,9 +103,9 @@ namespace BlackMisc
bool operator <(const CCallsign &other) const;
/*!
* \brief CValueObject::getValueHash()
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -113,35 +113,23 @@ namespace BlackMisc
static void registerMetadata();
protected:
/*!
* \copydoc CValueObject::convertToQString()
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \copydoc CValueObject::marshallToDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
/*!
* \brief Unify the callsign

31
src/blackmisc/avinformationmessage.h
View File

@@ -53,10 +53,9 @@ namespace BlackMisc
{}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -147,9 +146,9 @@ namespace BlackMisc
bool isEmpty() const { return this->m_message.isEmpty(); }
/*!
* \brief Value hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -158,38 +157,34 @@ namespace BlackMisc
protected:
/*!
* \brief Rounded value as string
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
InformationType m_type;

10
src/blackmisc/avioadfsystem.h
View File

@@ -48,10 +48,9 @@ namespace BlackMisc
protected:
/*!
* \brief Are the set values valid / in range?
* \return
* \copydoc CAvionicsBase::validValues
*/
bool validValues() const
virtual bool validValues() const override
{
if (this->isDefaultValue()) return true; // special case
return
@@ -102,10 +101,9 @@ namespace BlackMisc
}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

10
src/blackmisc/aviobase.h
View File

@@ -61,17 +61,17 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const { return 0; }
virtual int getMetaTypeId() const override { return 0; }
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const { return this->CValueObject::isA(metaTypeId); }
virtual bool isA(int metaTypeId) const override { return this->CValueObject::isA(metaTypeId); }
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const
virtual int compareImpl(const CValueObject &other) const override
{
Q_UNUSED(other);
qFatal("not implemented");
@@ -81,7 +81,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::marshallToDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const
virtual void marshallToDbus(QDBusArgument &argument) const override
{
argument << this->m_name;
}
@@ -89,7 +89,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
argument >> this->m_name;
}

14
src/blackmisc/aviocomsystem.h
View File

@@ -55,10 +55,9 @@ namespace BlackMisc
protected:
/*!
* \brief Are the set values valid / in range?
* \return
* \copydoc CAvionicsBase::validValues
*/
bool validValues() const;
virtual bool validValues() const override;
/*!
* \brief Validate values by assert and exception
@@ -72,12 +71,12 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::marshallFromDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -102,16 +101,15 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
/*!
* \copydoc CValueObject::getValueHash
* \return
*/
virtual uint getValueHash() const
virtual uint getValueHash() const override
{
return CModulator::getValueHash();
}

12
src/blackmisc/aviomodulator.h
View File

@@ -50,11 +50,9 @@ namespace BlackMisc
CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(digits) {}
/*!
* \brief String for converter
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const
virtual QString convertToQString(bool i18n = false) const override
{
QString s(this->getName());
s.append(" Active: ").append(this->m_frequencyActive.valueRoundedWithUnit(3, i18n));
@@ -207,17 +205,17 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::marshallFromDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
/*!
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
public:
/*!

10
src/blackmisc/avionavsystem.h
View File

@@ -56,10 +56,9 @@ namespace BlackMisc
protected:
/*!
* \brief Are the set values valid / in range?
* \return
* \copydoc CAvionicsBase::validValues
*/
bool validValues() const
virtual bool validValues() const override
{
if (this->isDefaultValue()) return true; // special case
bool v =
@@ -113,10 +112,9 @@ namespace BlackMisc
}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

28
src/blackmisc/aviotransponder.h
View File

@@ -66,10 +66,9 @@ namespace BlackMisc
protected:
/*!
* \brief Are the set values valid / in range?
* \return
* \copydoc CAvionicsBase::validValues
*/
bool validValues() const;
virtual bool validValues() const override;
/*!
* \brief Default value
@@ -90,23 +89,19 @@ namespace BlackMisc
bool validate(bool strict = true) const;
/*!
* \brief Meaningful string representation
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -178,10 +173,9 @@ namespace BlackMisc
}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -377,7 +371,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Is valid transponder code?

40
src/blackmisc/avselcal.h
View File

@@ -44,7 +44,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -79,7 +79,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -117,35 +117,23 @@ namespace BlackMisc
static const QStringList &codePairs();
protected:
/*!
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
QString m_code;

20
src/blackmisc/avtrack.h
View File

@@ -34,22 +34,19 @@ namespace BlackMisc
protected:
/*!
* \brief Specific stream operation for Track
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -73,10 +70,9 @@ namespace BlackMisc
CTrack(BlackMisc::PhysicalQuantities::CAngle track, ReferenceNorth north) : BlackMisc::PhysicalQuantities::CAngle(track), m_north(north) {}
/*!
* \brief As QVariant
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

12
src/blackmisc/context.h
View File

@@ -172,12 +172,12 @@ namespace BlackMisc
*/
CApplicationContext();
virtual const QObject *getQObjectNothrow(const QString &) const;
virtual void setQObject(QString, QObject &);
virtual void removeQObject(const QString &);
virtual void setApplicationName(QString appName) { m_appName = appName; }
virtual void setDefaultApplicationName();
virtual const QString &getApplicationName() const { return m_appName; }
virtual const QObject *getQObjectNothrow(const QString &) const override;
virtual void setQObject(QString, QObject &) override;
virtual void removeQObject(const QString &) override;
virtual void setApplicationName(QString appName) override { m_appName = appName; }
virtual void setDefaultApplicationName() override;
virtual const QString &getApplicationName() const override { return m_appName; }
private:
QMap<QString, QObject *> m_map;

8
src/blackmisc/coordinateecef.h
View File

@@ -38,10 +38,9 @@ namespace BlackMisc
explicit CCoordinateEcef(const BlackMisc::Math::CVector3D vector) : CVector3DBase(vector.i(), vector.j(), vector.k()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -111,8 +110,7 @@ namespace BlackMisc
protected:
/*!
* \brief String for converter
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const override
{

58
src/blackmisc/coordinategeodetic.h
View File

@@ -75,39 +75,23 @@ namespace BlackMisc
BlackMisc::PhysicalQuantities::CLength m_height; //!< height
protected:
/*!
* \brief String for converter
* \param i18n
* \return
*/
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -134,26 +118,23 @@ namespace BlackMisc
m_latitude(latitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg()), m_longitude(longitudeDegrees, BlackMisc::PhysicalQuantities::CAngleUnit::deg()), m_height(heightMeters, BlackMisc::PhysicalQuantities::CLengthUnit::m()) {}
/*!
* \brief Latitude
* \return
* \copydoc ICoordinateGeodetic::latitude
*/
const CLatitude &latitude() const
virtual const CLatitude &latitude() const override
{
return this->m_latitude;
}
/*!
* \brief Longitude
* \return
* \copydoc ICoordinateGeodetic::longitude
*/
const CLongitude &longitude() const
virtual const CLongitude &longitude() const override
{
return this->m_longitude;
}
/*!
* \brief Height
* \return
*/
const BlackMisc::PhysicalQuantities::CLength &height() const
{
@@ -161,10 +142,9 @@ namespace BlackMisc
}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -234,9 +214,9 @@ namespace BlackMisc
bool operator !=(const CCoordinateGeodetic &other) const;
/*!
* \brief value Hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* Register metadata

8
src/blackmisc/coordinatened.h
View File

@@ -24,8 +24,7 @@ namespace BlackMisc
protected:
/*!
* \brief String for converter
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const override
{
@@ -84,10 +83,9 @@ namespace BlackMisc
CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D &vector) : CVector3DBase(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

40
src/blackmisc/geoearthangle.h
View File

@@ -35,45 +35,29 @@ namespace BlackMisc
*/
CEarthAngle(const BlackMisc::PhysicalQuantities::CAngle &angle) : CAngle(angle) {}
/*!
* \brief String representation
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override
{
return this->valueRoundedWithUnit(BlackMisc::PhysicalQuantities::CAngleUnit::deg(), 6, i18n);
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override
{
this->CAngle::marshallToDbus(argument);
}
/*!
* \brief Stream from DBus >>
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
this->CAngle::unmarshallFromDbus(argument);
}

5
src/blackmisc/geolatitude.h
View File

@@ -49,10 +49,9 @@ namespace BlackMisc
CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle(value, unit) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/geolongitude.h
View File

@@ -46,10 +46,9 @@ namespace BlackMisc
CLongitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle(value, unit) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/mathmatrix1x3.h
View File

@@ -51,10 +51,9 @@ namespace BlackMisc
}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/mathmatrix3x1.h
View File

@@ -54,10 +54,9 @@ namespace BlackMisc
explicit CMatrix3x1(double fillValue) : CMatrixBase(fillValue) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/mathmatrix3x3.h
View File

@@ -65,10 +65,9 @@ namespace BlackMisc
}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

45
src/blackmisc/mathmatrixbase.h
View File

@@ -44,39 +44,23 @@ namespace BlackMisc
// no bug, Qt expects columns rows
QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
/*!
* \brief Conversion to string
* \param i18n
* \return
*/
QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
public:
/*!
@@ -105,10 +89,9 @@ namespace BlackMisc
QList<double> toList() const;
/*!
* \brief Value hash
* \return
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief List of values

5
src/blackmisc/mathvector3d.h
View File

@@ -40,10 +40,9 @@ namespace BlackMisc
CVector3D(const CVector3D &other) : CVector3DBase(other) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

45
src/blackmisc/mathvector3dbase.h
View File

@@ -73,39 +73,23 @@ namespace BlackMisc
*/
double &getElement(int row);
/*!
* \brief String for converter
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Unmarshall from Dbus
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
/*!
* \brief Marshall to Dbus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
public:
// getter and setters are implemented in the derived classes
@@ -338,10 +322,9 @@ namespace BlackMisc
CMatrix3x1 toMatrix3x1() const;
/*!
* \brief Value hash
* \return
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief length / magnitude

45
src/blackmisc/nwserver.h
View File

@@ -39,10 +39,9 @@ namespace BlackMisc
: m_name(name), m_description(description), m_address(address), m_port(port), m_user(user) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -117,7 +116,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -154,37 +153,23 @@ namespace BlackMisc
QString propertyByIndexAsString(int index, bool i18n) const;
protected:
/*!
* \copydoc CValueObject::convertToQString()
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString()
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
QString m_name;

40
src/blackmisc/nwtextmessage.h
View File

@@ -200,12 +200,12 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \copydoc CValueObject::toQVariant()
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -216,35 +216,23 @@ namespace BlackMisc
static void registerMetadata();
protected:
/*!
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFomDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFomDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
QString m_message;

16
src/blackmisc/nwuser.h
View File

@@ -51,7 +51,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::toQVariant()
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -157,7 +157,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::getValueHash()
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -179,22 +179,22 @@ namespace BlackMisc
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const;
virtual int getMetaTypeId() const override;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const;
virtual bool isA(int metaTypeId) const override;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const;
virtual int compareImpl(const CValueObject &other) const override;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
QString m_id;

5
src/blackmisc/pqacceleration.h
View File

@@ -37,10 +37,9 @@ namespace BlackMisc
CAcceleration(const CPhysicalQuantity &base) : CPhysicalQuantity(base) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqangle.h
View File

@@ -55,10 +55,9 @@ namespace BlackMisc
CAngleUnit::sexagesimalDegMin()) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

80
src/blackmisc/pqbase.h
View File

@@ -56,8 +56,8 @@ namespace BlackMisc
*/
struct NilConverter : public Converter
{
virtual double toDefault(double) const { return 0.0; }
virtual double fromDefault(double) const { return 0.0; }
virtual double toDefault(double) const override { return 0.0; }
virtual double fromDefault(double) const override { return 0.0; }
};
/*!
@@ -65,8 +65,8 @@ namespace BlackMisc
*/
struct IdentityConverter : public Converter
{
virtual double toDefault(double factor) const { return factor; }
virtual double fromDefault(double factor) const { return factor; }
virtual double toDefault(double factor) const override { return factor; }
virtual double fromDefault(double factor) const override { return factor; }
};
/*!
@@ -76,8 +76,8 @@ namespace BlackMisc
template <class Policy>
struct LinearConverter : public Converter
{
virtual double toDefault(double factor) const { return factor * Policy::factor(); }
virtual double fromDefault(double factor) const { return factor / Policy::factor(); }
virtual double toDefault(double factor) const override { return factor * Policy::factor(); }
virtual double fromDefault(double factor) const override { return factor / Policy::factor(); }
};
/*!
@@ -87,8 +87,8 @@ namespace BlackMisc
template <class Policy>
struct AffineConverter : public Converter
{
virtual double toDefault(double factor) const { return (factor - Policy::offset()) * Policy::factor(); }
virtual double fromDefault(double factor) const { return factor / Policy::factor() + Policy::offset(); }
virtual double toDefault(double factor) const override { return (factor - Policy::offset()) * Policy::factor(); }
virtual double fromDefault(double factor) const override { return factor / Policy::factor() + Policy::offset(); }
};
/*!
@@ -99,14 +99,14 @@ namespace BlackMisc
template <class FactorPolicy, class SubdivPolicy>
struct SubdivisionConverter : public Converter
{
virtual double toDefault(double factor) const
virtual double toDefault(double factor) const override
{
using BlackMisc::Math::CMath;
double part2 = CMath::fract(factor) * SubdivPolicy::fraction();
factor = CMath::trunc(factor) + part2 / SubdivPolicy::subfactor();
return factor * FactorPolicy::factor();
}
virtual double fromDefault(double factor) const
virtual double fromDefault(double factor) const override
{
using BlackMisc::Math::CMath;
factor /= FactorPolicy::factor();
@@ -123,7 +123,7 @@ namespace BlackMisc
template <class FactorPolicy, class SubdivPolicy>
struct SubdivisionConverter2 : public Converter
{
virtual double toDefault(double factor) const
virtual double toDefault(double factor) const override
{
using BlackMisc::Math::CMath;
double part2 = CMath::fract(factor) * SubdivPolicy::fraction();
@@ -131,7 +131,7 @@ namespace BlackMisc
factor = CMath::trunc(factor) + (CMath::trunc(part2) + part3 / SubdivPolicy::subfactor()) / SubdivPolicy::subfactor();
return factor * FactorPolicy::factor();
}
virtual double fromDefault(double factor) const
virtual double fromDefault(double factor) const override
{
using BlackMisc::Math::CMath;
factor /= FactorPolicy::factor();
@@ -218,53 +218,35 @@ namespace BlackMisc
: m_name(name), m_symbol(symbol), m_epsilon(epsilon), m_displayDigits(displayDigits), m_converter(new Converter)
{}
/*!
* \brief String for streaming operators is full name
* \return
*/
virtual QString stringForStreaming() const
//! \copydoc CValueObject::stringForStreaming
virtual QString stringForStreaming() const override
{
return this->getName(false);
}
/*!
* \brief Name as stringification
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override
{
return this->getSymbol(i18n);
}
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override
{
argument << this->m_symbol;
}
/*!
* \brief Stream from DBus
*/
virtual void unmarshallFromDbus(const QDBusArgument &)
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &) override
{
// the concrete implementations will override this default
// this is required so I can also stream None
@@ -280,10 +262,9 @@ namespace BlackMisc
{}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
// used with None!
return QVariant::fromValue(*this);
@@ -324,10 +305,9 @@ namespace BlackMisc
}
/*!
* \brief Value hash
* \return
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const
virtual uint getValueHash() const override
{
return qHash(this->getName());
}

5
src/blackmisc/pqfrequency.h
View File

@@ -30,10 +30,9 @@ namespace BlackMisc
CFrequency(double value, const CFrequencyUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqlength.h
View File

@@ -31,10 +31,9 @@ namespace BlackMisc
CLength(double value, const CLengthUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqmass.h
View File

@@ -31,10 +31,9 @@ namespace BlackMisc
CMass(double value, const CMassUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

27
src/blackmisc/pqphysicalquantity.h
View File

@@ -67,26 +67,24 @@ namespace BlackMisc
CPhysicalQuantity(const CPhysicalQuantity &other);
/*!
* \brief Rounded value as string
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
virtual int compareImpl(const CValueObject &other) const override;
public:
/*!
@@ -356,22 +354,19 @@ namespace BlackMisc
}
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
/*!
* \brief Value hash
* \return
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata of unit and quantity

5
src/blackmisc/pqpressure.h
View File

@@ -33,10 +33,9 @@ namespace BlackMisc
CPressure(double value, const CPressureUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqspeed.h
View File

@@ -32,10 +32,9 @@ namespace BlackMisc
CSpeed(double value, const CSpeedUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqtemperature.h
View File

@@ -32,10 +32,9 @@ namespace BlackMisc
CTemperature(double value, const CTemperatureUnit &unit): CPhysicalQuantity(value, unit) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

5
src/blackmisc/pqtime.h
View File

@@ -33,10 +33,9 @@ namespace BlackMisc
CTime(double value, const CTimeUnit &unit) : CPhysicalQuantity(value, unit) {}
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}

106
src/blackmisc/pqunits.h
View File

@@ -50,10 +50,9 @@ namespace BlackMisc
CLengthUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -156,10 +155,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -188,10 +186,9 @@ namespace BlackMisc
CAngleUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -203,13 +200,9 @@ namespace BlackMisc
static const CAngleUnit &defaultUnit() { return deg(); }
/*!
* \brief Override for sexagesimal degrees.
* \param value
* \param digits
* \param i18n
* \return
* \copydoc CMeasurementUnit::makeRoundedQStringWithUnit
*/
virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool i18n = false) const;
virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool i18n = false) const override;
/*!
* \brief Radians
@@ -274,10 +267,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -305,10 +297,9 @@ namespace BlackMisc
CFrequencyUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -378,10 +369,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -410,10 +400,9 @@ namespace BlackMisc
CMassUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -494,10 +483,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -528,10 +516,9 @@ namespace BlackMisc
CPressureUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -633,10 +620,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -673,10 +659,9 @@ namespace BlackMisc
CTemperatureUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -735,10 +720,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -769,10 +753,9 @@ namespace BlackMisc
CSpeedUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -864,10 +847,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -898,10 +880,9 @@ namespace BlackMisc
CTimeUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -913,13 +894,9 @@ namespace BlackMisc
static const CTimeUnit &defaultUnit() { return s(); }
/*!
* \brief Override for subdivisional units.
* \param value
* \param digits
* \param i18n
* \return
* \copydoc CMeasurementUnit::makeRoundedQStringWithUnit
*/
virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool i18n = false) const;
virtual QString makeRoundedQStringWithUnit(double value, int digits = -1, bool i18n = false) const override;
/*!
* \brief Second s
@@ -1025,10 +1002,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;
@@ -1056,10 +1032,9 @@ namespace BlackMisc
CAccelerationUnit() : CMeasurementUnit(defaultUnit()) {}
/*!
* \brief Virtual method to return QVariant, used with DBUS QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -1107,10 +1082,9 @@ namespace BlackMisc
protected:
/*!
* \brief Stream from DBus
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument)
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
{
QString unitName;
argument >> unitName;

46
src/blackmisc/setnetwork.h
View File

@@ -59,7 +59,7 @@ namespace BlackMisc
/*!
* \copydoc CValueObject::toQVariant()
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -109,9 +109,9 @@ namespace BlackMisc
virtual BlackMisc::CStatusMessageList value(const QString &path, const QString &command, const QVariant &value, bool &changedFlag);
/*!
* \brief Value hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -119,39 +119,23 @@ namespace BlackMisc
static void registerMetadata();
protected:
/*!
* \brief Rounded value as string
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
BlackMisc::Network::CServerList m_trafficNetworkServers;

2
src/blackmisc/statusmessage.h
View File

@@ -83,7 +83,7 @@ namespace BlackMisc
}
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const override

31
src/blackmisc/valuemap.h
View File

@@ -38,10 +38,9 @@ namespace BlackMisc
CValueMap(int index, const QVariant &value);
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -111,9 +110,9 @@ namespace BlackMisc
const QMap<int, QVariant> &map() const { return this->m_values; }
/*!
* \brief Value hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Metadata
@@ -125,38 +124,34 @@ namespace BlackMisc
bool m_wildcard; //!< wildcard
/*!
* \brief Meaningful string representation
* \param i18n
* \return
* \copydoc CValueObject::convertToQString
*/
virtual QString convertToQString(bool i18n = false) const;
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
* \copydoc CValueObject::marshallToDbus
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
* \copydoc CValueObject::unmarshallFromDbus
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
};
}

45
src/blackmisc/vaudiodevice.h
View File

@@ -49,10 +49,9 @@ namespace BlackMisc
CAudioDevice(DeviceType type, const qint16 index, const QString &getName);
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -85,7 +84,7 @@ namespace BlackMisc
bool operator !=(const CAudioDevice &other) const;
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
//! \brief Register metadata
static void registerMetadata();
@@ -110,37 +109,23 @@ namespace BlackMisc
protected:
/*!
* \brief Rounded value as string
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \copydoc CValueObject::marshallToDbus()
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus()
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \copydoc CValueObject::unmarshallFromDbus()
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus()
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
protected:
/*!

49
src/blackmisc/vvoiceroom.h
View File

@@ -46,10 +46,9 @@ namespace BlackMisc
CVoiceRoom(const QString &serverUrl, bool connected = false);
/*!
* \brief QVariant, required for DBus QVariant lists
* \return
* \copydoc CValueObject::toQVariant
*/
virtual QVariant toQVariant() const
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
@@ -133,9 +132,9 @@ namespace BlackMisc
bool operator !=(const CVoiceRoom &other) const;
/*!
* \brief Value hash
* \copydoc CValueObject::getValueHash
*/
virtual uint getValueHash() const;
virtual uint getValueHash() const override;
/*!
* \brief Register metadata
@@ -156,39 +155,23 @@ namespace BlackMisc
protected:
/*!
* \brief Rounded value as string
* \param i18n
* \return
*/
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
/*!
* \copydoc CValueObject::getMetaTypeId
*/
virtual int getMetaTypeId() const;
//! \copydoc CValueObject::getMetaTypeId
virtual int getMetaTypeId() const override;
/*!
* \copydoc CValueObject::isA
*/
virtual bool isA(int metaTypeId) const;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
/*!
* \copydoc CValueObject::compareImpl
*/
virtual int compareImpl(const CValueObject &other) const;
//! \copydoc CValueObject::compareImpl
virtual int compareImpl(const CValueObject &other) const override;
/*!
* \brief Stream to DBus <<
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
/*!
* \brief Stream from DBus >>
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
QString m_hostname;