diff options
| author | KitsuneRal <Kitsune-Ral@users.sf.net> | 2016-09-07 08:34:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 08:34:03 +0900 |
| commit | 34e7ba238f46734893111110235e032d44fd3690 (patch) | |
| tree | 6fc1008c9d2dc50a7acd21c601ac06aff1365f2e /events/event.cpp | |
| parent | c02174bc8f09761c2e4ee3ca4a250ce49025343e (diff) | |
| parent | 573e0e478c4a904ba69e6b523dead41eb28121c1 (diff) | |
| download | libquotient-34e7ba238f46734893111110235e032d44fd3690.tar.gz libquotient-34e7ba238f46734893111110235e032d44fd3690.zip | |
Merge pull request #24 from Fxrh/kitsune-settings
Settings classes
Diffstat (limited to 'events/event.cpp')
| -rw-r--r-- | events/event.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/events/event.cpp b/events/event.cpp index d05d666f..0c7700ee 100644 --- a/events/event.cpp +++ b/events/event.cpp @@ -151,11 +151,11 @@ bool Event::parseJson(const QJsonObject& obj) return correct; } -QList<Event*> QMatrixClient::eventListFromJson(const QJsonArray& json) +Events QMatrixClient::eventsFromJson(const QJsonArray& json) { - QList<Event*> l; - l.reserve(json.size()); + Events evs; + evs.reserve(json.size()); for (auto event: json) - l.push_back(Event::fromJson(event.toObject())); - return l; + evs.push_back(Event::fromJson(event.toObject())); + return evs; } |