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/room_state.cpp | |
| 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/room_state.cpp')
| -rw-r--r-- | lib/csapi/room_state.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp index 8f87979d..3aa7d736 100644 --- a/lib/csapi/room_state.cpp +++ b/lib/csapi/room_state.cpp @@ -38,7 +38,7 @@ const QString& SetRoomStateWithKeyJob::eventId() const BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->eventId = fromJson<QString>(json.value("event_id"_ls)); + fromJson(json.value("event_id"_ls), d->eventId); return Success; } @@ -68,7 +68,7 @@ const QString& SetRoomStateJob::eventId() const BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->eventId = fromJson<QString>(json.value("event_id"_ls)); + fromJson(json.value("event_id"_ls), d->eventId); return Success; } |