diff --git a/src/blackmisc/audio/audiodeviceinfolist.cpp b/src/blackmisc/audio/audiodeviceinfolist.cpp index 31e0ab981..47b48c8a1 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.cpp +++ b/src/blackmisc/audio/audiodeviceinfolist.cpp @@ -39,12 +39,5 @@ namespace BlackMisc }); } - void CAudioDeviceInfoList::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index 718b9d7b7..407e33bff 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -25,9 +25,13 @@ namespace BlackMisc namespace Audio { //! Value object encapsulating a list of audio devices. - class BLACKMISC_EXPORT CAudioDeviceInfoList : public CSequence + class BLACKMISC_EXPORT CAudioDeviceInfoList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAudioDeviceInfoList) + //! Default constructor. CAudioDeviceInfoList(); @@ -42,15 +46,6 @@ namespace BlackMisc //! Count (as of type) int count(CAudioDeviceInfo::DeviceType type) const; - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); }; } //namespace diff --git a/src/blackmisc/audio/voiceroomlist.cpp b/src/blackmisc/audio/voiceroomlist.cpp index 0eff1a7a0..97d4e8f52 100644 --- a/src/blackmisc/audio/voiceroomlist.cpp +++ b/src/blackmisc/audio/voiceroomlist.cpp @@ -21,13 +21,6 @@ namespace BlackMisc CSequence(other) { } - void CVoiceRoomList::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - const CVoiceRoomList &CVoiceRoomList::twoEmptyRooms() { static CVoiceRoomList emptyRooms; diff --git a/src/blackmisc/audio/voiceroomlist.h b/src/blackmisc/audio/voiceroomlist.h index 0074bc768..023e1ceb0 100644 --- a/src/blackmisc/audio/voiceroomlist.h +++ b/src/blackmisc/audio/voiceroomlist.h @@ -24,27 +24,20 @@ namespace BlackMisc { namespace Audio { - /*! - * Value object encapsulating a list of voice rooms. - */ - class BLACKMISC_EXPORT CVoiceRoomList : public CSequence + //! Value object encapsulating a list of voice rooms. + class BLACKMISC_EXPORT CVoiceRoomList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CVoiceRoomList) + //! Default constructor. CVoiceRoomList(); //! Construct from a base class object. CVoiceRoomList(const CSequence &other); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! \brief Register metadata - static void registerMetadata(); - //! Frequently needed for voice room resolutions static const CVoiceRoomList &twoEmptyRooms(); }; diff --git a/src/blackmisc/aviation/aircraftenginelist.cpp b/src/blackmisc/aviation/aircraftenginelist.cpp index 2333e8079..f9e5c4529 100644 --- a/src/blackmisc/aviation/aircraftenginelist.cpp +++ b/src/blackmisc/aviation/aircraftenginelist.cpp @@ -64,17 +64,5 @@ namespace BlackMisc push_back(engine); } } - - void CAircraftEngineList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index 3c1e91203..b8d4ac5a5 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -23,9 +23,13 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft engines. - class BLACKMISC_EXPORT CAircraftEngineList : public CSequence + class BLACKMISC_EXPORT CAircraftEngineList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftEngineList) + //! Default constructor. CAircraftEngineList() = default; @@ -41,20 +45,12 @@ namespace BlackMisc //! Engine number 1..x on? bool isEngineOn(int engineNumber) const; - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - //! \copydoc CValueObject::toJson QJsonObject toJson() const; //! \copydoc CValueObject::convertFromJson void convertFromJson(const QJsonObject &json); - //! Register metadata - static void registerMetadata(); }; } //namespace diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h index 78f01542e..18b03f647 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.h +++ b/src/blackmisc/aviation/aircrafticaocodelist.h @@ -27,7 +27,6 @@ namespace BlackMisc public CSequence, public BlackMisc::Mixin::MetaType { - public: BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftIcaoCodeList) diff --git a/src/blackmisc/aviation/aircraftlist.cpp b/src/blackmisc/aviation/aircraftlist.cpp index 4304b8283..c58ba92bd 100644 --- a/src/blackmisc/aviation/aircraftlist.cpp +++ b/src/blackmisc/aviation/aircraftlist.cpp @@ -27,17 +27,6 @@ namespace BlackMisc CSequence(other) { } - void CAircraftList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - CUserList CAircraftList::getPilots() const { return this->findBy(Predicates::MemberValid(&CAircraft::getPilot)).transform(Predicates::MemberTransform(&CAircraft::getPilot)); diff --git a/src/blackmisc/aviation/aircraftlist.h b/src/blackmisc/aviation/aircraftlist.h index 2edc5aafc..975ba0820 100644 --- a/src/blackmisc/aviation/aircraftlist.h +++ b/src/blackmisc/aviation/aircraftlist.h @@ -29,12 +29,16 @@ namespace BlackMisc namespace Aviation { //! Value object encapsulating a list of aircraft. + //! \deprecated consider using CSimulatedAircraftList class BLACKMISC_EXPORT CAircraftList : public CSequence, public ICallsignObjectList, - public BlackMisc::Geo::IGeoObjectWithRelativePositionList + public BlackMisc::Geo::IGeoObjectWithRelativePositionList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftList) + //! Default constructor. CAircraftList(); @@ -44,19 +48,10 @@ namespace BlackMisc //! All pilots (with valid data) BlackMisc::Network::CUserList getPilots() const; - //! \brief Update aircraft with data from VATSIM data file - //! \remarks The list used needs to contain the VATSIM data file objects + //! Update aircraft with data from VATSIM data file + //! \remarks The list used ("this") needs to contain the VATSIM data file objects bool updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const; - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/aviation/aircraftpartslist.cpp b/src/blackmisc/aviation/aircraftpartslist.cpp index a18a78815..347699dc5 100644 --- a/src/blackmisc/aviation/aircraftpartslist.cpp +++ b/src/blackmisc/aviation/aircraftpartslist.cpp @@ -20,16 +20,5 @@ namespace BlackMisc CSequence(other) { } - void CAircraftPartsList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index 5e4086214..ddc44c7ec 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -26,24 +26,17 @@ namespace BlackMisc class BLACKMISC_EXPORT CAircraftPartsList : public CSequence, public ITimestampObjectList, - public ICallsignObjectList + public ICallsignObjectList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftPartsList) + //! Default constructor. CAircraftPartsList(); //! Construct from a base class object. CAircraftPartsList(const CSequence &other); - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index c906febdc..b9524813c 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -24,16 +24,5 @@ namespace BlackMisc CSequence(other) { } - void CAircraftSituationList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index a9dba3953..a60dde2f1 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -26,24 +26,19 @@ namespace BlackMisc class BLACKMISC_EXPORT CAircraftSituationList : public CSequence, public ITimestampObjectList, - public ICallsignObjectList + public ICallsignObjectList, + public BlackMisc::Mixin::MetaType + { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftSituationList) + //! Default constructor. CAircraftSituationList(); //! Construct from a base class object. CAircraftSituationList(const CSequence &other); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Metadata - static void registerMetadata(); - }; } // namespace } // namespace diff --git a/src/blackmisc/aviation/airportlist.cpp b/src/blackmisc/aviation/airportlist.cpp index 6533d22c5..450dd2d03 100644 --- a/src/blackmisc/aviation/airportlist.cpp +++ b/src/blackmisc/aviation/airportlist.cpp @@ -19,17 +19,6 @@ namespace BlackMisc CSequence(other) { } - void CAirportList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - CAirportList CAirportList::findByIcao(const CAirportIcaoCode &icao) const { return this->findBy(&CAirport::getIcao, icao); diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 9bb21b02a..411bab781 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -29,9 +29,12 @@ namespace BlackMisc //! Value object for a list of airports. class BLACKMISC_EXPORT CAirportList : public CSequence, - public BlackMisc::Geo::IGeoObjectWithRelativePositionList + public BlackMisc::Geo::IGeoObjectWithRelativePositionList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAirportList) + //! Default constructor. CAirportList(); @@ -46,16 +49,6 @@ namespace BlackMisc //! Find first station by callsign, if not return given value / default CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const; - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace } // namespace diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 6708b0057..90aa323c2 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -24,17 +24,6 @@ namespace BlackMisc CSequence(other) { } - void CAtcStationList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - CAtcStationList CAtcStationList::findIfComUnitTunedIn25KHz(const CComSystem &comUnit) const { return this->findBy([&](const CAtcStation & atcStation) diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index e5984c87b..159587037 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -31,9 +31,12 @@ namespace BlackMisc class BLACKMISC_EXPORT CAtcStationList : public CSequence, public BlackMisc::Aviation::ICallsignObjectList, - public BlackMisc::Geo::IGeoObjectWithRelativePositionList + public BlackMisc::Geo::IGeoObjectWithRelativePositionList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAtcStationList) + //! Default constructor. CAtcStationList(); @@ -54,16 +57,6 @@ namespace BlackMisc //! Both sides (booking, online station) will be updated. //! \pre Can be used only if the stored data in this list are online ATC stations int syncronizeWithBookedStation(CAtcStation &bookedAtcStation); - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/hardware/keyboardkeylist.cpp b/src/blackmisc/hardware/keyboardkeylist.cpp index ecbdbaeaa..a3f034ae4 100644 --- a/src/blackmisc/hardware/keyboardkeylist.cpp +++ b/src/blackmisc/hardware/keyboardkeylist.cpp @@ -21,16 +21,5 @@ namespace BlackMisc CSequence(baseClass) { } - void CKeyboardKeyList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/hardware/keyboardkeylist.h b/src/blackmisc/hardware/keyboardkeylist.h index f8220a9db..b533909b3 100644 --- a/src/blackmisc/hardware/keyboardkeylist.h +++ b/src/blackmisc/hardware/keyboardkeylist.h @@ -22,23 +22,20 @@ namespace BlackMisc { namespace Hardware { - /*! - * Value object encapsulating a list of keyboard keys. - */ - class BLACKMISC_EXPORT CKeyboardKeyList : public CSequence + //! Value object encapsulating a list of keyboard keys. + class BLACKMISC_EXPORT CKeyboardKeyList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CKeyboardKeyList) + //! Default constructor CKeyboardKeyList(); //! Construct from a base class object. CKeyboardKeyList(const CSequence &baseClass); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! Register metadata - static void registerMetadata(); }; } //namespace diff --git a/src/blackmisc/namevariantpairlist.cpp b/src/blackmisc/namevariantpairlist.cpp index 297b06ebe..3169dde95 100644 --- a/src/blackmisc/namevariantpairlist.cpp +++ b/src/blackmisc/namevariantpairlist.cpp @@ -70,15 +70,4 @@ namespace BlackMisc } return -1; } - - void CNameVariantPairList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } } // namespace diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index 0fc943398..d99623365 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -20,10 +20,14 @@ namespace BlackMisc { //! Value object encapsulating a list of name/variant pairs - //! Currently name must be unique - class BLACKMISC_EXPORT CNameVariantPairList : public CSequence + //! \note Currently name must be unique + class BLACKMISC_EXPORT CNameVariantPairList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CNameVariantPairList) + //! Default constructor. CNameVariantPairList(); @@ -49,15 +53,6 @@ namespace BlackMisc //! If one is sure(!) the name does not exists, \sa push_back() can be used bool addOrReplaceValue(const QString &name, const CVariant &value, const CIcon &icon = CIcon()); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/network/aircraftmappinglist.cpp b/src/blackmisc/network/aircraftmappinglist.cpp index d7660d9da..2c5cb3d9d 100644 --- a/src/blackmisc/network/aircraftmappinglist.cpp +++ b/src/blackmisc/network/aircraftmappinglist.cpp @@ -74,16 +74,5 @@ namespace BlackMisc }); } - void CAircraftMappingList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/network/aircraftmappinglist.h b/src/blackmisc/network/aircraftmappinglist.h index 924863728..2c5d3c748 100644 --- a/src/blackmisc/network/aircraftmappinglist.h +++ b/src/blackmisc/network/aircraftmappinglist.h @@ -25,9 +25,13 @@ namespace BlackMisc namespace Network { //! Value object encapsulating a list of aircraft mappings - class BLACKMISC_EXPORT CAircraftMappingList : public CSequence + class BLACKMISC_EXPORT CAircraftMappingList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftMappingList) + //! Empty constructor. CAircraftMappingList(); @@ -51,15 +55,6 @@ namespace BlackMisc //! Find by model string CAircraftMappingList findByModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const; - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); }; } //namespace diff --git a/src/blackmisc/network/clientlist.cpp b/src/blackmisc/network/clientlist.cpp index 53f1a7222..5255b97d3 100644 --- a/src/blackmisc/network/clientlist.cpp +++ b/src/blackmisc/network/clientlist.cpp @@ -22,16 +22,5 @@ namespace BlackMisc CClientList::CClientList(const CSequence &other) : CSequence(other) { } - void CClientList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h index b4317e0c9..60dccf3c6 100644 --- a/src/blackmisc/network/clientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -30,22 +30,19 @@ namespace BlackMisc //! Value object encapsulating a list of voice rooms. class BLACKMISC_EXPORT CClientList : public CSequence, - public BlackMisc::Aviation::ICallsignObjectList + public BlackMisc::Aviation::ICallsignObjectList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CClientList) + //! Default constructor. CClientList(); //! Construct from a base class object. CClientList(const CSequence &other); - //! QVariant, required for DBus QVariant lists - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! Register metadata - static void registerMetadata(); }; - } //namespace } // namespace diff --git a/src/blackmisc/network/serverlist.cpp b/src/blackmisc/network/serverlist.cpp index e6535e80e..87e15d4d5 100644 --- a/src/blackmisc/network/serverlist.cpp +++ b/src/blackmisc/network/serverlist.cpp @@ -20,16 +20,5 @@ namespace BlackMisc CSequence(other) { } - void CServerList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index dc1e0aa35..3678a827b 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -21,27 +21,19 @@ namespace BlackMisc { namespace Network { - /*! - * Value object encapsulating a list of servers. - */ - class BLACKMISC_EXPORT CServerList : public CSequence + //! Value object encapsulating a list of servers. + class BLACKMISC_EXPORT CServerList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CServerList) + //! Default constructor. CServerList(); //! Construct from a base class object. CServerList(const CSequence &other); - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/network/textmessagelist.cpp b/src/blackmisc/network/textmessagelist.cpp index 99b7d9f85..563ddba24 100644 --- a/src/blackmisc/network/textmessagelist.cpp +++ b/src/blackmisc/network/textmessagelist.cpp @@ -87,17 +87,6 @@ namespace BlackMisc return this->contains(&CTextMessage::isRadioMessage, true); } - void CTextMessageList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - CTextMessageList CTextMessageList::findByFrequency(const CFrequency &frequency) const { return this->findBy(&CTextMessage::getFrequency, frequency); diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h index 5256a3671..5b8b0e3dd 100644 --- a/src/blackmisc/network/textmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -25,14 +25,15 @@ namespace BlackMisc { namespace Network { - /*! - * Value object encapsulating a list of text messages - */ + //! Value object encapsulating a list of text messages class BLACKMISC_EXPORT CTextMessageList : public CSequence, - public BlackMisc::ITimestampObjectList + public BlackMisc::ITimestampObjectList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CTextMessageList) + //! Default constructor. CTextMessageList(); @@ -81,15 +82,6 @@ namespace BlackMisc //! Mark all messages as sent void markAsSent(); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace } // namespace diff --git a/src/blackmisc/network/userlist.cpp b/src/blackmisc/network/userlist.cpp index 28c435c4d..861662a82 100644 --- a/src/blackmisc/network/userlist.cpp +++ b/src/blackmisc/network/userlist.cpp @@ -20,12 +20,5 @@ namespace BlackMisc CUserList::CUserList(const CSequence &other) : CSequence(other) { } - void CUserList::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index e48dd2663..c2cca4f16 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -25,24 +25,19 @@ namespace BlackMisc namespace Network { //! Value object encapsulating a list of voice rooms. - class BLACKMISC_EXPORT CUserList : public CSequence + class BLACKMISC_EXPORT CUserList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CUserList) + //! Default constructor. CUserList(); //! Construct from a base class object. CUserList(const CSequence &other); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h index 6287a905d..21be6b76d 100644 --- a/src/blackmisc/network/voicecapabilities.h +++ b/src/blackmisc/network/voicecapabilities.h @@ -20,9 +20,7 @@ namespace BlackMisc { namespace Network { - /*! - * Value object encapsulating information for voice capabilities. - */ + //! Value object encapsulating information for voice capabilities. class BLACKMISC_EXPORT CVoiceCapabilities : public CValueObject { public: diff --git a/src/blackmisc/propertyindexlist.cpp b/src/blackmisc/propertyindexlist.cpp index 0519e06d7..38f5a5b8e 100644 --- a/src/blackmisc/propertyindexlist.cpp +++ b/src/blackmisc/propertyindexlist.cpp @@ -11,30 +11,10 @@ namespace BlackMisc { - /* - * Default constructor - */ CPropertyIndexList::CPropertyIndexList() { } - /* - * Construct from base class object - */ CPropertyIndexList::CPropertyIndexList(const CSequence &other) : CSequence(other) { } - /* - * Register metadata - */ - void CPropertyIndexList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index 8d6a1e7f6..ef4ecd378 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -20,28 +20,20 @@ namespace BlackMisc { - /*! - * Value object encapsulating a list of property indexes. - */ - class BLACKMISC_EXPORT CPropertyIndexList : public CSequence + //! Value object encapsulating a list of property indexes. + class BLACKMISC_EXPORT CPropertyIndexList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CPropertyIndexList) + //! Default constructor. CPropertyIndexList(); //! Construct from a base class object. CPropertyIndexList(const CSequence &other); - - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); }; - } //namespace Q_DECLARE_METATYPE(BlackMisc::CPropertyIndexList) diff --git a/src/blackmisc/setkeyboardhotkeylist.cpp b/src/blackmisc/setkeyboardhotkeylist.cpp index 6d9961d37..c3d00f19a 100644 --- a/src/blackmisc/setkeyboardhotkeylist.cpp +++ b/src/blackmisc/setkeyboardhotkeylist.cpp @@ -44,20 +44,6 @@ namespace BlackMisc return this->findBy(&CSettingKeyboardHotkey::getFunction, function).frontOrDefault(); } - /* - * Register metadata - */ - void CSettingKeyboardHotkeyList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - /* * Hotkey list */ diff --git a/src/blackmisc/setkeyboardhotkeylist.h b/src/blackmisc/setkeyboardhotkeylist.h index ffc2f01fe..fa72dadfc 100644 --- a/src/blackmisc/setkeyboardhotkeylist.h +++ b/src/blackmisc/setkeyboardhotkeylist.h @@ -23,12 +23,14 @@ namespace BlackMisc { namespace Settings { - /*! - * Value object encapsulating a list of keyboard keys. - */ - class BLACKMISC_EXPORT CSettingKeyboardHotkeyList : public CSequence + //! Value object encapsulating a list of keyboard keys. + class BLACKMISC_EXPORT CSettingKeyboardHotkeyList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSettingKeyboardHotkeyList) + //! Default constructor CSettingKeyboardHotkeyList(); @@ -41,21 +43,10 @@ namespace BlackMisc //! Key for given function BlackMisc::Settings::CSettingKeyboardHotkey keyForFunction(const CHotkeyFunction &function) const; - /*! - * Fill the list with hotkeys - * \param reset true, list will be be reset, otherwise values will not be overridde - */ + //! Fill the list with hotkeys + //! \param reset true, list will be be reset, otherwise values will not be overridde void initAsHotkeyList(bool reset = true); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 974286d51..4df53740e 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -61,16 +61,5 @@ namespace BlackMisc return ms; } - void CAircraftModelList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index b8be872b1..71471b8db 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -21,21 +21,20 @@ namespace BlackMisc { namespace Simulation { - /*! - * Value object encapsulating a list of aircraft models - */ - class BLACKMISC_EXPORT CAircraftModelList : public CSequence + //! Value object encapsulating a list of aircraft models + class BLACKMISC_EXPORT CAircraftModelList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftModelList) + //! Empty constructor. CAircraftModelList(); //! Construct from a base class object. CAircraftModelList(const CSequence &other); - //! QVariant, required for DBus QVariant lists - QVariant toQVariant() const { return QVariant::fromValue(*this); } - //! Contains model string bool containsModelString(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const; @@ -51,12 +50,6 @@ namespace BlackMisc //! Model strings QStringList getSortedModelStrings() const; - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp index e1fedd1d1..aa2a1d537 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.cpp @@ -282,7 +282,7 @@ namespace BlackMisc QString content(line.mid(index + 1).trimmed()); - // fix "" strings, some are malformed and just contain " at beginning, end + // fix "" strings, some are malformed and just contain " at beginning, not clsoing at end of line if (content.endsWith('"')) { content.remove(content.size() - 1 , 1); } if (content.startsWith('"')) { content.remove(0 , 1); } @@ -294,17 +294,6 @@ namespace BlackMisc return content; } - void CAircraftCfgEntriesList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - BlackMisc::registerMetaValueType(); - } - } // namespace } // namespace } // namespace diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h index d8fd62b2c..f69522908 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h @@ -28,12 +28,13 @@ namespace BlackMisc { namespace FsCommon { - //! Utility, providing FS aircraft.cfg entries - class BLACKMISC_EXPORT CAircraftCfgEntriesList : public BlackMisc::CSequence + class BLACKMISC_EXPORT CAircraftCfgEntriesList : + public BlackMisc::CSequence, + public BlackMisc::Mixin::MetaType { - public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftCfgEntriesList) //! Constructor CAircraftCfgEntriesList(const QString &rootDirectory = "") : m_rootDirectory(rootDirectory) {} @@ -74,18 +75,9 @@ namespace BlackMisc //! Find by title CAircraftCfgEntriesList findByTitle(const QString &title, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive) const; - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - //! Do not include the following directories for FS static const QStringList &excludeDirectories(); - //! Register metadata - static void registerMetadata(); - private: QString m_rootDirectory; //!< root directory reading aircraft.cfg files bool m_readForDirectory = false; //!< valid read for given directory diff --git a/src/blackmisc/simulation/simulatedaircraftlist.cpp b/src/blackmisc/simulation/simulatedaircraftlist.cpp index 5d4c86bc6..7f172de6f 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.cpp +++ b/src/blackmisc/simulation/simulatedaircraftlist.cpp @@ -28,17 +28,6 @@ namespace BlackMisc CSequence(other) { } - void CSimulatedAircraftList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } - CUserList CSimulatedAircraftList::getPilots() const { return this->findBy(Predicates::MemberValid(&CSimulatedAircraft::getPilot)).transform(Predicates::MemberTransform(&CSimulatedAircraft::getPilot)); diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 6e0a86751..904fcf360 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -32,9 +32,12 @@ namespace BlackMisc class BLACKMISC_EXPORT CSimulatedAircraftList : public BlackMisc::CSequence, public BlackMisc::Aviation::ICallsignObjectList, - public BlackMisc::Geo::IGeoObjectWithRelativePositionList + public BlackMisc::Geo::IGeoObjectWithRelativePositionList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSimulatedAircraftList) + //! Default constructor. CSimulatedAircraftList(); @@ -71,18 +74,9 @@ namespace BlackMisc //! Rendered? bool isRendered(const BlackMisc::Aviation::CCallsign &callsign) const; - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - //! To aircraft list BlackMisc::Aviation::CAircraftList toAircraftList() const; - //! Register metadata - static void registerMetadata(); - }; } //namespace diff --git a/src/blackmisc/simulation/simulatorinfolist.cpp b/src/blackmisc/simulation/simulatorinfolist.cpp index ec1275575..fc7b99db9 100644 --- a/src/blackmisc/simulation/simulatorinfolist.cpp +++ b/src/blackmisc/simulation/simulatorinfolist.cpp @@ -29,16 +29,5 @@ namespace BlackMisc return this->transform([i18n](const CSimulatorPluginInfo & info) { return info.toQString(i18n); }); } - void CSimulatorPluginInfoList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - BlackMisc::registerMetaValueType(); - } - } // namespace } // namespace diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h index 959d143cb..c7187aa13 100644 --- a/src/blackmisc/simulation/simulatorinfolist.h +++ b/src/blackmisc/simulation/simulatorinfolist.h @@ -23,27 +23,25 @@ namespace BlackMisc namespace Simulation { //! Value object encapsulating a list of SimulatorInfo objects. - class BLACKMISC_EXPORT CSimulatorPluginInfoList : public BlackMisc::CSequence + class BLACKMISC_EXPORT CSimulatorPluginInfoList : + public BlackMisc::CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CSimulatorPluginInfoList) + //! Default constructor CSimulatorPluginInfoList(); //! Construct from a base class object. CSimulatorPluginInfoList(const CSequence &other); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - //! Is simulator supported bool supportsSimulator(const QString &simulator); //! String list with meaningful representations QStringList toStringList(bool i18n = false) const; - //! Register the metatypes - static void registerMetadata(); - }; } // ns } // ns diff --git a/src/blackmisc/statusmessagelist.cpp b/src/blackmisc/statusmessagelist.cpp index 7c85e79ff..a3c574d44 100644 --- a/src/blackmisc/statusmessagelist.cpp +++ b/src/blackmisc/statusmessagelist.cpp @@ -56,18 +56,4 @@ namespace BlackMisc msg.addCategories(categories); } } - - /* - * Metadata - */ - void CStatusMessageList::registerMetadata() - { - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType>(); - qDBusRegisterMetaType>(); - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } -} +} // ns diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index 159cffd5e..b80181221 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -22,14 +22,15 @@ namespace BlackMisc { - /*! - * Status messages, e.g. from Core -> GUI - */ + //! Status messages, e.g. from Core -> GUI class BLACKMISC_EXPORT CStatusMessageList : public CSequence, - public ITimestampObjectList + public ITimestampObjectList, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CStatusMessageList) + //! Constructor CStatusMessageList() {} @@ -48,17 +49,8 @@ namespace BlackMisc //! Add some categories to all messages in the list void addCategories(const CLogCategoryList &categories); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! Register metadata of unit and quantity - static void registerMetadata(); - }; -} +} // ns Q_DECLARE_METATYPE(BlackMisc::CStatusMessageList) Q_DECLARE_METATYPE(BlackMisc::CCollection) diff --git a/src/blackmisc/variantlist.cpp b/src/blackmisc/variantlist.cpp index 5f82b3692..36852fc59 100644 --- a/src/blackmisc/variantlist.cpp +++ b/src/blackmisc/variantlist.cpp @@ -11,11 +11,6 @@ namespace BlackMisc { - /* - * Default constructor - */ - CVariantList::CVariantList() = default; - /* * Construct from base class object */ @@ -23,13 +18,4 @@ namespace BlackMisc CSequence(other) {} - /* - * Register metadata - */ - void CVariantList::registerMetadata() - { - qRegisterMetaType(); - qDBusRegisterMetaType(); - registerMetaValueType(); - } } // namespace diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index e0d0f5f16..c592fdb3a 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -20,28 +20,21 @@ namespace BlackMisc { - /*! - * Value object encapsulating a list of variants. - */ - class BLACKMISC_EXPORT CVariantList : public CSequence + //! Value object encapsulating a list of variants. + class BLACKMISC_EXPORT CVariantList : + public CSequence, + public BlackMisc::Mixin::MetaType { public: + BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CVariantList) + //! Default constructor. - CVariantList(); + CVariantList() = default; //! Construct from a base class object. CVariantList(const CSequence &other); - //! \copydoc CValueObject::toQVariant - QVariant toQVariant() const { return QVariant::fromValue(*this); } - - //! \copydoc CValueObject::convertFromQVariant - void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); } - - //! \brief Register metadata - static void registerMetadata(); }; - } Q_DECLARE_METATYPE(BlackMisc::CVariantList)