From 7db0587254aef69b0e788caeb667ee2d3df53aea Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Sun, 7 Dec 2014 16:09:37 +0000
Subject: [PATCH] refs #247 Using CVariant in physical quantities.

---
 src/blackmisc/pqstring.cpp | 22 +++++++++++-----------
 src/blackmisc/pqstring.h   |  6 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/blackmisc/pqstring.cpp b/src/blackmisc/pqstring.cpp
index 9f0f7e475..4fbceb13c 100644
--- a/src/blackmisc/pqstring.cpp
+++ b/src/blackmisc/pqstring.cpp
@@ -26,10 +26,10 @@ namespace BlackMisc
         /*
          * Parse
          */
-        QVariant CPqString::parseToVariant(const QString &value, SeparatorMode mode)
+        CVariant CPqString::parseToVariant(const QString &value, SeparatorMode mode)
         {
             static QRegExp rx("([-+]?[0-9]*[\\.,]?[0-9]+)\\s*(\\D*)$");
-            QVariant v;
+            CVariant v;
 
             // fine tuning of the string
             QString vs = value.trimmed().simplified();
@@ -50,55 +50,55 @@ namespace BlackMisc
             if (CMeasurementUnit::isValidUnitSymbol<CAccelerationUnit>(unit))
             {
                 CAcceleration pq(numberD, CMeasurementUnit::unitFromSymbol<CAccelerationUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CAngleUnit>(unit))
             {
                 CAngle pq(numberD, CMeasurementUnit::unitFromSymbol<CAngleUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CFrequencyUnit>(unit))
             {
                 CFrequency pq(numberD, CMeasurementUnit::unitFromSymbol<CFrequencyUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CLengthUnit>(unit))
             {
                 CLength pq(numberD, CMeasurementUnit::unitFromSymbol<CLengthUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CMassUnit>(unit))
             {
                 CMass pq(numberD, CMeasurementUnit::unitFromSymbol<CMassUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CPressureUnit>(unit))
             {
                 CPressure pq(numberD, CMeasurementUnit::unitFromSymbol<CPressureUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CSpeedUnit>(unit))
             {
                 CSpeed pq(numberD, CMeasurementUnit::unitFromSymbol<CSpeedUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CTimeUnit>(unit))
             {
                 CTime pq(numberD, CMeasurementUnit::unitFromSymbol<CTimeUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
 
             if (CMeasurementUnit::isValidUnitSymbol<CTemperatureUnit>(unit))
             {
                 CTemperature pq(numberD, CMeasurementUnit::unitFromSymbol<CTemperatureUnit>(unit, false));
-                return pq.toQVariant();
+                return pq.toCVariant();
             }
             return v;
         }
diff --git a/src/blackmisc/pqstring.h b/src/blackmisc/pqstring.h
index 70a79c70f..1eae1707f 100644
--- a/src/blackmisc/pqstring.h
+++ b/src/blackmisc/pqstring.h
@@ -14,7 +14,7 @@
 
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscfreefunctions.h"
-#include <QVariant>
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
@@ -55,7 +55,7 @@ namespace BlackMisc
             CPqString(const QString &value) : m_string(value) {}
 
             //! Parse a string value like "100m", "10.3Mhz"
-            static QVariant parseToVariant(const QString &value, SeparatorMode mode = SeparatorsCLocale);
+            static CVariant parseToVariant(const QString &value, SeparatorMode mode = SeparatorsCLocale);
 
             //! Parse into concrete type
             template <class PQ> static PQ parse(const QString &value, SeparatorMode mode = SeparatorsCLocale)
@@ -63,7 +63,7 @@ namespace BlackMisc
                 PQ invalid;
                 invalid.setNull();
                 if (value.isEmpty()) return invalid;
-                QVariant qv = parseToVariant(value, mode);
+                CVariant qv = parseToVariant(value, mode);
                 if (!qv.isNull() && qv.canConvert<PQ>())
                 {
                     return qv.value<PQ>();