From 38440a724acf8836e74e5bca29105e493f36eb7c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 3 Jun 2018 17:12:35 +0900 Subject: csapi + converters: Support variant types (using QVariant) This mandated some rearrangement of toJson() overloads and FromJson<> specializations for QVariant* types - instead of variant_converters.h they are now in converters.cpp. --- lib/converters.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 lib/converters.cpp (limited to 'lib/converters.cpp') diff --git a/lib/converters.cpp b/lib/converters.cpp new file mode 100644 index 00000000..f726db4c --- /dev/null +++ b/lib/converters.cpp @@ -0,0 +1,59 @@ +/****************************************************************************** +* Copyright (C) 2018 Kitsune Ral +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +QJsonValue toJson(const QVariant& v) +{ + return QJsonValue::fromVariant(v); +} + +QJsonObject toJson(const QVariantMap& map) +{ + return QJsonObject::fromVariantMap(map); +} + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) +QJsonObject toJson(const QVariantHash& hMap) +{ + return QJsonObject::fromVariantHash(hMap); +} +#endif + +QVariant FromJson::operator()(const QJsonValue& jv) const +{ + return jv.toVariant(); +} + +QMap +FromJson>::operator()(const QJsonValue& jv) const +{ + return jv.toObject().toVariantMap(); +} + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) +QHash +FromJson>::operator()(const QJsonValue& jv) const +{ + return jv.toObject().toVariantHash(); +} +#endif -- cgit v1.2.3