From 067aecdecae379099b77cf59afa1ef03fbbe338e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 13 Feb 2015 02:09:16 +0100 Subject: [PATCH] Fixed missing metadata registration --- src/blackmisc/avaircraftsituationlist.cpp | 11 +++++++++++ src/blackmisc/avaircraftsituationlist.h | 4 ++++ src/blackmisc/avallclasses.h | 3 ++- src/blackmisc/blackmiscfreefunctions_avmeta.cpp | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/blackmisc/avaircraftsituationlist.cpp b/src/blackmisc/avaircraftsituationlist.cpp index d708495c8..fb8a0ff21 100644 --- a/src/blackmisc/avaircraftsituationlist.cpp +++ b/src/blackmisc/avaircraftsituationlist.cpp @@ -23,5 +23,16 @@ namespace BlackMisc CSequence(other) { } + void CAircraftSituationList::registerMetadata() + { + qRegisterMetaType>(); + qDBusRegisterMetaType>(); + qRegisterMetaType>(); + qDBusRegisterMetaType>(); + qRegisterMetaType(); + qDBusRegisterMetaType(); + registerMetaValueType(); + } + } // namespace } // namespace diff --git a/src/blackmisc/avaircraftsituationlist.h b/src/blackmisc/avaircraftsituationlist.h index e9215f921..a5b5520de 100644 --- a/src/blackmisc/avaircraftsituationlist.h +++ b/src/blackmisc/avaircraftsituationlist.h @@ -40,6 +40,9 @@ namespace BlackMisc //! \copydoc CValueObject::convertFromQVariant virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); } + //! Metadata + static void registerMetadata(); + protected: //! Myself virtual const CAircraftSituationList &getContainer() const { return *this; } @@ -52,6 +55,7 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationList) +Q_DECLARE_METATYPE(BlackMisc::CCollection) Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/avallclasses.h b/src/blackmisc/avallclasses.h index 765ff6d56..98aa9b538 100644 --- a/src/blackmisc/avallclasses.h +++ b/src/blackmisc/avallclasses.h @@ -17,8 +17,9 @@ #include "blackmisc/avcallsignlist.h" #include "blackmisc/avatcstation.h" #include "blackmisc/avatcstationlist.h" -#include "blackmisc/avaircraft.h" #include "blackmisc/avaircraftlist.h" +#include "blackmisc/avaircraftsituation.h" +#include "blackmisc/avaircraftsituationlist.h" #include "blackmisc/avairport.h" #include "blackmisc/avairportlist.h" #include "blackmisc/avinformationmessage.h" diff --git a/src/blackmisc/blackmiscfreefunctions_avmeta.cpp b/src/blackmisc/blackmiscfreefunctions_avmeta.cpp index febce07f8..ed589e549 100644 --- a/src/blackmisc/blackmiscfreefunctions_avmeta.cpp +++ b/src/blackmisc/blackmiscfreefunctions_avmeta.cpp @@ -35,6 +35,7 @@ void BlackMisc::Aviation::registerMetadata() CAirport::registerMetadata(); CAirportList::registerMetadata(); CAircraftSituation::registerMetadata(); + CAircraftSituationList::registerMetadata(); CAircraftIcao::registerMetadata(); CAirportIcao::registerMetadata(); CSelcal::registerMetadata();