mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-15 01:05:35 +08:00
refs #837 Abbreviated syntax for specifying a null unit.
This commit is contained in:
@@ -53,7 +53,6 @@ namespace BlackMisc
|
|||||||
CMeasurementUnit(name, symbol, converter, displayDigits, epsilon)
|
CMeasurementUnit(name, symbol, converter, displayDigits, epsilon)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
//! null constructor
|
|
||||||
CLengthUnit(const QString &name, const QString &symbol, std::nullptr_t) :
|
CLengthUnit(const QString &name, const QString &symbol, std::nullptr_t) :
|
||||||
CMeasurementUnit(name, symbol, nullptr)
|
CMeasurementUnit(name, symbol, nullptr)
|
||||||
{}
|
{}
|
||||||
@@ -73,6 +72,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CLengthUnit() : CMeasurementUnit(defaultUnit()) {}
|
CLengthUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CLengthUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CLengthUnit &defaultUnit() { return m(); }
|
static const CLengthUnit &defaultUnit() { return m(); }
|
||||||
|
|
||||||
@@ -188,6 +190,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CAngleUnit() : CMeasurementUnit(defaultUnit()) {}
|
CAngleUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CAngleUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CAngleUnit &defaultUnit() { return deg(); }
|
static const CAngleUnit &defaultUnit() { return deg(); }
|
||||||
|
|
||||||
@@ -286,6 +291,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CFrequencyUnit() : CMeasurementUnit(defaultUnit()) {}
|
CFrequencyUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CFrequencyUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CFrequencyUnit &defaultUnit() { return Hz(); }
|
static const CFrequencyUnit &defaultUnit() { return Hz(); }
|
||||||
|
|
||||||
@@ -377,6 +385,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CMassUnit() : CMeasurementUnit(defaultUnit()) {}
|
CMassUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CMassUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CMassUnit &defaultUnit() { return kg(); }
|
static const CMassUnit &defaultUnit() { return kg(); }
|
||||||
|
|
||||||
@@ -478,6 +489,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CPressureUnit() : CMeasurementUnit(defaultUnit()) {}
|
CPressureUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CPressureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CPressureUnit &defaultUnit() { return hPa(); }
|
static const CPressureUnit &defaultUnit() { return hPa(); }
|
||||||
|
|
||||||
@@ -600,6 +614,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CTemperatureUnit() : CMeasurementUnit(defaultUnit()) {}
|
CTemperatureUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CTemperatureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CTemperatureUnit &defaultUnit() { return C(); }
|
static const CTemperatureUnit &defaultUnit() { return C(); }
|
||||||
|
|
||||||
@@ -685,6 +702,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CSpeedUnit() : CMeasurementUnit(defaultUnit()) {}
|
CSpeedUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CSpeedUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CSpeedUnit &defaultUnit() { return m_s(); }
|
static const CSpeedUnit &defaultUnit() { return m_s(); }
|
||||||
|
|
||||||
@@ -794,6 +814,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CTimeUnit() : CMeasurementUnit(defaultUnit()) {}
|
CTimeUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CTimeUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CTimeUnit &defaultUnit() { return s(); }
|
static const CTimeUnit &defaultUnit() { return s(); }
|
||||||
|
|
||||||
@@ -924,6 +947,9 @@ namespace BlackMisc
|
|||||||
//! Default constructor, required for Qt Metasystem
|
//! Default constructor, required for Qt Metasystem
|
||||||
CAccelerationUnit() : CMeasurementUnit(defaultUnit()) {}
|
CAccelerationUnit() : CMeasurementUnit(defaultUnit()) {}
|
||||||
|
|
||||||
|
//! Null constructor
|
||||||
|
CAccelerationUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
|
||||||
|
|
||||||
//! Default unit
|
//! Default unit
|
||||||
static const CAccelerationUnit &defaultUnit() { return m_s2(); }
|
static const CAccelerationUnit &defaultUnit() { return m_s2(); }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user