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/events/eventloader.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/events/eventloader.h')
| -rw-r--r-- | lib/events/eventloader.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h index 3ee9a181..da663392 100644 --- a/lib/events/eventloader.h +++ b/lib/events/eventloader.h @@ -19,7 +19,6 @@ #pragma once #include "stateevent.h" -#include "converters.h" namespace QMatrixClient { namespace _impl { @@ -58,11 +57,15 @@ namespace QMatrixClient { matrixType); } - template <typename EventT> struct FromJsonObject<event_ptr_tt<EventT>> + template <typename EventT> struct JsonConverter<event_ptr_tt<EventT>> { - auto operator()(const QJsonObject& jo) const + static auto load(const QJsonValue& jv) { - return loadEvent<EventT>(jo); + return loadEvent<EventT>(jv.toObject()); + } + static auto load(const QJsonDocument& jd) + { + return loadEvent<EventT>(jd.object()); } }; } // namespace QMatrixClient |