From 4c14737d6064aee7678ed8a0f122356efc7d8b9d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 28 Jun 2014 01:56:05 +0200 Subject: [PATCH] Fixed missing JSON methods --- src/blackmisc/avflightplan.cpp | 15 +++++++++++++++ src/blackmisc/avflightplan.h | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/src/blackmisc/avflightplan.cpp b/src/blackmisc/avflightplan.cpp index 8846ed7aa..0136d4bc2 100644 --- a/src/blackmisc/avflightplan.cpp +++ b/src/blackmisc/avflightplan.cpp @@ -79,6 +79,21 @@ namespace BlackMisc argument >> TupleConverter::toTuple(*this); } + const QStringList &CFlightPlan::jsonMembers() + { + return TupleConverter::jsonMembers(); + } + + QJsonObject CFlightPlan::toJson() const + { + return BlackMisc::serializeJson(CFlightPlan::jsonMembers(), TupleConverter::toTuple(*this)); + } + + void CFlightPlan::fromJson(const QJsonObject &json) + { + BlackMisc::deserializeJson(json, CFlightPlan::jsonMembers(), TupleConverter::toTuple(*this)); + } + void CFlightPlan::registerMetadata() { qRegisterMetaType(); diff --git a/src/blackmisc/avflightplan.h b/src/blackmisc/avflightplan.h index 0d4a3bdb3..d59b8cb20 100644 --- a/src/blackmisc/avflightplan.h +++ b/src/blackmisc/avflightplan.h @@ -195,9 +195,18 @@ namespace BlackMisc //! \copydoc CValueObject::getValueHash virtual uint getValueHash() const override; + //! \copydoc CValueObject::toJson + virtual QJsonObject toJson() const override; + + //! \copydoc CValueObject::fromJson + virtual void fromJson(const QJsonObject &json) override; + //! Register metadata static void registerMetadata(); + //! Members + static const QStringList &jsonMembers(); + protected: //! \copydoc CValueObject::convertToQString() virtual QString convertToQString(bool i18n = false) const override;