Explicit template instantiations for mixins for value classes

To reduce compile time.

src/blackmisc/applicationinfo.cpp

@@ -16,6 +16,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo)
+
 namespace BlackMisc
 {
     CApplicationInfo::CApplicationInfo() {}

src/blackmisc/applicationinfo.h

@@ -16,6 +16,8 @@
 #include <QMetaType>
 #include <QFlags>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/audio/audiodeviceinfo.cpp

@@ -16,6 +16,8 @@
 #include <QtGlobal>
 #include <QAudioDeviceInfo>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CAudioDeviceInfo)
+
 namespace BlackMisc::Audio
 {
     CAudioDeviceInfo::CAudioDeviceInfo() :

src/blackmisc/audio/audiodeviceinfo.h

@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CAudioDeviceInfo)
+
 namespace BlackMisc::Audio
 {
     /*!

src/blackmisc/audio/audiosettings.cpp

@@ -16,6 +16,8 @@
 
 using namespace BlackMisc::Audio;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CSettings)
+
 namespace BlackMisc::Audio
 {
     int CSettings::fixOutVolume(int v)

src/blackmisc/audio/audiosettings.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CSettings)
+
 namespace BlackMisc::Audio
 {
     //! Value object encapsulating information of audio related settings.

src/blackmisc/audio/voicesetup.cpp

@@ -15,6 +15,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CVoiceSetup)
+
 namespace BlackMisc::Audio
 {
     QString CVoiceSetup::convertToQString(bool i18n) const

src/blackmisc/audio/voicesetup.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CVoiceSetup)
+
 namespace BlackMisc::Audio
 {
     //! Value object for a voice setup

src/blackmisc/aviation/aircraftcategory.cpp

@@ -26,6 +26,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)
+
 namespace BlackMisc::Aviation
 {
     CAircraftCategory::CAircraftCategory(const QString &name, const QString &description, const QString &path, bool assignable) :

src/blackmisc/aviation/aircraftcategory.h

@@ -24,6 +24,8 @@
 #include <QStringList>
 #include <QMetaType>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for aircraft categories

src/blackmisc/aviation/aircraftengine.cpp

@@ -12,6 +12,8 @@
 #include <QChar>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)
+
 namespace BlackMisc::Aviation
 {
     CAircraftEngine::CAircraftEngine(int number, bool on) : m_number(number), m_on(on)

src/blackmisc/aviation/aircraftengine.h

@@ -18,6 +18,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about aircraft's engines

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -28,6 +28,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     CAircraftIcaoCode::CAircraftIcaoCode(const QString &icao, const QString &combinedType) :

src/blackmisc/aviation/aircrafticaocode.h

@@ -25,6 +25,8 @@
 #include <QString>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for ICAO classification

src/blackmisc/aviation/aircraftlights.cpp

@@ -11,6 +11,8 @@
 #include "blackmisc/comparefunctions.h"
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftLights)
+
 namespace BlackMisc::Aviation
 {
     CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn)

src/blackmisc/aviation/aircraftlights.h

@@ -19,6 +19,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftLights)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about aircraft's lights

src/blackmisc/aviation/aircraftparts.cpp

@@ -19,6 +19,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)
+
 namespace BlackMisc::Aviation
 {
     CAircraftParts::CAircraftParts(int flapsPercent) : m_flapsPercentage(flapsPercent) {}

src/blackmisc/aviation/aircraftparts.h

@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information of aircraft's parts

src/blackmisc/aviation/aircraftsituation.cpp

@@ -17,6 +17,7 @@
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include "QStringBuilder"
 #include <QtGlobal>
@@ -25,6 +26,8 @@ using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituation)
+
 namespace BlackMisc::Aviation
 {
     const CLength &CAircraftSituation::allowedAltitudeDeviation()

src/blackmisc/aviation/aircraftsituation.h

@@ -33,6 +33,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituation)
+
 namespace BlackMisc
 {
     namespace Geo { class CElevationPlane; }

src/blackmisc/aviation/aircraftsituationchange.cpp

@@ -27,6 +27,8 @@ using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange)
+
 namespace BlackMisc::Aviation
 {
     void CAircraftSituationChange::registerMetadata()

src/blackmisc/aviation/aircraftsituationchange.h

@@ -21,6 +21,8 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange)
+
 namespace BlackMisc
 {
     namespace Simulation

src/blackmisc/aviation/airlineicaocode.cpp

@@ -31,6 +31,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirlineIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     CAirlineIcaoCode::CAirlineIcaoCode(const QString &airlineDesignator)

src/blackmisc/aviation/airlineicaocode.h

@@ -25,6 +25,8 @@
 #include <QMap>
 #include <QSet>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirlineIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     class CCallsign;

src/blackmisc/aviation/airport.cpp

@@ -20,6 +20,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirport)
+
 namespace BlackMisc::Aviation
 {
     CAirport::CAirport()

src/blackmisc/aviation/airport.h

@@ -28,6 +28,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirport)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an airpot.

src/blackmisc/aviation/airporticaocode.cpp

@@ -16,6 +16,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirportIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     QString CAirportIcaoCode::convertToQString(bool /** i18n **/) const

src/blackmisc/aviation/airporticaocode.h

@@ -20,6 +20,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirportIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information of airport ICAO data.

src/blackmisc/aviation/atcstation.cpp

@@ -14,6 +14,7 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QCoreApplication>
 #include <QtGlobal>
@@ -24,6 +25,8 @@ using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAtcStation)
+
 namespace BlackMisc::Aviation
 {
     CAtcStation::CAtcStation()

src/blackmisc/aviation/atcstation.h

@@ -33,6 +33,8 @@
 #include <array>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAtcStation)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an ATC station.

src/blackmisc/aviation/callsign.cpp

@@ -17,6 +17,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CCallsign)
+
 namespace BlackMisc::Aviation
 {
     CCallsign::CCallsign(const QString &callsign, CCallsign::TypeHint hint)

src/blackmisc/aviation/callsign.h

@@ -22,6 +22,8 @@
 
 class QStringList;
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CCallsign)
+
 namespace BlackMisc
 {
     class CStatusMessageList;

src/blackmisc/aviation/flightplan.cpp

@@ -16,6 +16,7 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/json.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QFile>
 #include <QDateTime>
@@ -27,6 +28,9 @@
 using namespace BlackMisc::Network;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlanRemarks)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlan)
