Merge branch 'cs-api-0.4.0'

1 files changed, 10 insertions, 11 deletions

diff --git a/lib/application-service/definitions/user.cpp b/lib/application-service/definitions/user.cpp
index 17687cfd..ca334236 100644
--- a/lib/application-service/definitions/user.cpp
+++ b/lib/application-service/definitions/user.cpp
@@ -8,24 +8,23 @@ using namespace QMatrixClient;
 
 QJsonObject QMatrixClient::toJson(const ThirdPartyUser& pod)
 {
-    QJsonObject _json;
-    addParam<IfNotEmpty>(_json, QStringLiteral("userid"), pod.userid);
-    addParam<IfNotEmpty>(_json, QStringLiteral("protocol"), pod.protocol);
-    addParam<IfNotEmpty>(_json, QStringLiteral("fields"), pod.fields);
-    return _json;
+    QJsonObject jo;
+    addParam<>(jo, QStringLiteral("userid"), pod.userid);
+    addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
+    addParam<>(jo, QStringLiteral("fields"), pod.fields);
+    return jo;
 }
 
-ThirdPartyUser FromJson<ThirdPartyUser>::operator()(const QJsonValue& jv)
+ThirdPartyUser FromJsonObject<ThirdPartyUser>::operator()(const QJsonObject& jo) const
 {
-    const auto& _json = jv.toObject();
     ThirdPartyUser result;
     result.userid =
-        fromJson<QString>(_json.value("userid"_ls));
+        fromJson<QString>(jo.value("userid"_ls));
     result.protocol =
-        fromJson<QString>(_json.value("protocol"_ls));
+        fromJson<QString>(jo.value("protocol"_ls));
     result.fields =
-        fromJson<QJsonObject>(_json.value("fields"_ls));
-    
+        fromJson<QJsonObject>(jo.value("fields"_ls));
+
     return result;
 }