diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 22:22:49 +0900 |
| commit | b55334ac0fe89f780776bc4eab90ffe1ca3c57bb (patch) | |
| tree | 1a45c0ccfec8f5f7ba37eb4385cdc7f61afa0c97 /lib/csapi/definitions/push_rule.h | |
| parent | f5c2e47fa1ab84fdaffe03c30ba973d7dea5ac05 (diff) | |
| parent | 1e6510790dab6b9141ae52993987b406399668cd (diff) | |
| download | libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.tar.gz libquotient-b55334ac0fe89f780776bc4eab90ffe1ca3c57bb.zip | |
Merge branch 'cs-api-0.4.0'
Diffstat (limited to 'lib/csapi/definitions/push_rule.h')
| -rw-r--r-- | lib/csapi/definitions/push_rule.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h index c6542aa6..5f52876d 100644 --- a/lib/csapi/definitions/push_rule.h +++ b/lib/csapi/definitions/push_rule.h @@ -37,9 +37,9 @@ namespace QMatrixClient QJsonObject toJson(const PushRule& pod); - template <> struct FromJson<PushRule> + template <> struct FromJsonObject<PushRule> { - PushRule operator()(const QJsonValue& jv); + PushRule operator()(const QJsonObject& jo) const; }; } // namespace QMatrixClient |