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/blackgui/components/atcstationcomponent.cpp

@@ -22,7 +22,7 @@
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/weather/metar.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logmessage.h"
 #include "ui_atcstationcomponent.h"

src/blackgui/components/colorselector.cpp

@@ -8,7 +8,7 @@
 
 #include "blackgui/components/colorselector.h"
 #include "blackgui/guiutility.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/rgbcolor.h"
 #include "blackmisc/variant.h"

src/blackgui/components/dbaircrafticaoselectorcomponent.cpp

@@ -14,7 +14,7 @@
 #include "blackgui/uppercasevalidator.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
 

src/blackgui/components/dbairlineicaoselectorbase.cpp

@@ -11,7 +11,7 @@
 #include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/variant.h"
 
 #include <QCompleter>

src/blackgui/components/dbcountryselectorcomponent.cpp

@@ -10,7 +10,7 @@
 #include "blackgui/components/dbcountryselectorcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/uppercasevalidator.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/variant.h"
 #include "ui_dbcountryselectorcomponent.h"

src/blackgui/components/dbdistributorselectorcomponent.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/components/dbdistributorselectorcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/uppercasevalidator.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/variant.h"
 #include "ui_dbdistributorselectorcomponent.h"

src/blackgui/components/dbliveryselectorcomponent.cpp

@@ -13,7 +13,7 @@
 #include "blackgui/uppercasevalidator.h"
 #include "blackmisc/aviation/liverylist.h"
 #include "blackmisc/db/datastoreutility.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
 #include "ui_dbliveryselectorcomponent.h"

src/blackgui/components/dbownmodelsetcomponent.cpp

@@ -24,7 +24,7 @@
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "blackmisc/simulation/distributorlistpreferences.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/orderable.h"

src/blackgui/components/simulatorcomponent.cpp

@@ -25,6 +25,7 @@
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/stringutils.h"
+#include "blackmisc/iconlist.h"
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/components/simulatorselector.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/guiutility.h"
 #include "blackcore/context/contextsimulator.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackconfig/buildconfig.h"
 #include "ui_simulatorselector.h"
 

src/blackgui/components/textmessagecomponent.cpp

@@ -26,7 +26,7 @@
 #include "blackmisc/pq/constants.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/sequence.h"

src/blackgui/editors/aircrafticaoform.cpp

@@ -20,7 +20,7 @@
 #include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/db/datastore.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 
 #include <QCheckBox>

src/blackgui/editors/airlineicaoform.cpp

@@ -17,7 +17,7 @@
 #include "blackgui/guiapplication.h"
 #include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 #include "ui_airlineicaoform.h"
 

src/blackgui/editors/distributorform.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/editors/validationindicator.h"
 #include "blackgui/labelandicon.h"
 #include "blackgui/dropsite.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/simulation/distributorlist.h"
 #include "distributorform.h"

src/blackgui/editors/liveryform.cpp

@@ -19,7 +19,7 @@
 #include "blackgui/labelandicon.h"
 #include "blackcore/webdataservices.h"
 #include "blackmisc/aviation/liverylist.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icons.h"
 
 #include <QCheckBox>

src/blackgui/enablefordockwidgetinfoarea.h

@@ -14,6 +14,8 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/connectionguard.h"
 
+class QWidget;
+
 namespace BlackGui
 {
     class CDockWidgetInfoArea;

src/blackgui/models/aircraftcategorytreemodel.cpp

@@ -9,7 +9,7 @@
 #include "blackgui/models/aircraftcategorytreemodel.h"
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/threadutils.h"
 #include "blackmisc/variant.h"

src/blackgui/models/atcstationlistmodel.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/frequency.h"

src/blackgui/models/atcstationtreemodel.cpp

@@ -10,7 +10,7 @@
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
 #include "blackmisc/aviation/callsign.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/frequency.h"

src/blackgui/models/clientlistmodel.cpp

@@ -11,7 +11,7 @@
 #include "blackgui/models/columns.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/network/user.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/propertyindexvariantmap.h"
 

src/blackgui/models/columns.cpp

@@ -8,7 +8,7 @@
 
 #include "blackgui/models/columns.h"
 #include "blackgui/guiapplication.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 
 #include <QByteArray>
 #include <QCoreApplication>

src/blackgui/models/namevariantpairlistmodel.cpp

@@ -9,7 +9,7 @@
 #include "blackgui/models/columnformatters.h"
 #include "blackgui/models/columns.h"
 #include "blackgui/models/namevariantpairlistmodel.h"
-#include "blackmisc/compare.h"
+#include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/namevariantpair.h"
 #include "blackmisc/propertyindexvariantmap.h"