Issue #77 Break cyclic dependency between CIcon and all other value classes

src/blackmisc/aviation/airlineicaocode.h

@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/country.h"
 #include "blackmisc/db/datastore.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"

src/blackmisc/aviation/atcstation.h

@@ -18,7 +18,6 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/geo/latitude.h"
 #include "blackmisc/geo/longitude.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/frequency.h"

src/blackmisc/aviation/callsign.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_AVIATION_CALLSIGN_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/aviation/flightplan.h

@@ -27,7 +27,6 @@
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QDateTime>

src/blackmisc/aviation/simbriefdata.h

@@ -15,7 +15,6 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/datacache.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QString>

src/blackmisc/country.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_COUNTRY_H
 
 #include "blackmisc/db/datastore.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/mixin/mixinicon.h

@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_MIXIN_MIXINICON_H
 #define BLACKMISC_MIXIN_MIXINICON_H
 
-#include "blackmisc/icon.h"
+#include "blackmisc/icons.h"
 #include <QIcon>
 #include <QPixmap>
 #include <QString>

src/blackmisc/mixin/mixinindex.h

@@ -11,6 +11,7 @@
 #ifndef BLACKMISC_MIXIN_MIXININDEX_H
 #define BLACKMISC_MIXIN_MIXININDEX_H
 
+#include "blackmisc/icon.h"
 #include "blackmisc/inheritancetraits.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/propertyindex.h"

src/blackmisc/namevariantpair.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_NAMEVARIANTPAIR_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/namevariantpairlist.h

@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/namevariantpair.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/variant.h"

src/blackmisc/network/authenticateduser.h

@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/country.h"
 #include "blackmisc/db/datastore.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/network/rolelist.h"
 #include "blackmisc/propertyindex.h"

src/blackmisc/network/client.h

@@ -16,7 +16,6 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/network/ecosystem.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_NETWORK_ECOSYSTEM_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 

src/blackmisc/network/textmessage.h

@@ -13,7 +13,6 @@
 
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/units.h"

src/blackmisc/network/user.h

@@ -14,7 +14,6 @@
 #include "blackmisc/aviation/airporticaocode.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/obfuscation.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"

src/blackmisc/network/voicecapabilities.cpp

@@ -6,8 +6,6 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "blackmisc/icon.h"
-#include "blackmisc/iconlist.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/network/voicecapabilities.h"
 

src/blackmisc/platform.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_PLATFORM_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/rgbcolor.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_RGBCOLOR_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/sequence.h

@@ -13,6 +13,7 @@
 
 #include "blackmisc/containerbase.h"
 #include "blackmisc/mixin/mixinicon.h"
+#include "blackmisc/mixin/mixindatastream.h"
 #include <QVector>
 #include <algorithm>
 #include <type_traits>

src/blackmisc/simulation/matchingstatisticsentry.cpp

@@ -8,7 +8,6 @@
 
 #include "matchingstatisticsentry.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/icon.h"
 
 namespace BlackMisc
 {

src/blackmisc/simulation/simulatedaircraft.h

@@ -29,7 +29,6 @@
 #include "blackmisc/pq/length.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"

src/blackmisc/variant.cpp

@@ -11,7 +11,6 @@
 #include "blackmisc/variant.h"
 #include "blackmisc/imageutils.h"
 #include "blackmisc/dictionary.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"