csapi/*/**: clang-format contents of csapi subdirs as well

6 files changed, 37 insertions, 62 deletions

diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index a2d71db0..34d3bfbe 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -4,25 +4,21 @@
 
 #include "full.h"
 
-
 using namespace QMatrixClient;
 
-    
-void JsonObjectConverter<DiscoveryInformation>::dumpTo(QJsonObject& jo, const DiscoveryInformation& pod)
+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);
-
+    addParam<IfNotEmpty>(jo, QStringLiteral("m.identity_server"),
+                         pod.identityServer);
 }
-    
-void JsonObjectConverter<DiscoveryInformation>::fillFrom(QJsonObject jo, DiscoveryInformation& result)
+
+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 ef975969..ddc06653 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -4,40 +4,39 @@
 
 #pragma once
 
-
-
 #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>
+#include <QtCore/QJsonObject>
 
 namespace QMatrixClient
 {
 
 // Data structures
 
-/// Used by clients to determine the homeserver, identity server, and other/// optional components they should be interacting with.
+/// 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 otheroptional components they should be interacting with.
+    /// Used by clients to determine the homeserver, identity server, and
+    /// otheroptional components they should be interacting with.
     HomeserverInformation homeserver;
-    /// Used by clients to determine the homeserver, identity server, and otheroptional components they should be interacting with.
+    /// Used by clients to determine the homeserver, identity server, and
+    /// otheroptional 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>
+template <>
+struct JsonObjectConverter<DiscoveryInformation>
 {
     static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
-    static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);};
-
-
+    static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
+};
 
 } // namespace QMatrixClient
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index a8a5077b..f5746ede 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -4,21 +4,16 @@
 
 #include "homeserver.h"
 
-
 using namespace QMatrixClient;
 
-    
-void JsonObjectConverter<HomeserverInformation>::dumpTo(QJsonObject& jo, const HomeserverInformation& pod)
+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)
+
+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 fe6af172..b73cee17 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -4,11 +4,8 @@
 
 #pragma once
 
-
-
 #include "converters.h"
 
-
 namespace QMatrixClient
 {
 
@@ -19,15 +16,13 @@ struct HomeserverInformation
 {
     /// The base URL for the homeserver for client-server connections.
     QString baseUrl;
-
-
 };
 
-template <> struct JsonObjectConverter<HomeserverInformation>
+template <>
+struct JsonObjectConverter<HomeserverInformation>
 {
     static void dumpTo(QJsonObject& jo, const HomeserverInformation& pod);
-    static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);};
-
-
+    static void fillFrom(const QJsonObject& jo, HomeserverInformation& pod);
+};
 
 } // namespace QMatrixClient
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index a9fae614..922d4665 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -4,21 +4,16 @@
 
 #include "identity_server.h"
 
-
 using namespace QMatrixClient;
 
-    
-void JsonObjectConverter<IdentityServerInformation>::dumpTo(QJsonObject& jo, const IdentityServerInformation& pod)
+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)
+
+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 4462f86e..a35644fc 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -4,11 +4,8 @@
 
 #pragma once
 
-
-
 #include "converters.h"
 
-
 namespace QMatrixClient
 {
 
@@ -19,15 +16,13 @@ struct IdentityServerInformation
 {
     /// The base URL for the identity server for client-server connections.
     QString baseUrl;
-
-
 };
 
-template <> struct JsonObjectConverter<IdentityServerInformation>
+template <>
+struct JsonObjectConverter<IdentityServerInformation>
 {
     static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
-    static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);};
-
-
+    static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
+};
 
 } // namespace QMatrixClient