Merge branch 'upstream' (v0.5.2)

1 files changed, 8 insertions, 15 deletions

diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index 4a192f85..752b806a 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -6,28 +6,21 @@
 
 using namespace QMatrixClient;
 
-QJsonObject QMatrixClient::toJson(const Device& pod)
+void JsonObjectConverter<Device>::dumpTo(
+        QJsonObject& jo, const Device& pod)
 {
-    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 FromJsonObject<Device>::operator()(const QJsonObject& jo) const
+void JsonObjectConverter<Device>::fillFrom(
+    const QJsonObject& jo, Device& result)
 {
-    Device result;
-    result.deviceId =
-        fromJson<QString>(jo.value("device_id"_ls));
-    result.displayName =
-        fromJson<QString>(jo.value("display_name"_ls));
-    result.lastSeenIp =
-        fromJson<QString>(jo.value("last_seen_ip"_ls));
-    result.lastSeenTs =
-        fromJson<qint64>(jo.value("last_seen_ts"_ls));
-
-    return result;
+    fromJson(jo.value("device_id"_ls), result.deviceId);
+    fromJson(jo.value("display_name"_ls), result.displayName);
+    fromJson(jo.value("last_seen_ip"_ls), result.lastSeenIp);
+    fromJson(jo.value("last_seen_ts"_ls), result.lastSeenTs);
 }