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

src/blackmisc/aviation/aircraftcategory.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QChar>

src/blackmisc/aviation/aircraftcategory.h

@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>

src/blackmisc/aviation/aircraftcategorylist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonArray>

src/blackmisc/aviation/aircraftenginelist.h

@@ -17,7 +17,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/json.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -14,7 +14,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QChar>

src/blackmisc/aviation/aircrafticaocode.h

@@ -19,7 +19,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>

src/blackmisc/aviation/aircrafticaocodelist.h

@@ -16,7 +16,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>

src/blackmisc/aviation/aircraftlights.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include <QStringBuilder>
 
 using namespace BlackMisc::PhysicalQuantities;

src/blackmisc/aviation/aircraftlights.h

@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/aircraftparts.h

@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/aircraftpartslist.h

@@ -17,7 +17,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 #include <QHash>
 #include <QMetaType>
 

src/blackmisc/aviation/aircraftsituation.cpp

@@ -15,7 +15,6 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"

src/blackmisc/aviation/aircraftsituation.h

@@ -27,7 +27,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/aircraftsituationchange.cpp

@@ -15,7 +15,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"

src/blackmisc/aviation/aircraftsituationchange.h

@@ -18,7 +18,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
 

src/blackmisc/aviation/aircraftsituationchangelist.h

@@ -16,7 +16,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftsituationlist.h

@@ -19,7 +19,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QList>

src/blackmisc/aviation/airlineicaocode.cpp

@@ -18,7 +18,6 @@
 #include "blackmisc/stringutils.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QJsonValue>

src/blackmisc/aviation/airlineicaocode.h

@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>

src/blackmisc/aviation/airlineicaocodelist.h

@@ -17,7 +17,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>

src/blackmisc/aviation/airport.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/airport.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QCoreApplication>

src/blackmisc/aviation/airport.h

@@ -22,7 +22,6 @@
 #include "blackmisc/country.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/airportlist.h

@@ -18,7 +18,6 @@
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 

src/blackmisc/aviation/atcstation.cpp

@@ -12,7 +12,6 @@
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
 

src/blackmisc/aviation/atcstation.h

@@ -25,7 +25,6 @@
 #include "blackmisc/pq/time.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QDateTime>
 #include <QMetaType>

src/blackmisc/aviation/atcstationlist.h

@@ -20,7 +20,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QHash>

src/blackmisc/aviation/callsign.h

@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 #include <QString>
 #include <tuple>

src/blackmisc/aviation/callsignset.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/containerbase.h"
 #include "blackmisc/dbus.h"
-#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 #include <QJsonObject>

src/blackmisc/aviation/flightplanlist.h

@@ -16,7 +16,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 
 namespace BlackMisc

src/blackmisc/aviation/livery.cpp

@@ -15,7 +15,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QCoreApplication>

src/blackmisc/aviation/livery.h

@@ -19,7 +19,6 @@
 #include "blackmisc/rgbcolor.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMap>
 #include <QJsonObject>

src/blackmisc/aviation/liverylist.h

@@ -17,7 +17,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/modulator.cpp

@@ -13,7 +13,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include <QtGlobal>
 #include <type_traits>

src/blackmisc/aviation/registermetadataaviation.cpp

@@ -8,6 +8,7 @@
 
 #include "registermetadataaviation.h"
 #include "aviation.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/transponder.cpp

@@ -8,7 +8,6 @@
 
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 #include <QRegularExpression>
 #include <Qt>

src/blackmisc/aviation/transponder.h

@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QHash>
 #include <QMetaType>