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/csapi/login.cpp | |
| 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/csapi/login.cpp')
| -rw-r--r-- | lib/csapi/login.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp index 363b6037..4d15a30b 100644 --- a/lib/csapi/login.cpp +++ b/lib/csapi/login.cpp @@ -16,14 +16,13 @@ namespace QMatrixClient { // Converters - template <> struct FromJson<GetLoginFlowsJob::LoginFlow> + template <> struct FromJsonObject<GetLoginFlowsJob::LoginFlow> { - GetLoginFlowsJob::LoginFlow operator()(const QJsonValue& jv) + GetLoginFlowsJob::LoginFlow operator()(const QJsonObject& jo) const { - const auto& _json = jv.toObject(); GetLoginFlowsJob::LoginFlow result; result.type = - fromJson<QString>(_json.value("type"_ls)); + fromJson<QString>(jo.value("type"_ls)); return result; } |