From 0ca9fe0a8a33d2a289c2035ef848a9b374a76a6f Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Wed, 14 Dec 2016 21:37:17 +0000
Subject: [PATCH] refs #837 Abbreviated syntax for specifying a null unit.

---
 src/blackmisc/pq/units.h | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/blackmisc/pq/units.h b/src/blackmisc/pq/units.h
index a7de3fee2..99dbe19c3 100644
--- a/src/blackmisc/pq/units.h
+++ b/src/blackmisc/pq/units.h
@@ -53,7 +53,6 @@ namespace BlackMisc
                 CMeasurementUnit(name, symbol, converter, displayDigits, epsilon)
             {}
 
-            //! null constructor
             CLengthUnit(const QString &name, const QString &symbol, std::nullptr_t) :
                 CMeasurementUnit(name, symbol, nullptr)
             {}
@@ -73,6 +72,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CLengthUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CLengthUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CLengthUnit &defaultUnit() { return m(); }
 
@@ -188,6 +190,9 @@ namespace BlackMisc
             //!  Default constructor, required for Qt Metasystem
             CAngleUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CAngleUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CAngleUnit &defaultUnit() { return deg(); }
 
@@ -286,6 +291,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CFrequencyUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CFrequencyUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CFrequencyUnit &defaultUnit() { return Hz(); }
 
@@ -377,6 +385,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CMassUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CMassUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CMassUnit &defaultUnit() { return kg(); }
 
@@ -478,6 +489,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CPressureUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CPressureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CPressureUnit &defaultUnit() { return hPa(); }
 
@@ -600,6 +614,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CTemperatureUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CTemperatureUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CTemperatureUnit &defaultUnit() { return C(); }
 
@@ -685,6 +702,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CSpeedUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CSpeedUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CSpeedUnit &defaultUnit() { return m_s(); }
 
@@ -794,6 +814,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CTimeUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CTimeUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CTimeUnit &defaultUnit() { return s(); }
 
@@ -924,6 +947,9 @@ namespace BlackMisc
             //! Default constructor, required for Qt Metasystem
             CAccelerationUnit() : CMeasurementUnit(defaultUnit()) {}
 
+            //! Null constructor
+            CAccelerationUnit(std::nullptr_t) : CMeasurementUnit(nullUnit()) {}
+
             //! Default unit
             static const CAccelerationUnit &defaultUnit() { return m_s2(); }