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.

1 files changed, 12 insertions, 13 deletions

diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index bd7acd02..4a192f85 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -8,27 +8,26 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const Device& pod)
 {
-    QJsonObject _json;
-    addParam<>(_json, QStringLiteral("device_id"), pod.deviceId);
-    addParam<IfNotEmpty>(_json, QStringLiteral("display_name"), pod.displayName);
-    addParam<IfNotEmpty>(_json, QStringLiteral("last_seen_ip"), pod.lastSeenIp);
-    addParam<IfNotEmpty>(_json, QStringLiteral("last_seen_ts"), pod.lastSeenTs);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("device_id"), pod.deviceId);
+    addParam<IfNotEmpty>(jo, QStringLiteral("display_name"), pod.displayName);
+    addParam<IfNotEmpty>(jo, QStringLiteral("last_seen_ip"), pod.lastSeenIp);
+    addParam<IfNotEmpty>(jo, QStringLiteral("last_seen_ts"), pod.lastSeenTs);
+    return jo;
 }
 
-Device FromJson<Device>::operator()(const QJsonValue& jv)
+Device FromJsonObject<Device>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     Device result;
     result.deviceId =
-        fromJson<QString>(_json.value("device_id"_ls));
+        fromJson<QString>(jo.value("device_id"_ls));
     result.displayName =
-        fromJson<QString>(_json.value("display_name"_ls));
+        fromJson<QString>(jo.value("display_name"_ls));
     result.lastSeenIp =
-        fromJson<QString>(_json.value("last_seen_ip"_ls));
+        fromJson<QString>(jo.value("last_seen_ip"_ls));
     result.lastSeenTs =
-        fromJson<qint64>(_json.value("last_seen_ts"_ls));
-    
+        fromJson<qint64>(jo.value("last_seen_ts"_ls));
+
     return result;
 }