1 files changed, 12 insertions, 6 deletions
diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index 0d1984b6..3342ef80 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -6,12 +6,8 @@
 
 #include "converters.h"
 
-#include <QtCore/QJsonObject>
-
 namespace Quotient {
 
-// Data structures
-
 struct ThirdPartyUser {
     /// A Matrix User ID represting a third party user.
     QString userid;
@@ -25,8 +21,18 @@ struct ThirdPartyUser {
 
 template <>
 struct JsonObjectConverter<ThirdPartyUser> {
-    static void dumpTo(QJsonObject& jo, const ThirdPartyUser& pod);
-    static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod);
+    static void dumpTo(QJsonObject& jo, const ThirdPartyUser& pod)
+    {
+        addParam<>(jo, QStringLiteral("userid"), pod.userid);
+        addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
+        addParam<>(jo, QStringLiteral("fields"), pod.fields);
+    }
+    static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod)
+    {
+        fromJson(jo.value("userid"_ls), pod.userid);
+        fromJson(jo.value("protocol"_ls), pod.protocol);
+        fromJson(jo.value("fields"_ls), pod.fields);
+    }
 };
 
 } // namespace Quotient