diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-24 19:20:10 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-09-29 21:59:39 +0900 |
| commit | 4244cee8d5e0f760cccd2b45ad587670573ef03c (patch) | |
| tree | 4806108543f1402247e6cce1dba987a98d6fe83b /lib/events | |
| parent | f5c2e47fa1ab84fdaffe03c30ba973d7dea5ac05 (diff) | |
| download | libquotient-4244cee8d5e0f760cccd2b45ad587670573ef03c.tar.gz libquotient-4244cee8d5e0f760cccd2b45ad587670573ef03c.zip | |
Prepare for CS API 0.4.0
This commit consists of two parts: upgrading the API infrastructure and trivial but sweeping update to the generated files.
1. The API infrastructure (converters.h, *.mustache and some other non-generated files) now can deal with top-level JSON arrays and response inlining; better supports property maps; and gets some formatting fixes in generated code.
2. Generated files now use QJsonValue instead of QJsonObject as a default type
to (un)marshall Matrix API data structures, to match the change in the infrastructure above
This commit is still using the old Matrix API definitions, before CS API 0.4.0. Getting to CS API 0.4.0 will come next.
Diffstat (limited to 'lib/events')
| -rw-r--r-- | lib/events/accountdataevents.h | 4 | ||||
| -rw-r--r-- | lib/events/eventloader.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h index 27f6c77c..792ea7f7 100644 --- a/lib/events/accountdataevents.h +++ b/lib/events/accountdataevents.h @@ -36,11 +36,11 @@ namespace QMatrixClient order_type order; TagRecord (order_type order = none) : order(order) { } - explicit TagRecord(const QJsonValue& jv) + explicit TagRecord(const QJsonObject& jo) { // Parse a float both from JSON double and JSON string because // libqmatrixclient previously used to use strings to store order. - const auto orderJv = jv.toObject().value("order"_ls); + const auto orderJv = jo.value("order"_ls); if (orderJv.isDouble()) order = fromJson<float>(orderJv); else if (orderJv.isString()) 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 |