Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/application-service/definitions/user.cpp b/lib/application-service/definitions/user.cpp
index 8ba92321..17d15a20 100644
--- a/lib/application-service/definitions/user.cpp
+++ b/lib/application-service/definitions/user.cpp
@@ -4,21 +4,20 @@
 
 #include "user.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
-void JsonObjectConverter<ThirdPartyUser>::dumpTo(
-        QJsonObject& jo, const ThirdPartyUser& pod)
+void JsonObjectConverter<ThirdPartyUser>::dumpTo(QJsonObject& jo,
+                                                 const ThirdPartyUser& pod)
 {
     addParam<>(jo, QStringLiteral("userid"), pod.userid);
     addParam<>(jo, QStringLiteral("protocol"), pod.protocol);
     addParam<>(jo, QStringLiteral("fields"), pod.fields);
 }
 
-void JsonObjectConverter<ThirdPartyUser>::fillFrom(
-    const QJsonObject& jo, ThirdPartyUser& result)
+void JsonObjectConverter<ThirdPartyUser>::fillFrom(const QJsonObject& jo,
+                                                   ThirdPartyUser& result)
 {
     fromJson(jo.value("userid"_ls), result.userid);
     fromJson(jo.value("protocol"_ls), result.protocol);
     fromJson(jo.value("fields"_ls), result.fields);
 }
-