flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 13:35:34 +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/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