Issue #77 Move mixin classes to separate files

By separating them from unrelated code, their dependents
can use them without depending on unrelated code, which
in turn helps to reduce cyclic dependencies.

src/blackmisc/aviation/aircraftcategory.cpp

@@ -13,6 +13,7 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
+#include "blackmisc/stringutils.h"
 
 #include <QChar>
 #include <QJsonValue>

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -15,6 +15,7 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
+#include "blackmisc/stringutils.h"
 
 #include <QChar>
 #include <QJsonValue>

src/blackmisc/aviation/aircraftsituation.cpp

@@ -17,6 +17,7 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
+#include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
 
 #include "QStringBuilder"

src/blackmisc/aviation/airporticaocode.cpp

@@ -9,7 +9,8 @@
 //! \file
 
 #include "blackmisc/aviation/airporticaocode.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
+#include "blackmisc/stringutils.h"
 
 #include <QRegularExpression>
 #include <Qt>

src/blackmisc/aviation/airportlist.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/range.h"
 
 #include <QString>

src/blackmisc/aviation/altitude.h

@@ -15,16 +15,16 @@
 #include "blackmisc/pq/pqstring.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/compare.h"
-#include "blackmisc/dbus.h"
-#include "blackmisc/datastream.h"
-#include "blackmisc/dictionary.h"
-#include "blackmisc/icon.h"
+#include "blackmisc/mixin/mixincompare.h"
+#include "blackmisc/mixin/mixindbus.h"
+#include "blackmisc/mixin/mixindatastream.h"
+#include "blackmisc/mixin/mixinhash.h"
+#include "blackmisc/mixin/mixinicon.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/pressure.h"
-#include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/mixin/mixinindex.h"
+#include "blackmisc/mixin/mixinstring.h"
+#include "blackmisc/mixin/mixinmetatype.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QMetaType>

src/blackmisc/aviation/atcstation.cpp

@@ -8,12 +8,13 @@
 
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
+#include "blackmisc/stringutils.h"
 
 #include <QCoreApplication>
 #include <QtGlobal>

src/blackmisc/aviation/atcstationlist.cpp

@@ -9,7 +9,7 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/predicates.h"

src/blackmisc/aviation/callsign.cpp

@@ -7,7 +7,8 @@
  */
 
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
+#include "blackmisc/stringutils.h"
 
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>

src/blackmisc/aviation/callsignset.h

@@ -14,7 +14,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/sequence.h"
 
 #include <QMetaType>

src/blackmisc/aviation/comsystem.cpp

@@ -9,6 +9,7 @@
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/dbus.h"
+#include "blackmisc/stringutils.h"
 
 #include <QDBusMetaType>
 #include <QtDebug>

src/blackmisc/aviation/comsystem.h

@@ -19,10 +19,10 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/pq/pqstring.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/dictionary.h"
-#include "blackmisc/json.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/mixin/mixinindex.h"
+#include "blackmisc/mixin/mixinhash.h"
+#include "blackmisc/mixin/mixinjson.h"
+#include "blackmisc/mixin/mixinmetatype.h"
 
 #include <QHash>
 #include <QJsonObject>

src/blackmisc/aviation/flightplanlist.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "flightplanlist.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/range.h"

src/blackmisc/aviation/heading.h

@@ -12,16 +12,16 @@
 #define BLACKMISC_AVIATION_HEADING_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/compare.h"
-#include "blackmisc/dbus.h"
-#include "blackmisc/dictionary.h"
-#include "blackmisc/json.h"
+#include "blackmisc/mixin/mixincompare.h"
+#include "blackmisc/mixin/mixindbus.h"
+#include "blackmisc/mixin/mixinhash.h"
+#include "blackmisc/mixin/mixinjson.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/mixin/mixinindex.h"
+#include "blackmisc/mixin/mixinstring.h"
+#include "blackmisc/mixin/mixinmetatype.h"
 
 #include <QMetaType>
 #include <QString>

src/blackmisc/aviation/informationmessage.h

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

src/blackmisc/aviation/livery.cpp

@@ -9,7 +9,7 @@
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/aviation/logutils.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/logcategory.h"
 #include "blackmisc/logcategorylist.h"

src/blackmisc/aviation/track.h

@@ -12,16 +12,16 @@
 #define BLACKMISC_AVIATION_TRACK_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/compare.h"
-#include "blackmisc/dbus.h"
-#include "blackmisc/dictionary.h"
-#include "blackmisc/json.h"
+#include "blackmisc/mixin/mixincompare.h"
+#include "blackmisc/mixin/mixindbus.h"
+#include "blackmisc/mixin/mixinhash.h"
+#include "blackmisc/mixin/mixinjson.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/mixin/mixinindex.h"
+#include "blackmisc/mixin/mixinstring.h"
+#include "blackmisc/mixin/mixinmetatype.h"
 
 #include <QMetaType>
 #include <QString>