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.
---
 .../definitions/request_email_validation.cpp       | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'lib/identity/definitions/request_email_validation.cpp')

diff --git a/lib/identity/definitions/request_email_validation.cpp b/lib/identity/definitions/request_email_validation.cpp
index 95088bcb..47463a8b 100644
--- a/lib/identity/definitions/request_email_validation.cpp
+++ b/lib/identity/definitions/request_email_validation.cpp
@@ -6,28 +6,21 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const RequestEmailValidation& pod)
+void JsonObjectConverter<RequestEmailValidation>::dumpTo(
+        QJsonObject& jo, const RequestEmailValidation& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("client_secret"), pod.clientSecret);
     addParam<>(jo, QStringLiteral("email"), pod.email);
     addParam<>(jo, QStringLiteral("send_attempt"), pod.sendAttempt);
     addParam<IfNotEmpty>(jo, QStringLiteral("next_link"), pod.nextLink);
-    return jo;
 }
 
-RequestEmailValidation FromJsonObject<RequestEmailValidation>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<RequestEmailValidation>::fillFrom(
+    const QJsonObject& jo, RequestEmailValidation& result)
 {
-    RequestEmailValidation result;
-    result.clientSecret =
-        fromJson<QString>(jo.value("client_secret"_ls));
-    result.email =
-        fromJson<QString>(jo.value("email"_ls));
-    result.sendAttempt =
-        fromJson<int>(jo.value("send_attempt"_ls));
-    result.nextLink =
-        fromJson<QString>(jo.value("next_link"_ls));
-
-    return result;
+    fromJson(jo.value("client_secret"_ls), result.clientSecret);
+    fromJson(jo.value("email"_ls), result.email);
+    fromJson(jo.value("send_attempt"_ls), result.sendAttempt);
+    fromJson(jo.value("next_link"_ls), result.nextLink);
 }
 
-- 
cgit v1.2.3