Merge branch 'kitsune-events-rewritten'

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/csapi/definitions/client_device.cpp b/lib/csapi/definitions/client_device.cpp
index 7c3d7ea6..bd7acd02 100644
--- a/lib/csapi/definitions/client_device.cpp
+++ b/lib/csapi/definitions/client_device.cpp
@@ -9,10 +9,10 @@ using namespace QMatrixClient;
 QJsonObject QMatrixClient::toJson(const Device& pod)
 {
     QJsonObject _json;
-    addParam<>(_json, "device_id", pod.deviceId);
-    addParam<IfNotEmpty>(_json, "display_name", pod.displayName);
-    addParam<IfNotEmpty>(_json, "last_seen_ip", pod.lastSeenIp);
-    addParam<IfNotEmpty>(_json, "last_seen_ts", pod.lastSeenTs);
+    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;
 }
 
@@ -21,13 +21,13 @@ Device FromJson<Device>::operator()(const QJsonValue& jv)
     const auto& _json = jv.toObject();
     Device result;
     result.deviceId =
-        fromJson<QString>(_json.value("device_id"));
+        fromJson<QString>(_json.value("device_id"_ls));
     result.displayName =
-        fromJson<QString>(_json.value("display_name"));
+        fromJson<QString>(_json.value("display_name"_ls));
     result.lastSeenIp =
-        fromJson<QString>(_json.value("last_seen_ip"));
+        fromJson<QString>(_json.value("last_seen_ip"_ls));
     result.lastSeenTs =
-        fromJson<qint64>(_json.value("last_seen_ts"));
+        fromJson<qint64>(_json.value("last_seen_ts"_ls));
     
     return result;
 }