9 files changed, 3 insertions, 159 deletions
diff --git a/lib/application-service/definitions/location.h b/lib/application-service/definitions/location.h
index 761ea1db..47d621e0 100644
--- a/lib/application-service/definitions/location.h
+++ b/lib/application-service/definitions/location.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QJsonObject>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/application-service/definitions/location_batch.cpp b/lib/application-service/definitions/location_batch.cpp
deleted file mode 100644
index c9b9e95b..00000000
--- a/lib/application-service/definitions/location_batch.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "location_batch.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const LocationBatch& pod)
-{
-    QJsonObject _json;
-    return _json;
-}
-
-LocationBatch FromJson<LocationBatch>::operator()(const QJsonValue& jv)
-{
-    const auto& _json = jv.toObject();
-    LocationBatch result;
-    
-    return result;
-}
-
diff --git a/lib/application-service/definitions/location_batch.h b/lib/application-service/definitions/location_batch.h
deleted file mode 100644
index cd8c0079..00000000
--- a/lib/application-service/definitions/location_batch.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#pragma once
-
-
-#include "csapi/../application-service/definitions/location.h"
-#include "converters.h"
-#include <QtCore/QVector>
-
-#include "converters.h"
-
-namespace QMatrixClient
-{
-    // Data structures
-
-    /// List of matched third party locations.
-    struct LocationBatch : QVector<ThirdPartyLocation>
-    {
-    };
-
-    QJsonObject toJson(const LocationBatch& pod);
-
-    template <> struct FromJson<LocationBatch>
-    {
-        LocationBatch operator()(const QJsonValue& jv);
-    };
-
-} // namespace QMatrixClient
diff --git a/lib/application-service/definitions/protocol.h b/lib/application-service/definitions/protocol.h
index eecf132a..a25688e7 100644
--- a/lib/application-service/definitions/protocol.h
+++ b/lib/application-service/definitions/protocol.h
@@ -4,13 +4,12 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QVector>
 #include "converters.h"
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/application-service/definitions/protocol_metadata.cpp b/lib/application-service/definitions/protocol_metadata.cpp
deleted file mode 100644
index eb740bb6..00000000
--- a/lib/application-service/definitions/protocol_metadata.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "protocol_metadata.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const ProtocolMetadata& pod)
-{
-    QJsonObject _json;
-    return _json;
-}
-
-ProtocolMetadata FromJson<ProtocolMetadata>::operator()(const QJsonValue& jv)
-{
-    const auto& _json = jv.toObject();
-    ProtocolMetadata result;
-    
-    return result;
-}
-
diff --git a/lib/application-service/definitions/protocol_metadata.h b/lib/application-service/definitions/protocol_metadata.h
deleted file mode 100644
index 3c4bcd99..00000000
--- a/lib/application-service/definitions/protocol_metadata.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#pragma once
-
-
-
-#include "converters.h"
-
-namespace QMatrixClient
-{
-    // Data structures
-
-    /// Dictionary of supported third party protocols.
-    struct ProtocolMetadata
-    {
-    };
-
-    QJsonObject toJson(const ProtocolMetadata& pod);
-
-    template <> struct FromJson<ProtocolMetadata>
-    {
-        ProtocolMetadata operator()(const QJsonValue& jv);
-    };
-
-} // namespace QMatrixClient
diff --git a/lib/application-service/definitions/user.h b/lib/application-service/definitions/user.h
index e24bd8d5..9c64a7ba 100644
--- a/lib/application-service/definitions/user.h
+++ b/lib/application-service/definitions/user.h
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "converters.h"
 
 #include <QtCore/QJsonObject>
 
-#include "converters.h"
-
 namespace QMatrixClient
 {
     // Data structures
diff --git a/lib/application-service/definitions/user_batch.cpp b/lib/application-service/definitions/user_batch.cpp
deleted file mode 100644
index bbdf6835..00000000
--- a/lib/application-service/definitions/user_batch.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "user_batch.h"
-
-using namespace QMatrixClient;
-
-QJsonObject QMatrixClient::toJson(const UserBatch& pod)
-{
-    QJsonObject _json;
-    return _json;
-}
-
-UserBatch FromJson<UserBatch>::operator()(const QJsonValue& jv)
-{
-    const auto& _json = jv.toObject();
-    UserBatch result;
-    
-    return result;
-}
-
diff --git a/lib/application-service/definitions/user_batch.h b/lib/application-service/definitions/user_batch.h
deleted file mode 100644
index 891d3544..00000000
--- a/lib/application-service/definitions/user_batch.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#pragma once
-
-
-#include "csapi/../application-service/definitions/user.h"
-#include "converters.h"
-#include <QtCore/QVector>
-
-#include "converters.h"
-
-namespace QMatrixClient
-{
-    // Data structures
-
-    /// List of matched third party users.
-    struct UserBatch : QVector<ThirdPartyUser>
-    {
-    };
-
-    QJsonObject toJson(const UserBatch& pod);
-
-    template <> struct FromJson<UserBatch>
-    {
-        UserBatch operator()(const QJsonValue& jv);
-    };
-
-} // namespace QMatrixClient