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

bhat-libqtolm-update

1 files changed, 21 insertions, 16 deletions

diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index cbb1550f..74e6ce2b 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -8,22 +8,27 @@
 
 #include <QtCore/QVariant>
 
-namespace QMatrixClient
+namespace Quotient
 {
-    // Data structures
+
+// Data structures
+
+/// Identification information for a user
+struct UserIdentifier
+{
+    /// The type of identification.  See `Identifier types`_ for supported
+    /// values and additional property descriptions.
+    QString type;
 
     /// Identification information for a user
-    struct UserIdentifier
-    {
-        /// The type of identification.  See `Identifier types`_ for supported values and additional property descriptions.
-        QString type;
-        /// Identification information for a user
-        QVariantHash additionalProperties;
-    };
-    template <> struct JsonObjectConverter<UserIdentifier>
-    {
-        static void dumpTo(QJsonObject& jo, const UserIdentifier& pod);
-        static void fillFrom(QJsonObject jo, UserIdentifier& pod);
-    };
-
-} // namespace QMatrixClient
+    QVariantHash additionalProperties;
+};
+
+template <>
+struct JsonObjectConverter<UserIdentifier>
+{
+    static void dumpTo(QJsonObject& jo, const UserIdentifier& pod);
+    static void fillFrom(QJsonObject jo, UserIdentifier& pod);
+};
+
+} // namespace Quotient