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

bhat-libqtolm-update

1 files changed, 22 insertions, 19 deletions

diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index 062d2cac..34c6829c 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -8,23 +8,26 @@
 
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient
+namespace Quotient
 {
-    // Data structures
-
-    struct ThirdPartyUser
-    {
-        /// A Matrix User ID represting a third party user.
-        QString userid;
-        /// The protocol ID that the third party location is a part of.
-        QString protocol;
-        /// Information used to identify this third party location.
-        QJsonObject fields;
-    };
-    template <> struct JsonObjectConverter<ThirdPartyUser>
-    {
-        static void dumpTo(QJsonObject& jo, const ThirdPartyUser& pod);
-        static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod);
-    };
-
-} // namespace QMatrixClient
+
+// Data structures
+
+struct ThirdPartyUser
+{
+    /// A Matrix User ID represting a third party user.
+    QString userid;
+    /// The protocol ID that the third party location is a part of.
+    QString protocol;
+    /// Information used to identify this third party location.
+    QJsonObject fields;
+};
+
+template <>
+struct JsonObjectConverter<ThirdPartyUser>
+{
+    static void dumpTo(QJsonObject& jo, const ThirdPartyUser& pod);
+    static void fillFrom(const QJsonObject& jo, ThirdPartyUser& pod);
+};
+
+} // namespace Quotient