From 5b1504aecf8f9fd5eb2f9c11fd89c5691389a19e Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Tue, 25 Aug 2020 23:05:57 +0100
Subject: [PATCH] Issue #77 CIcon doesn't need to inherit from Mixin::Icon

Helps to reduce cyclic dependencies.
---
 src/blackmisc/icon.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index 2a386716f..76aaa6f88 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -73,8 +73,7 @@ namespace BlackMisc
         public Mixin::EqualsByMetaClass<CIcon>,
         public Mixin::LessThanByMetaClass<CIcon>,
         public Mixin::CompareByMetaClass<CIcon>,
-        public Mixin::String<CIcon>,
-        public Mixin::Icon<CIcon>
+        public Mixin::String<CIcon>
     {
     public:
         //! Default constructor.
@@ -116,6 +115,9 @@ namespace BlackMisc
         //! Corresponding pixmap
         QPixmap toPixmap() const;
 
+        //! Identity function
+        CIcon toIcon() const { return *this; }
+
         //! A QIcon
         QIcon toQIcon() const;