+
 namespace BlackMisc::Aviation
 {
     CFlightPlanRemarks::CFlightPlanRemarks()

src/blackmisc/aviation/flightplan.h

@@ -35,6 +35,9 @@
 #include <QTime>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlanRemarks)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlan)
+
 namespace BlackMisc::Aviation
 {
     //! Flight plan remarks, parsed values

src/blackmisc/aviation/informationmessage.cpp

@@ -9,6 +9,8 @@
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/comparefunctions.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CInformationMessage)
+
 namespace BlackMisc::Aviation
 {
     QString CInformationMessage::convertToQString(bool i18n) const

src/blackmisc/aviation/informationmessage.h

@@ -22,6 +22,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CInformationMessage)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information message (ATIS, METAR, TAF)

src/blackmisc/aviation/livery.cpp

@@ -26,6 +26,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CLivery)
+
 namespace BlackMisc::Aviation
 {
     CLivery::CLivery()

src/blackmisc/aviation/livery.h

@@ -25,6 +25,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CLivery)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an airpot.

src/blackmisc/aviation/selcal.cpp

@@ -16,6 +16,8 @@
 
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSelcal)
+
 namespace BlackMisc::Aviation
 {
     QString CSelcal::convertToQString(bool /** i18n **/) const

src/blackmisc/aviation/selcal.h

@@ -22,6 +22,8 @@
 
 class QStringList;
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSelcal)
+
 namespace BlackMisc
 {
     namespace PhysicalQuantities { class CFrequency; }

src/blackmisc/aviation/simbriefdata.cpp

@@ -12,6 +12,8 @@
 
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSimBriefData)
+
 namespace BlackMisc::Aviation
 {
     const QStringList &CSimBriefData::getLogCategories()

src/blackmisc/aviation/simbriefdata.h

@@ -20,6 +20,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSimBriefData)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for a flight plan

