mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 09:15:34 +08:00
Ref T120, PQ units: made final and removed virtual dtor
This commit is contained in:
committed by
Mathew Sutcliffe
parent
c066ffcd28
commit
f936f07c8d
@@ -41,7 +41,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
|
|
||||||
//! Specialized class for distance units (meter, foot, nautical miles).
|
//! Specialized class for distance units (meter, foot, nautical miles).
|
||||||
class BLACKMISC_EXPORT CLengthUnit :
|
class BLACKMISC_EXPORT CLengthUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CLengthUnit>,
|
public Mixin::MetaType<CLengthUnit>,
|
||||||
public Mixin::DBusOperators<CLengthUnit>,
|
public Mixin::DBusOperators<CLengthUnit>,
|
||||||
@@ -68,9 +68,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CLengthUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CLengthUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CLengthUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CLengthUnit defaultUnit() { return m(); }
|
static CLengthUnit defaultUnit() { return m(); }
|
||||||
|
|
||||||
@@ -157,7 +154,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for angles (degrees, radian).
|
//! Specialized class for angles (degrees, radian).
|
||||||
class BLACKMISC_EXPORT CAngleUnit :
|
class BLACKMISC_EXPORT CAngleUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CAngleUnit>,
|
public Mixin::MetaType<CAngleUnit>,
|
||||||
public Mixin::DBusOperators<CAngleUnit>,
|
public Mixin::DBusOperators<CAngleUnit>,
|
||||||
@@ -181,9 +178,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CAngleUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CAngleUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CAngleUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CAngleUnit defaultUnit() { return deg(); }
|
static CAngleUnit defaultUnit() { return deg(); }
|
||||||
|
|
||||||
@@ -254,7 +248,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for frequency (hertz, mega hertz, kilo hertz).
|
//! Specialized class for frequency (hertz, mega hertz, kilo hertz).
|
||||||
class BLACKMISC_EXPORT CFrequencyUnit :
|
class BLACKMISC_EXPORT CFrequencyUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CFrequencyUnit>,
|
public Mixin::MetaType<CFrequencyUnit>,
|
||||||
public Mixin::DBusOperators<CFrequencyUnit>,
|
public Mixin::DBusOperators<CFrequencyUnit>,
|
||||||
@@ -277,9 +271,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CFrequencyUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CFrequencyUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CFrequencyUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CFrequencyUnit defaultUnit() { return Hz(); }
|
static CFrequencyUnit defaultUnit() { return Hz(); }
|
||||||
|
|
||||||
@@ -342,7 +333,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for mass units (kg, lbs).
|
//! Specialized class for mass units (kg, lbs).
|
||||||
class BLACKMISC_EXPORT CMassUnit :
|
class BLACKMISC_EXPORT CMassUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CMassUnit>,
|
public Mixin::MetaType<CMassUnit>,
|
||||||
public Mixin::DBusOperators<CMassUnit>,
|
public Mixin::DBusOperators<CMassUnit>,
|
||||||
@@ -366,9 +357,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CMassUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CMassUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CMassUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CMassUnit defaultUnit() { return kg(); }
|
static CMassUnit defaultUnit() { return kg(); }
|
||||||
|
|
||||||
@@ -439,7 +427,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for pressure (psi, hPa, bar).
|
//! Specialized class for pressure (psi, hPa, bar).
|
||||||
class BLACKMISC_EXPORT CPressureUnit :
|
class BLACKMISC_EXPORT CPressureUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CPressureUnit>,
|
public Mixin::MetaType<CPressureUnit>,
|
||||||
public Mixin::DBusOperators<CPressureUnit>,
|
public Mixin::DBusOperators<CPressureUnit>,
|
||||||
@@ -465,9 +453,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CPressureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CPressureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CPressureUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CPressureUnit defaultUnit() { return hPa(); }
|
static CPressureUnit defaultUnit() { return hPa(); }
|
||||||
|
|
||||||
@@ -553,7 +538,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for temperatur units (kelvin, centidegree).
|
//! Specialized class for temperatur units (kelvin, centidegree).
|
||||||
class BLACKMISC_EXPORT CTemperatureUnit :
|
class BLACKMISC_EXPORT CTemperatureUnit final :
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CTemperatureUnit>,
|
public Mixin::MetaType<CTemperatureUnit>,
|
||||||
public Mixin::DBusOperators<CTemperatureUnit>,
|
public Mixin::DBusOperators<CTemperatureUnit>,
|
||||||
@@ -585,9 +570,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CTemperatureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CTemperatureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CTemperatureUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CTemperatureUnit defaultUnit() { return C(); }
|
static CTemperatureUnit defaultUnit() { return C(); }
|
||||||
|
|
||||||
@@ -642,7 +624,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for speed units (m/s, ft/s, NM/h).
|
//! Specialized class for speed units (m/s, ft/s, NM/h).
|
||||||
class BLACKMISC_EXPORT CSpeedUnit :
|
class BLACKMISC_EXPORT CSpeedUnit final:
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CSpeedUnit>,
|
public Mixin::MetaType<CSpeedUnit>,
|
||||||
public Mixin::DBusOperators<CSpeedUnit>,
|
public Mixin::DBusOperators<CSpeedUnit>,
|
||||||
@@ -668,9 +650,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CSpeedUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CSpeedUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CSpeedUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CSpeedUnit defaultUnit() { return m_s(); }
|
static CSpeedUnit defaultUnit() { return m_s(); }
|
||||||
|
|
||||||
@@ -749,7 +728,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for time units (ms, hour, min).
|
//! Specialized class for time units (ms, hour, min).
|
||||||
class BLACKMISC_EXPORT CTimeUnit :
|
class BLACKMISC_EXPORT CTimeUnit final:
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CTimeUnit>,
|
public Mixin::MetaType<CTimeUnit>,
|
||||||
public Mixin::DBusOperators<CTimeUnit>,
|
public Mixin::DBusOperators<CTimeUnit>,
|
||||||
@@ -775,9 +754,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CTimeUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CTimeUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CTimeUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CTimeUnit defaultUnit() { return s(); }
|
static CTimeUnit defaultUnit() { return s(); }
|
||||||
|
|
||||||
@@ -880,7 +856,7 @@ namespace BlackMisc
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Specialized class for acceleration units (m/s2, ft/s2).
|
//! Specialized class for acceleration units (m/s2, ft/s2).
|
||||||
class BLACKMISC_EXPORT CAccelerationUnit :
|
class BLACKMISC_EXPORT CAccelerationUnit final:
|
||||||
public CMeasurementUnit,
|
public CMeasurementUnit,
|
||||||
public Mixin::MetaType<CAccelerationUnit>,
|
public Mixin::MetaType<CAccelerationUnit>,
|
||||||
public Mixin::DBusOperators<CAccelerationUnit>,
|
public Mixin::DBusOperators<CAccelerationUnit>,
|
||||||
@@ -903,9 +879,6 @@ namespace BlackMisc
|
|||||||
//! Null constructor
|
//! Null constructor
|
||||||
CAccelerationUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
CAccelerationUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~CAccelerationUnit() final = default;
|
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static CAccelerationUnit defaultUnit() { return m_s2(); }
|
static CAccelerationUnit defaultUnit() { return m_s2(); }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user