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.

1 files changed, 10 insertions, 19 deletions

diff --git a/lib/csapi/definitions/push_rule.cpp b/lib/csapi/definitions/push_rule.cpp
index baddd187..abbb04b5 100644
--- a/lib/csapi/definitions/push_rule.cpp
+++ b/lib/csapi/definitions/push_rule.cpp
@@ -6,34 +6,25 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const PushRule& pod)
+void JsonObjectConverter<PushRule>::dumpTo(
+        QJsonObject& jo, const PushRule& pod)
 {
-    QJsonObject jo;
     addParam<>(jo, QStringLiteral("actions"), pod.actions);
     addParam<>(jo, QStringLiteral("default"), pod.isDefault);
     addParam<>(jo, QStringLiteral("enabled"), pod.enabled);
     addParam<>(jo, QStringLiteral("rule_id"), pod.ruleId);
     addParam<IfNotEmpty>(jo, QStringLiteral("conditions"), pod.conditions);
     addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
-    return jo;
 }
 
-PushRule FromJsonObject<PushRule>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<PushRule>::fillFrom(
+    const QJsonObject& jo, PushRule& result)
 {
-    PushRule result;
-    result.actions =
-        fromJson<QVector<QVariant>>(jo.value("actions"_ls));
-    result.isDefault =
-        fromJson<bool>(jo.value("default"_ls));
-    result.enabled =
-        fromJson<bool>(jo.value("enabled"_ls));
-    result.ruleId =
-        fromJson<QString>(jo.value("rule_id"_ls));
-    result.conditions =
-        fromJson<QVector<PushCondition>>(jo.value("conditions"_ls));
-    result.pattern =
-        fromJson<QString>(jo.value("pattern"_ls));
-
-    return result;
+    fromJson(jo.value("actions"_ls), result.actions);
+    fromJson(jo.value("default"_ls), result.isDefault);
+    fromJson(jo.value("enabled"_ls), result.enabled);
+    fromJson(jo.value("rule_id"_ls), result.ruleId);
+    fromJson(jo.value("conditions"_ls), result.conditions);
+    fromJson(jo.value("pattern"_ls), result.pattern);
 }