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/events/eventloader.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/events/eventloader.h')
| -rw-r--r-- | lib/events/eventloader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h index ea261cac..3ee9a181 100644 --- a/lib/events/eventloader.h +++ b/lib/events/eventloader.h @@ -58,11 +58,11 @@ namespace QMatrixClient { matrixType); } - template <typename EventT> struct FromJson<event_ptr_tt<EventT>> + template <typename EventT> struct FromJsonObject<event_ptr_tt<EventT>> { - auto operator()(const QJsonValue& jv) const + auto operator()(const QJsonObject& jo) const { - return loadEvent<EventT>(jv.toObject()); + return loadEvent<EventT>(jo); } }; } // namespace QMatrixClient |