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

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