From d57485bb3a7d980642e7f68edd5785c144acc742 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 8 Sep 2017 18:36:44 +0900
Subject: converters.h: Facility methods for generated jobs

A cherry-pick from the kitsune-apigen branch; a family of toJson() and fromJson<>() functions to unify conversion of data back and forth.
---
 jobs/converters.h | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 jobs/converters.h

(limited to 'jobs/converters.h')

diff --git a/jobs/converters.h b/jobs/converters.h
new file mode 100644
index 00000000..376dfeab
--- /dev/null
+++ b/jobs/converters.h
@@ -0,0 +1,89 @@
+/******************************************************************************
+* Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+*
+* 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
+*/
+
+#pragma once
+
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonArray>
+#include <QtCore/QDate>
+
+namespace QMatrixClient
+{
+    template <typename T>
+    inline QJsonValue toJson(T val)
+    {
+        return QJsonValue(val);
+    }
+
+    template <typename T>
+    inline QJsonValue toJson(const QVector<T>& vals)
+    {
+        QJsonArray ar;
+        for (const auto& v: vals)
+            ar.push_back(toJson(v));
+        return ar;
+    }
+
+    inline QJsonValue toJson(const QStringList& strings)
+    {
+        return QJsonArray::fromStringList(strings);
+    }
+
+    template <typename T>
+    inline T fromJson(const QJsonValue& jv)
+    {
+        return QVariant(jv).value<T>();
+    }
+
+    template <>
+    inline int fromJson<int>(const QJsonValue& jv)
+    {
+        return jv.toInt();
+    }
+
+    template <>
+    inline qint64 fromJson<qint64>(const QJsonValue& jv)
+    {
+        return static_cast<qint64>(jv.toDouble());
+    }
+
+    template <>
+    inline double fromJson<double>(const QJsonValue& jv)
+    {
+        return jv.toDouble();
+    }
+
+    template <>
+    inline QString fromJson<QString>(const QJsonValue& jv)
+    {
+        return jv.toString();
+    }
+
+    template <>
+    inline QDateTime fromJson<QDateTime>(const QJsonValue& jv)
+    {
+        return QDateTime::fromMSecsSinceEpoch(fromJson<qint64>(jv), Qt::UTC);
+    }
+
+    template <>
+    inline QDate fromJson<QDate>(const QJsonValue& jv)
+    {
+        return QDateTime::fromMSecsSinceEpoch(
+            fromJson<qint64>(jv), Qt::UTC).date();
+    }
+}  // namespace QMatrixClient
\ No newline at end of file
-- 
cgit v1.2.3


From 5ddfbf25f2657f232649a9fdd2ad481127f6c349 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Wed, 13 Sep 2017 21:09:20 +0900
Subject: Add a missing #include

---
 jobs/converters.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'jobs/converters.h')

diff --git a/jobs/converters.h b/jobs/converters.h
index 376dfeab..f9ab0269 100644
--- a/jobs/converters.h
+++ b/jobs/converters.h
@@ -21,6 +21,7 @@
 #include <QtCore/QJsonValue>
 #include <QtCore/QJsonArray>
 #include <QtCore/QDate>
+#include <QtCore/QVariant>
 
 namespace QMatrixClient
 {
@@ -83,7 +84,6 @@ namespace QMatrixClient
     template <>
     inline QDate fromJson<QDate>(const QJsonValue& jv)
     {
-        return QDateTime::fromMSecsSinceEpoch(
-            fromJson<qint64>(jv), Qt::UTC).date();
+        return fromJson<QDateTime>(jv).date();
     }
-}  // namespace QMatrixClient
\ No newline at end of file
+}  // namespace QMatrixClient
-- 
cgit v1.2.3