1 files changed, 28 insertions, 21 deletions
diff --git a/lib/csapi/definitions/wellknown/full.h b/lib/csapi/definitions/wellknown/full.h
index d9346acb..a0ef2076 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -6,33 +6,40 @@
 
 #include "converters.h"
 
-#include <QtCore/QJsonObject>
-#include "converters.h"
 #include "csapi/definitions/wellknown/homeserver.h"
 #include "csapi/definitions/wellknown/identity_server.h"
-#include <QtCore/QHash>
 
-namespace QMatrixClient
-{
-    // Data structures
+namespace Quotient {
+/// Used by clients to determine the homeserver, identity server, and other
+/// optional components they should be interacting with.
+struct DiscoveryInformation {
+    /// Used by clients to determine the homeserver, identity server, and other
+    /// optional components they should be interacting with.
+    HomeserverInformation homeserver;
 
     /// Used by clients to determine the homeserver, identity server, and other
     /// optional components they should be interacting with.
-    struct DiscoveryInformation
+    Omittable<IdentityServerInformation> identityServer;
+
+    /// Application-dependent keys using Java package naming convention.
+    QHash<QString, QJsonObject> additionalProperties;
+};
+
+template <>
+struct JsonObjectConverter<DiscoveryInformation> {
+    static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod)
     {
-        /// Used by clients to determine the homeserver, identity server, and other
-        /// optional components they should be interacting with.
-        HomeserverInformation homeserver;
-        /// Used by clients to determine the homeserver, identity server, and other
-        /// optional components they should be interacting with.
-        Omittable<IdentityServerInformation> identityServer;
-        /// Application-dependent keys using Java package naming convention.
-        QHash<QString, QJsonObject> additionalProperties;
-    };
-    template <> struct JsonObjectConverter<DiscoveryInformation>
+        fillJson(jo, pod.additionalProperties);
+        addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
+        addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"),
+                             pod.identityServer);
+    }
+    static void fillFrom(QJsonObject jo, DiscoveryInformation& pod)
     {
-        static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
-        static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
-    };
+        fromJson(jo.take("m.homeserver"_ls), pod.homeserver);
+        fromJson(jo.take("m.identity_server"_ls), pod.identityServer);
+        fromJson(jo, pod.additionalProperties);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient