Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 31 insertions, 17 deletions

diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h
index f2d937c0..ba780a33 100644
--- a/lib/csapi/definitions/push_ruleset.h
+++ b/lib/csapi/definitions/push_ruleset.h
@@ -6,26 +6,40 @@
 
 #include "converters.h"
 
-#include <QtCore/QVector>
-#include "converters.h"
 #include "csapi/definitions/push_rule.h"
 
-namespace QMatrixClient
-{
-    // Data structures
+namespace Quotient {
+
+struct PushRuleset {
+    QVector<PushRule> content;
+
+    QVector<PushRule> override;
+
+    QVector<PushRule> room;
+
+    QVector<PushRule> sender;
+
+    QVector<PushRule> underride;
+};
 
-    struct PushRuleset
+template <>
+struct JsonObjectConverter<PushRuleset> {
+    static void dumpTo(QJsonObject& jo, const PushRuleset& pod)
     {
-        QVector<PushRule> content;
-        QVector<PushRule> override;
-        QVector<PushRule> room;
-        QVector<PushRule> sender;
-        QVector<PushRule> underride;
-    };
-    template <> struct JsonObjectConverter<PushRuleset>
+        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);
+    }
+    static void fillFrom(const QJsonObject& jo, PushRuleset& pod)
     {
-        static void dumpTo(QJsonObject& jo, const PushRuleset& pod);
-        static void fillFrom(const QJsonObject& jo, PushRuleset& pod);
-    };
+        fromJson(jo.value("content"_ls), pod.content);
+        fromJson(jo.value("override"_ls), pod.override);
+        fromJson(jo.value("room"_ls), pod.room);
+        fromJson(jo.value("sender"_ls), pod.sender);
+        fromJson(jo.value("underride"_ls), pod.underride);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient