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/definitions/device_keys.cpp | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'lib/csapi/definitions/device_keys.cpp')

diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp
index a0e0ca42..1e79499f 100644
--- a/lib/csapi/definitions/device_keys.cpp
+++ b/lib/csapi/definitions/device_keys.cpp
@@ -6,31 +6,23 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const DeviceKeys& pod)
+void JsonObjectConverter<DeviceKeys>::dumpTo(
+        QJsonObject& jo, const DeviceKeys& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("user_id"), pod.userId);
     addParam<>(jo, QStringLiteral("device_id"), pod.deviceId);
     addParam<>(jo, QStringLiteral("algorithms"), pod.algorithms);
     addParam<>(jo, QStringLiteral("keys"), pod.keys);
     addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
-    return jo;
 }
 
-DeviceKeys FromJsonObject<DeviceKeys>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<DeviceKeys>::fillFrom(
+    const QJsonObject& jo, DeviceKeys& result)
 {
-    DeviceKeys result;
-    result.userId =
-        fromJson<QString>(jo.value("user_id"_ls));
-    result.deviceId =
-        fromJson<QString>(jo.value("device_id"_ls));
-    result.algorithms =
-        fromJson<QStringList>(jo.value("algorithms"_ls));
-    result.keys =
-        fromJson<QHash<QString, QString>>(jo.value("keys"_ls));
-    result.signatures =
-        fromJson<QHash<QString, QHash<QString, QString>>>(jo.value("signatures"_ls));
-
-    return result;
+    fromJson(jo.value("user_id"_ls), result.userId);
+    fromJson(jo.value("device_id"_ls), result.deviceId);
+    fromJson(jo.value("algorithms"_ls), result.algorithms);
+    fromJson(jo.value("keys"_ls), result.keys);
+    fromJson(jo.value("signatures"_ls), result.signatures);
 }
 
-- 
cgit v1.2.3