diff options
| author | Hubert Chathi <uhoreg@debian.org> | 2019-06-25 16:33:24 -0400 |
|---|---|---|
| committer | Hubert Chathi <uhoreg@debian.org> | 2019-06-25 16:33:24 -0400 |
| commit | 72d5660efd0755bb53a8699cd39865155400d288 (patch) | |
| tree | ed7e7537e6a3eb7e8b92226c4015f9bfc8e11c5a /lib/csapi/definitions/push_ruleset.h | |
| parent | 52407a933bfe1fcc5f3aa1dccaa0b9a8279aa634 (diff) | |
| parent | 681203f951d13e9e8eaf772435cac28c6d74cd42 (diff) | |
| download | libquotient-72d5660efd0755bb53a8699cd39865155400d288.tar.gz libquotient-72d5660efd0755bb53a8699cd39865155400d288.zip | |
Merge branch 'upstream' (v0.5.2)
Diffstat (limited to 'lib/csapi/definitions/push_ruleset.h')
| -rw-r--r-- | lib/csapi/definitions/push_ruleset.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/csapi/definitions/push_ruleset.h b/lib/csapi/definitions/push_ruleset.h index a274b72a..f2d937c0 100644 --- a/lib/csapi/definitions/push_ruleset.h +++ b/lib/csapi/definitions/push_ruleset.h @@ -22,12 +22,10 @@ namespace QMatrixClient QVector<PushRule> sender; QVector<PushRule> underride; }; - - QJsonObject toJson(const PushRuleset& pod); - - template <> struct FromJsonObject<PushRuleset> + template <> struct JsonObjectConverter<PushRuleset> { - PushRuleset operator()(const QJsonObject& jo) const; + static void dumpTo(QJsonObject& jo, const PushRuleset& pod); + static void fillFrom(const QJsonObject& jo, PushRuleset& pod); }; } // namespace QMatrixClient |