New upstream version 0.7.0

1 files changed, 17 insertions, 17 deletions

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