From 39e9e6f128e5363311d9bc37e9c7225ffc7d864f Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 27 Aug 2020 20:37:15 +0100
Subject: [PATCH] Issue #77 Break dependency of icon on angle

---
 src/blackmisc/aviation/liverylist.cpp | 2 --
 src/blackmisc/icon.cpp                | 8 --------
 src/blackmisc/icon.h                  | 5 -----
 src/blackmisc/iconlist.h              | 1 +
 src/blackmisc/pq/angle.cpp            | 2 +-
 src/blackmisc/pq/physicalquantity.h   | 1 +
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/blackmisc/aviation/liverylist.cpp b/src/blackmisc/aviation/liverylist.cpp
index ddb40aba4..077b4e9cb 100644
--- a/src/blackmisc/aviation/liverylist.cpp
+++ b/src/blackmisc/aviation/liverylist.cpp
@@ -13,10 +13,8 @@
 #include <QtGlobal>
 #include <tuple>
 
-using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 
-
 namespace BlackMisc
 {
     namespace Aviation
diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp
index ba1d5a87a..b532c0d97 100644
--- a/src/blackmisc/icon.cpp
+++ b/src/blackmisc/icon.cpp
@@ -8,9 +8,6 @@
 
 #include "blackmisc/icon.h"
 #include "blackmisc/iconlist.h"
-#include "blackmisc/pq/angle.h"
-#include "blackmisc/pq/units.h"
-#include "blackmisc/sequence.h"
 
 #include <QStringBuilder>
 #include <QtGlobal>
@@ -77,11 +74,6 @@ namespace BlackMisc
         return QIcon(toPixmap());
     }
 
-    void CIcon::setRotation(const PhysicalQuantities::CAngle &rotate)
-    {
-        m_rotateDegrees = static_cast<int>(rotate.valueRounded(PhysicalQuantities::CAngleUnit::deg(), 0));
-    }
-
     QString CIcon::convertToQString(bool i18n) const
     {
         Q_UNUSED(i18n);
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index ee14cd8df..6ade9ac54 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -31,8 +31,6 @@
 
 namespace BlackMisc
 {
-    namespace PhysicalQuantities { class CAngle; }
-
     //! Value object for icons. An icon is stored in the global icon repository and
     //! identified by its index. It contains no(!) pyhsical data for the icon itself.
     class BLACKMISC_EXPORT CIcon :
@@ -95,9 +93,6 @@ namespace BlackMisc
         //! Rotate by n degrees
         void setRotation(int degrees) { m_rotateDegrees = degrees; }
 
-        //! Rotate by given degrees
-        void setRotation(const BlackMisc::PhysicalQuantities::CAngle &rotate);
-
         //! Set descriptive text
         void setDescriptiveText(const QString &text) { m_descriptiveText = text; }
 
diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h
index 91aac2487..1162ff352 100644
--- a/src/blackmisc/iconlist.h
+++ b/src/blackmisc/iconlist.h
@@ -17,6 +17,7 @@
 #include "blackmisc/icon.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h" // removing this line causes a clang undefined symbol error
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/pq/angle.cpp b/src/blackmisc/pq/angle.cpp
index be0ff649b..8fbf9ed03 100644
--- a/src/blackmisc/pq/angle.cpp
+++ b/src/blackmisc/pq/angle.cpp
@@ -52,7 +52,7 @@ namespace BlackMisc
         CIcon CAngle::toIcon() const
         {
             CIcon i = CIcon::iconByIndex(CIcons::StandardIconArrowMediumNorth16);
-            i.setRotation(*this);
+            i.setRotation(value(CAngleUnit::deg()));
             return i;
         }
 
diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h
index 151914419..daa7c81e0 100644
--- a/src/blackmisc/pq/physicalquantity.h
+++ b/src/blackmisc/pq/physicalquantity.h
@@ -32,6 +32,7 @@ namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
+        class CAngle;
         class CLength;
         class CPressure;
         class CFrequency;