From 647e9064b0d6c15efc25af904055db8f439bac19 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 26 Oct 2020 23:15:55 +0000 Subject: [PATCH] Issue #77 Break cyclic dependency between CIcon and all other value classes --- src/blackmisc/aviation/airlineicaocode.h | 1 - src/blackmisc/aviation/atcstation.h | 1 - src/blackmisc/aviation/callsign.h | 1 - src/blackmisc/aviation/flightplan.h | 1 - src/blackmisc/aviation/simbriefdata.h | 1 - src/blackmisc/country.h | 1 - src/blackmisc/mixin/mixinicon.h | 2 +- src/blackmisc/mixin/mixinindex.h | 1 + src/blackmisc/namevariantpair.h | 1 - src/blackmisc/namevariantpairlist.h | 1 - src/blackmisc/network/authenticateduser.h | 1 - src/blackmisc/network/client.h | 1 - src/blackmisc/network/ecosystem.h | 1 - src/blackmisc/network/textmessage.h | 1 - src/blackmisc/network/user.h | 1 - src/blackmisc/network/voicecapabilities.cpp | 2 -- src/blackmisc/platform.h | 1 - src/blackmisc/rgbcolor.h | 1 - src/blackmisc/sequence.h | 1 + src/blackmisc/simulation/matchingstatisticsentry.cpp | 1 - src/blackmisc/simulation/simulatedaircraft.h | 1 - src/blackmisc/variant.cpp | 1 - 22 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h index 7572d7b53..b3ab22e67 100644 --- a/src/blackmisc/aviation/airlineicaocode.h +++ b/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" diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index 597aed287..9eb616c7b 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/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" diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h index 70527c4c8..6f83135f7 100644 --- a/src/blackmisc/aviation/callsign.h +++ b/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" diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 2a719b824..6db10a008 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/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 diff --git a/src/blackmisc/aviation/simbriefdata.h b/src/blackmisc/aviation/simbriefdata.h index 72f5bcf19..52d1ea42d 100644 --- a/src/blackmisc/aviation/simbriefdata.h +++ b/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 diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h index b8537b20c..d99244b0e 100644 --- a/src/blackmisc/country.h +++ b/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" diff --git a/src/blackmisc/mixin/mixinicon.h b/src/blackmisc/mixin/mixinicon.h index aef255338..4cd090ab9 100644 --- a/src/blackmisc/mixin/mixinicon.h +++ b/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 #include #include diff --git a/src/blackmisc/mixin/mixinindex.h b/src/blackmisc/mixin/mixinindex.h index 164b4a8a9..9c1fa2930 100644 --- a/src/blackmisc/mixin/mixinindex.h +++ b/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" diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h index d54ad47fa..888f4f916 100644 --- a/src/blackmisc/namevariantpair.h +++ b/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" diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index 8270b5c63..916a9a4af 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/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" diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h index b537d7217..d49d1ab9f 100644 --- a/src/blackmisc/network/authenticateduser.h +++ b/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" diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h index 1643d5e07..7381f42a2 100644 --- a/src/blackmisc/network/client.h +++ b/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" diff --git a/src/blackmisc/network/ecosystem.h b/src/blackmisc/network/ecosystem.h index fb6ea2011..f19057c70 100644 --- a/src/blackmisc/network/ecosystem.h +++ b/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" diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h index 6cd88d34f..5ae009048 100644 --- a/src/blackmisc/network/textmessage.h +++ b/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" diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h index ffdeb62b6..310034d34 100644 --- a/src/blackmisc/network/user.h +++ b/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" diff --git a/src/blackmisc/network/voicecapabilities.cpp b/src/blackmisc/network/voicecapabilities.cpp index 20aaff7dd..da341436e 100644 --- a/src/blackmisc/network/voicecapabilities.cpp +++ b/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" diff --git a/src/blackmisc/platform.h b/src/blackmisc/platform.h index 6eeb56196..246de5a4f 100644 --- a/src/blackmisc/platform.h +++ b/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" diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h index 98c1f718f..1cdc99a8b 100644 --- a/src/blackmisc/rgbcolor.h +++ b/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" diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 8563b09f8..72de87b9b 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -13,6 +13,7 @@ #include "blackmisc/containerbase.h" #include "blackmisc/mixin/mixinicon.h" +#include "blackmisc/mixin/mixindatastream.h" #include #include #include diff --git a/src/blackmisc/simulation/matchingstatisticsentry.cpp b/src/blackmisc/simulation/matchingstatisticsentry.cpp index cd31aeb28..293a915bf 100644 --- a/src/blackmisc/simulation/matchingstatisticsentry.cpp +++ b/src/blackmisc/simulation/matchingstatisticsentry.cpp @@ -8,7 +8,6 @@ #include "matchingstatisticsentry.h" #include "blackmisc/comparefunctions.h" -#include "blackmisc/icon.h" namespace BlackMisc { diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index 458be5285..bd1218ed8 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/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" diff --git a/src/blackmisc/variant.cpp b/src/blackmisc/variant.cpp index 208a8ed4a..71e9512a8 100644 --- a/src/blackmisc/variant.cpp +++ b/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"