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

src/blackmisc/audio/audiodeviceinfolist.h

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

src/blackmisc/audio/audiosettings.h

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

src/blackmisc/audio/registermetadataaudio.cpp

@@ -9,6 +9,7 @@
 #include "registermetadataaudio.h"
 #include "audio.h"
 #include "ptt.h"
+#include "blackmisc/variant.h"
 #include <QDBusMetaType>
 
 namespace BlackMisc

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>

src/blackmisc/country.h

@@ -15,7 +15,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/countrylist.h

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

src/blackmisc/datacache.h

@@ -19,7 +19,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/valuecache.h"
 #include "blackmisc/valuecacheprivate.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/variantmap.h"
 #include "blackmisc/worker.h"
 

src/blackmisc/db/artifactlist.h

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

src/blackmisc/db/datastore.h

@@ -12,7 +12,6 @@
 #define BLACKMISC_DB_DATASTORE_H
 
 #include "blackmisc/timestampbased.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackconfig/buildconfig.h"

src/blackmisc/db/datastoreobjectlist.cpp

@@ -20,7 +20,6 @@
 #include "blackmisc/predicates.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/json.h"
-#include "blackmisc/variantprivate.h"
 
 #include <QJsonObject>
 #include <QJsonValue>

src/blackmisc/db/distribution.h

@@ -18,7 +18,6 @@
 #include "blackmisc/settingscache.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QVersionNumber>

src/blackmisc/db/distributionlist.h

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

src/blackmisc/db/registermetadatadb.cpp

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

src/blackmisc/geo/coordinategeodetic.cpp

@@ -9,7 +9,6 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QByteArray>

src/blackmisc/geo/coordinategeodeticlist.h

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

src/blackmisc/geo/registermetadatageo.cpp

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

src/blackmisc/iconlist.cpp

@@ -10,7 +10,6 @@
 #include "blackmisc/containerbase.h"
 #include "blackmisc/dbus.h"
 #include "blackmisc/range.h"
-#include "blackmisc/variant.h"
 #include <QDBusMetaType>
 
 namespace BlackMisc

src/blackmisc/iconlist.h

@@ -17,7 +17,6 @@
 #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>

src/blackmisc/identifierlist.h

@@ -14,7 +14,6 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMetaType>
 

src/blackmisc/identifierset.h

@@ -13,7 +13,6 @@
 
 #include "blackmisc/identifier.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMetaType>
 

src/blackmisc/input/actionhotkey.h

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

src/blackmisc/input/actionhotkeylist.h

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

src/blackmisc/input/joystickbutton.cpp

@@ -7,7 +7,6 @@
  */
 
 #include "blackmisc/input/joystickbutton.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/input/joystickbutton.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/input/joystickbuttonlist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/input/joystickbutton.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <initializer_list>

src/blackmisc/input/keyboardkey.cpp

@@ -14,7 +14,6 @@
 #include <QtGlobal>
 
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {

src/blackmisc/input/keyboardkey.h

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

src/blackmisc/input/keyboardkeylist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/input/keyboardkey.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QStringList>
 #include <QMetaType>

src/blackmisc/input/registermetadatainput.cpp

@@ -8,6 +8,7 @@
 
 #include "registermetadatainput.h"
 #include "input.h"
+#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 

src/blackmisc/logcategorylist.cpp

@@ -11,7 +11,6 @@
 #include "blackmisc/dbus.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/range.h"
-#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 #include <QList>

src/blackmisc/logpattern.h

@@ -22,6 +22,7 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/mixin/mixinmetatype.h"
+#include "blackmisc/variant.h"
 
 #include <QDBusArgument>
 #include <QMetaType>

src/blackmisc/mixin/mixinindex.h

@@ -15,8 +15,6 @@
 #include "blackmisc/inheritancetraits.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
-
 #include <QDBusArgument>
 #include <QList>
 #include <QMap>

src/blackmisc/network/authenticateduser.cpp

@@ -11,7 +11,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QJsonValue>

src/blackmisc/network/authenticateduser.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/network/client.h

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

src/blackmisc/network/clientlist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMap>
 #include <QMetaType>

src/blackmisc/network/ecosystem.h

@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/network/ecosystemlist.h

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

src/blackmisc/network/fsdsetup.cpp

@@ -11,7 +11,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"
 

src/blackmisc/network/rawfsdmessage.cpp

@@ -11,7 +11,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 
 #include <Qt>
 #include <QtGlobal>

src/blackmisc/network/rawfsdmessage.h

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

src/blackmisc/network/rawfsdmessagelist.h

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

src/blackmisc/network/registermetadatanetwork.cpp

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

src/blackmisc/network/remotefile.h

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

src/blackmisc/network/remotefilelist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/remotefile.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>

src/blackmisc/network/role.h

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

src/blackmisc/network/rolelist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/role.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>

src/blackmisc/network/server.cpp

@@ -13,7 +13,6 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/obfuscation.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <Qt>

src/blackmisc/network/server.h

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

src/blackmisc/network/serverlist.h

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

src/blackmisc/network/settings/networksettings.h

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

src/blackmisc/network/textmessage.h

@@ -20,7 +20,6 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QPixmap>

src/blackmisc/network/textmessagelist.h

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

src/blackmisc/network/url.h

@@ -14,7 +14,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/network/urllist.h

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

src/blackmisc/network/urlloglist.h

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

src/blackmisc/network/user.cpp

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

src/blackmisc/network/user.h

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

src/blackmisc/network/userlist.h

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

src/blackmisc/orderable.cpp

@@ -8,7 +8,6 @@
 
 #include "blackmisc/orderable.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QByteArray>

src/blackmisc/orderable.h

@@ -13,8 +13,8 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
+#include <QVariant>
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/platform.h

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

src/blackmisc/platformset.cpp

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

src/blackmisc/pq/physicalquantity.cpp

@@ -23,7 +23,6 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/dictionary.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QCoreApplication>

src/blackmisc/propertyindexlist.h

@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>