From 3392e66fd015e191b01f6e3fc6839edc3948e31f Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sat, 8 Dec 2018 15:36:04 +0900
Subject: Refactor toJson/fillJson

Both now use through a common JsonConverter<> template class with its
base definition tuned for structs/QJsonObjects and specialisations for
non-object types. This new implementation doesn't work with virtual
fillJson functions yet (so EventContent classes still use toJson as a
member function) and does not cope quite well with non-constructible
objects (you have to specialise JsonConverter<> rather than, more
intuitively, JsonObjectConverter<>), but overall is more streamlined
compared to the previous implementation. It also fixes one important
issue that pushed for a rewrite: the previous implementation was not
working with structure hierarchies at all so (in particular) the Filter
part of CS API was totally disfunctional.
---
 lib/csapi/pusher.cpp | 59 ++++++++++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 37 deletions(-)

(limited to 'lib/csapi/pusher.cpp')

diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index d20db88a..3ad0dcbe 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -16,43 +16,27 @@ namespace QMatrixClient
 {
     // Converters
 
-    template <> struct FromJsonObject<GetPushersJob::PusherData>
+    template <> struct JsonObjectConverter<GetPushersJob::PusherData>
     {
-        GetPushersJob::PusherData operator()(const QJsonObject& jo) const
+        static void fillFrom(const QJsonObject& jo, GetPushersJob::PusherData& result)
         {
-            GetPushersJob::PusherData result;
-            result.url =
-                fromJson<QString>(jo.value("url"_ls));
-            result.format =
-                fromJson<QString>(jo.value("format"_ls));
-
-            return result;
+            fromJson(jo.value("url"_ls), result.url);
+            fromJson(jo.value("format"_ls), result.format);
         }
     };
 
-    template <> struct FromJsonObject<GetPushersJob::Pusher>
+    template <> struct JsonObjectConverter<GetPushersJob::Pusher>
     {
-        GetPushersJob::Pusher operator()(const QJsonObject& jo) const
+        static void fillFrom(const QJsonObject& jo, GetPushersJob::Pusher& result)
         {
-            GetPushersJob::Pusher result;
-            result.pushkey =
-                fromJson<QString>(jo.value("pushkey"_ls));
-            result.kind =
-                fromJson<QString>(jo.value("kind"_ls));
-            result.appId =
-                fromJson<QString>(jo.value("app_id"_ls));
-            result.appDisplayName =
-                fromJson<QString>(jo.value("app_display_name"_ls));
-            result.deviceDisplayName =
-                fromJson<QString>(jo.value("device_display_name"_ls));
-            result.profileTag =
-                fromJson<QString>(jo.value("profile_tag"_ls));
-            result.lang =
-                fromJson<QString>(jo.value("lang"_ls));
-            result.data =
-                fromJson<GetPushersJob::PusherData>(jo.value("data"_ls));
-
-            return result;
+            fromJson(jo.value("pushkey"_ls), result.pushkey);
+            fromJson(jo.value("kind"_ls), result.kind);
+            fromJson(jo.value("app_id"_ls), result.appId);
+            fromJson(jo.value("app_display_name"_ls), result.appDisplayName);
+            fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
+            fromJson(jo.value("profile_tag"_ls), result.profileTag);
+            fromJson(jo.value("lang"_ls), result.lang);
+            fromJson(jo.value("data"_ls), result.data);
         }
     };
 } // namespace QMatrixClient
@@ -88,7 +72,7 @@ const QVector<GetPushersJob::Pusher>& GetPushersJob::pushers() const
 BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
-    d->pushers = fromJson<QVector<Pusher>>(json.value("pushers"_ls));
+    fromJson(json.value("pushers"_ls), d->pushers);
     return Success;
 }
 
@@ -96,13 +80,14 @@ namespace QMatrixClient
 {
     // Converters
 
-    QJsonObject toJson(const PostPusherJob::PusherData& pod)
+    template <> struct JsonObjectConverter<PostPusherJob::PusherData>
     {
-        QJsonObject jo;
-        addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
-        addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
-        return jo;
-    }
+        static void dumpTo(QJsonObject& jo, const PostPusherJob::PusherData& pod)
+        {
+            addParam<IfNotEmpty>(jo, QStringLiteral("url"), pod.url);
+            addParam<IfNotEmpty>(jo, QStringLiteral("format"), pod.format);
+        }
+    };
 } // namespace QMatrixClient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
-- 
cgit v1.2.3


From 8dcda23ed210151904c9137067626eddae683822 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 13 Dec 2018 07:47:58 +0900
Subject: Regenerate csapi/

---
 lib/csapi/pusher.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/csapi/pusher.cpp')

diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp
index d20db88a..0ca13368 100644
--- a/lib/csapi/pusher.cpp
+++ b/lib/csapi/pusher.cpp
@@ -107,7 +107,7 @@ namespace QMatrixClient
 
 static const auto PostPusherJobName = QStringLiteral("PostPusherJob");
 
-PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append)
+PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, Omittable<bool> append)
     : BaseJob(HttpVerb::Post, PostPusherJobName,
         basePath % "/pushers/set")
 {
-- 
cgit v1.2.3