Merge pull request #263 from QMatrixClient/kitsune-lazy-loading

Lazy loading members

1 files changed, 9 insertions, 17 deletions

diff --git a/lib/csapi/definitions/push_ruleset.cpp b/lib/csapi/definitions/push_ruleset.cpp
index 14b7a4b6..f1bad882 100644
--- a/lib/csapi/definitions/push_ruleset.cpp
+++ b/lib/csapi/definitions/push_ruleset.cpp
@@ -6,31 +6,23 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const PushRuleset& pod)
+void JsonObjectConverter<PushRuleset>::dumpTo(
+        QJsonObject& jo, const PushRuleset& pod)
 {
-    QJsonObject jo;
     addParam<IfNotEmpty>(jo, QStringLiteral("content"), pod.content);
     addParam<IfNotEmpty>(jo, QStringLiteral("override"), pod.override);
     addParam<IfNotEmpty>(jo, QStringLiteral("room"), pod.room);
     addParam<IfNotEmpty>(jo, QStringLiteral("sender"), pod.sender);
     addParam<IfNotEmpty>(jo, QStringLiteral("underride"), pod.underride);
-    return jo;
 }
 
-PushRuleset FromJsonObject<PushRuleset>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<PushRuleset>::fillFrom(
+    const QJsonObject& jo, PushRuleset& result)
 {
-    PushRuleset result;
-    result.content =
-        fromJson<QVector<PushRule>>(jo.value("content"_ls));
-    result.override =
-        fromJson<QVector<PushRule>>(jo.value("override"_ls));
-    result.room =
-        fromJson<QVector<PushRule>>(jo.value("room"_ls));
-    result.sender =
-        fromJson<QVector<PushRule>>(jo.value("sender"_ls));
-    result.underride =
-        fromJson<QVector<PushRule>>(jo.value("underride"_ls));
-
-    return result;
+    fromJson(jo.value("content"_ls), result.content);
+    fromJson(jo.value("override"_ls), result.override);
+    fromJson(jo.value("room"_ls), result.room);
+    fromJson(jo.value("sender"_ls), result.sender);
+    fromJson(jo.value("underride"_ls), result.underride);
 }