diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-11-28 12:42:03 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-11-28 12:42:03 +0900 |
| commit | 357625eb55e2f4569bb487ffe14a9236188e25f3 (patch) | |
| tree | d39340ab74f25a23a5855f679973628f7457fd87 /jobs/syncjob.h | |
| parent | 94e6636d8225a0561ed7df3fa8081c5b0183610c (diff) | |
| parent | 8f762a2458db773f6db24b568b2e944427297c2b (diff) | |
| download | libquotient-357625eb55e2f4569bb487ffe14a9236188e25f3.tar.gz libquotient-357625eb55e2f4569bb487ffe14a9236188e25f3.zip | |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'jobs/syncjob.h')
| -rw-r--r-- | jobs/syncjob.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jobs/syncjob.h b/jobs/syncjob.h index b1db914d..08bd773e 100644 --- a/jobs/syncjob.h +++ b/jobs/syncjob.h @@ -36,11 +36,10 @@ namespace QMatrixClient explicit Batch(QString k) : jsonKey(std::move(k)) { } void fromJson(const QJsonObject& roomContents) { - this->assign(makeEvents<EventT>( - roomContents[jsonKey].toObject()["events"].toArray())); + EventsBatch<EventT>::fromJson( + roomContents[jsonKey].toObject(), "events"); } - private: QString jsonKey; }; |