Merge branch 'cs-api-0.4.0'

1 files changed, 14 insertions, 15 deletions

diff --git a/lib/csapi/definitions/device_keys.cpp b/lib/csapi/definitions/device_keys.cpp
index d17f4c12..a0e0ca42 100644
--- a/lib/csapi/definitions/device_keys.cpp
+++ b/lib/csapi/definitions/device_keys.cpp
@@ -8,30 +8,29 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const DeviceKeys& pod)
 {
-    QJsonObject _json;
-    addParam<>(_json, QStringLiteral("user_id"), pod.userId);
-    addParam<>(_json, QStringLiteral("device_id"), pod.deviceId);
-    addParam<>(_json, QStringLiteral("algorithms"), pod.algorithms);
-    addParam<>(_json, QStringLiteral("keys"), pod.keys);
-    addParam<>(_json, QStringLiteral("signatures"), pod.signatures);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("user_id"), pod.userId);
+    addParam<>(jo, QStringLiteral("device_id"), pod.deviceId);
+    addParam<>(jo, QStringLiteral("algorithms"), pod.algorithms);
+    addParam<>(jo, QStringLiteral("keys"), pod.keys);
+    addParam<>(jo, QStringLiteral("signatures"), pod.signatures);
+    return jo;
 }
 
-DeviceKeys FromJson<DeviceKeys>::operator()(const QJsonValue& jv)
+DeviceKeys FromJsonObject<DeviceKeys>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     DeviceKeys result;
     result.userId =
-        fromJson<QString>(_json.value("user_id"_ls));
+        fromJson<QString>(jo.value("user_id"_ls));
     result.deviceId =
-        fromJson<QString>(_json.value("device_id"_ls));
+        fromJson<QString>(jo.value("device_id"_ls));
     result.algorithms =
-        fromJson<QStringList>(_json.value("algorithms"_ls));
+        fromJson<QStringList>(jo.value("algorithms"_ls));
     result.keys =
-        fromJson<QHash<QString, QString>>(_json.value("keys"_ls));
+        fromJson<QHash<QString, QString>>(jo.value("keys"_ls));
     result.signatures =
-        fromJson<QHash<QString, QHash<QString, QString>>>(_json.value("signatures"_ls));
-    
+        fromJson<QHash<QString, QHash<QString, QString>>>(jo.value("signatures"_ls));
+
     return result;
 }