Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 16 insertions, 14 deletions

diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index 67d8b08d..3bd07bd1 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -6,21 +6,23 @@
 
 #include "converters.h"
 
+namespace Quotient {
+/// Used by clients to discover identity server information.
+struct IdentityServerInformation {
+    /// The base URL for the identity server for client-server connections.
+    QString baseUrl;
+};
 
-namespace QMatrixClient
-{
-    // Data structures
-
-    /// Used by clients to discover identity server information.
-    struct IdentityServerInformation
+template <>
+struct JsonObjectConverter<IdentityServerInformation> {
+    static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod)
     {
-        /// The base URL for the identity server for client-server connections.
-        QString baseUrl;
-    };
-    template <> struct JsonObjectConverter<IdentityServerInformation>
+        addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
+    }
+    static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod)
     {
-        static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
-        static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
-    };
+        fromJson(jo.value("base_url"_ls), pod.baseUrl);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient