6 files changed, 60 insertions, 114 deletions
diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
deleted file mode 100644
index 5ecef34f..00000000
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "full.h"
-
-using namespace QMatrixClient;
-
-void JsonObjectConverter<DiscoveryInformation>::dumpTo(
-        QJsonObject& jo, const DiscoveryInformation& pod)
-{
-    fillJson(jo, pod.additionalProperties);
-    addParam<>(jo, QStringLiteral("m.homeserver"), pod.homeserver);
-    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"), pod.identityServer);
-}
-
-void JsonObjectConverter<DiscoveryInformation>::fillFrom(
-    QJsonObject jo, DiscoveryInformation& result)
-{
-    fromJson(jo.take("m.homeserver"_ls), result.homeserver);
-    fromJson(jo.take("m.identity_server"_ls), result.identityServer);
-
-    fromJson(jo, result.additionalProperties);
-}
-
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
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
deleted file mode 100644
index 0783f11b..00000000
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "homeserver.h"
-
-using namespace QMatrixClient;
-
-void JsonObjectConverter<HomeserverInformation>::dumpTo(
-        QJsonObject& jo, const HomeserverInformation& pod)
-{
-    addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-}
-
-void JsonObjectConverter<HomeserverInformation>::fillFrom(
-    const QJsonObject& jo, HomeserverInformation& result)
-{
-    fromJson(jo.value("base_url"_ls), result.baseUrl);
-}
-
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index f6761c30..5cfaca24 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -6,21 +6,23 @@
 
 #include "converters.h"
 
+namespace Quotient {
+/// Used by clients to discover homeserver information.
+struct HomeserverInformation {
+    /// The base URL for the homeserver for client-server connections.
+    QString baseUrl;
+};
 
-namespace QMatrixClient
-{
-    // Data structures
-
-    /// Used by clients to discover homeserver information.
-    struct HomeserverInformation
+template <>
+struct JsonObjectConverter<HomeserverInformation> {
+    static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod)
     {
-        /// The base URL for the homeserver for client-server connections.
-        QString baseUrl;
-    };
-    template <> struct JsonObjectConverter<HomeserverInformation>
+        addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
+    }
+    static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod)
     {
-        static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod);
-        static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
-    };
+        fromJson(jo.value("base_url"_ls), pod.baseUrl);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
deleted file mode 100644
index 99f36641..00000000
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "identity_server.h"
-
-using namespace QMatrixClient;
-
-void JsonObjectConverter<IdentityServerInformation>::dumpTo(
-        QJsonObject& jo, const IdentityServerInformation& pod)
-{
-    addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl);
-}
-
-void JsonObjectConverter<IdentityServerInformation>::fillFrom(
-    const QJsonObject& jo, IdentityServerInformation& result)
-{
-    fromJson(jo.value("base_url"_ls), result.baseUrl);
-}
-
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