src/blackmisc/aviation/transponder.cpp

@@ -13,6 +13,8 @@
 #include <Qt>
 #include <QtDebug>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CTransponder)
+
 namespace BlackMisc::Aviation
 {
     void CTransponder::registerMetadata()

src/blackmisc/aviation/transponder.h

@@ -23,6 +23,8 @@
 #include <QtGlobal>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CTransponder)
+
 namespace BlackMisc::Aviation
 {
     //! Transponder

src/blackmisc/country.cpp

@@ -14,6 +14,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CCountry)
+
 namespace BlackMisc
 {
     CCountry::CCountry(const QString &iso, const QString &name) :

src/blackmisc/country.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CCountry)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/crashinfo.cpp

@@ -13,6 +13,8 @@
 #include <QFile>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CCrashInfo)
+
 namespace BlackMisc
 {
     CCrashInfo::CCrashInfo() {}

src/blackmisc/crashinfo.h

@@ -14,6 +14,8 @@
 #include "blackmisc/valueobject.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CCrashInfo)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/crashsettings.cpp

@@ -12,6 +12,8 @@
 
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Settings, CCrashSettings)
+
 namespace BlackMisc::Settings
 {
     CCrashSettings::CCrashSettings() {}

src/blackmisc/crashsettings.h

@@ -13,6 +13,8 @@
 
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Settings, CCrashSettings)
+
 namespace BlackMisc::Settings
 {
     /*!

src/blackmisc/db/artifact.cpp

@@ -15,6 +15,8 @@
 using namespace BlackConfig;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact)
+
 namespace BlackMisc::Db
 {
     CArtifact::CArtifact()

src/blackmisc/db/artifact.h

@@ -18,6 +18,8 @@
 #include "blackmisc/network/remotefile.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact)
+
 namespace BlackMisc::Db
 {
     //! Artifacts ("our software" products)

src/blackmisc/db/dbinfo.cpp

@@ -12,6 +12,8 @@
 
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDbInfo)
+
 namespace BlackMisc::Db
 {
     CDbInfo::CDbInfo(int key, const QString &tableName, int entries) :

src/blackmisc/db/dbinfo.h

@@ -16,6 +16,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDbInfo)
+
 namespace BlackMisc::Db
 {
     /*!

src/blackmisc/db/distribution.cpp

@@ -14,6 +14,8 @@ using namespace BlackConfig;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDistribution)
+
 namespace BlackMisc::Db
 {
     CDistribution::CDistribution()

src/blackmisc/db/distribution.h

@@ -23,6 +23,8 @@
 #include <QVersionNumber>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDistribution)
+
 namespace BlackMisc::Db
 {
     //! Distributions for channel

src/blackmisc/db/updateinfo.cpp

@@ -16,6 +16,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo)
+
 namespace BlackMisc::Db
 {
     CUpdateInfo::CUpdateInfo(const CArtifactList &artifacts, const CDistributionList &distributions) :

src/blackmisc/db/updateinfo.h

@@ -17,6 +17,8 @@
 #include "blackmisc/valueobject.h"
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo)
+
 namespace BlackMisc::Db
 {
     //! Update info, i.e. artifacts and distributions

src/blackmisc/directories.cpp

@@ -12,6 +12,8 @@
 #include <QFileInfo>
 #include <QDir>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CDirectories)
+
 namespace BlackMisc
 {
     QString CDirectories::getFlightPlanDirectoryOrDefault() const

src/blackmisc/directories.h

@@ -18,6 +18,8 @@
 
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CDirectories)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/geo/coordinategeodetic.cpp

@@ -20,6 +20,8 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Geo, CCoordinateGeodetic)
+
 namespace BlackMisc::Geo
 {
     ICoordinateGeodetic::~ICoordinateGeodetic()

src/blackmisc/geo/coordinategeodetic.h

@@ -31,6 +31,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Geo, CCoordinateGeodetic)
+
 namespace BlackMisc
 {
     namespace Geo

src/blackmisc/identifier.cpp

@@ -16,6 +16,8 @@
 #include <QSysInfo>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CIdentifier)
+
 //! \private Escape characters not allowed in dbus paths
 QString toDBusPath(const QString &s)
 {

src/blackmisc/identifier.h

@@ -22,6 +22,8 @@
 #include <QUuid>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CIdentifier)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/input/actionhotkey.cpp

@@ -9,6 +9,8 @@
 #include "blackmisc/input/actionhotkey.h"
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CActionHotkey)
+
 namespace BlackMisc::Input
 {
     CActionHotkey::CActionHotkey(const QString &action) :

src/blackmisc/input/actionhotkey.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CActionHotkey)
+
 namespace BlackMisc::Input
 {
     //! Value object encapsulating a action hotkey

src/blackmisc/input/hotkeycombination.cpp

@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CHotkeyCombination)
+
 namespace BlackMisc::Input
 {
     CHotkeyCombination::CHotkeyCombination(CKeyboardKey key) : CHotkeyCombination(CKeyboardKeyList { key })

src/blackmisc/input/hotkeycombination.h

@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CHotkeyCombination)
+
 namespace BlackMisc::Input
 {
     //! Value object representing hotkey sequence

src/blackmisc/input/joystickbutton.cpp

@@ -8,6 +8,8 @@
 
 #include "blackmisc/input/joystickbutton.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CJoystickButton)
+
 namespace BlackMisc::Input
 {
     CJoystickButton::CJoystickButton(const QString &deviceName, int index) :

src/blackmisc/input/joystickbutton.h

@@ -20,6 +20,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CJoystickButton)
+
 namespace BlackMisc::Input
 {
     //! Value object representing a joystick button

src/blackmisc/input/keyboardkey.cpp

@@ -15,6 +15,8 @@
 
 #include "blackmisc/propertyindexref.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CKeyboardKey)
+
 namespace BlackMisc::Input
 {
     CKeyboardKey::CKeyboardKey() :

src/blackmisc/input/keyboardkey.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CKeyboardKey)
+
 namespace BlackMisc::Input
 {
     //! Value object representing a keyboard key.

src/blackmisc/logcategory.cpp

@@ -10,6 +10,8 @@
 
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CLogCategory)
+
 namespace BlackMisc
 {
     QString CLogCategory::convertToQString(bool i18n) const

src/blackmisc/logcategory.h

@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CLogCategory)
+
 namespace BlackMisc
 {
     /*!

src/blackmisc/namevariantpair.cpp

@@ -10,6 +10,8 @@
 #include "blackmisc/propertyindexvariantmap.h"
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CNameVariantPair)
+
 namespace BlackMisc
 {
     CNameVariantPair::CNameVariantPair(const QString &name, const CVariant &variant, const CIcon &icon)

src/blackmisc/namevariantpair.h

@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CNameVariantPair)
+
 namespace BlackMisc
 {
     //! Value / variant pair

src/blackmisc/network/authenticateduser.cpp

@@ -17,6 +17,8 @@
 #include <QStringBuilder>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CAuthenticatedUser)
+
 namespace BlackMisc::Network
 {
     CAuthenticatedUser::CAuthenticatedUser()

src/blackmisc/network/authenticateduser.h

@@ -25,11 +25,13 @@
 #include <QString>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CAuthenticatedUser)
+
 namespace BlackMisc::Network
 {
     /*!
-    * Value object encapsulating information of an authentiated user.
-    */
+     * Value object encapsulating information of an authentiated user.
+     */
     class BLACKMISC_EXPORT CAuthenticatedUser :
         public CValueObject<CAuthenticatedUser>,
         public BlackMisc::Db::IDatastoreObjectWithIntegerKey

src/blackmisc/network/client.cpp

@@ -10,6 +10,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QPixmap>
 #include <QString>
@@ -17,6 +18,8 @@
 #include <QStringList>
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CClient)
+
 namespace BlackMisc::Network
 {
     QString CClient::convertToQString(bool i18n) const

src/blackmisc/network/client.h

@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CClient)
+
 namespace BlackMisc::Network
 {
     //! Another client software.

src/blackmisc/network/connectionstatus.cpp

@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/connectionstatus.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CConnectionStatus)
+
 namespace BlackMisc::Network
 {
     QString CConnectionStatus::convertToQString(bool i18n) const

src/blackmisc/network/connectionstatus.h

@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CConnectionStatus)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information about a connection status

src/blackmisc/network/ecosystem.cpp

@@ -11,6 +11,8 @@
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CEcosystem)
+
 namespace BlackMisc::Network
 {
     QString CEcosystem::convertToQString(bool i18n) const

src/blackmisc/network/ecosystem.h

@@ -17,6 +17,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CEcosystem)
+
 namespace BlackMisc::Network
 {
     //! Ecosystem of server belonging together.

src/blackmisc/network/facilitytype.cpp

@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/facilitytype.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFacilityType)
+
 namespace BlackMisc::Network
 {
     QString CFacilityType::convertToQString(bool i18n) const

src/blackmisc/network/facilitytype.h

@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFacilityType)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating the ATC facility type, e.g. TWR, DEP, APP

src/blackmisc/network/fsdsetup.cpp

@@ -19,6 +19,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFsdSetup)
+
 namespace BlackMisc::Network
 {
     CFsdSetup::CFsdSetup(SendReceiveDetails sendReceive) : m_sendReceive(sendReceive)

src/blackmisc/network/fsdsetup.h

@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFsdSetup)
+
 namespace BlackMisc::Network
 {
     //! Value object for a FSD setup

src/blackmisc/network/loginmode.cpp

@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/loginmode.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CLoginMode)
+
 namespace BlackMisc::Network
 {
     QString CLoginMode::convertToQString(bool i18n) const

src/blackmisc/network/loginmode.h

@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CLoginMode)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information about login mode

src/blackmisc/network/rawfsdmessage.cpp

@@ -17,6 +17,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRawFsdMessage)
+
 namespace BlackMisc::Network
 {
     CRawFsdMessage::CRawFsdMessage(const QString &rawMessage)

src/blackmisc/network/rawfsdmessage.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRawFsdMessage)
+
 namespace BlackMisc::Network
 {
     //! Value object for a raw FSD message

src/blackmisc/network/remotefile.cpp

@@ -11,6 +11,8 @@
 #include <QJsonValue>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRemoteFile)
+
 namespace BlackMisc::Network
 {
     CRemoteFile::CRemoteFile(const QString &name, const QString &description)

src/blackmisc/network/remotefile.h

@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRemoteFile)
+
 namespace BlackMisc::Network
 {
     /*!

src/blackmisc/network/role.cpp

@@ -11,6 +11,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRole)
+
 namespace BlackMisc::Network
 {
     CRole::CRole(const QString &name, const QString &description)

src/blackmisc/network/role.h

@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRole)
+
 namespace BlackMisc::Network
 {
     /*!

src/blackmisc/network/server.cpp

@@ -20,6 +20,8 @@
 
 using namespace BlackMisc::Audio;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CServer)
+
 namespace BlackMisc::Network
 {
     const QList<int> &CServer::allServerTypes()

src/blackmisc/network/server.h

@@ -26,6 +26,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CServer)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information of a server

src/blackmisc/network/settings/networksettings.cpp

@@ -12,6 +12,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings)
+
 namespace BlackMisc::Network::Settings
 {
     QString CNetworkSettings::convertToQString(bool i18n) const

src/blackmisc/network/settings/networksettings.h

@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings)
+
 namespace BlackMisc::Network::Settings
 {
     //! Network settings