From aacc4bcb4a487871daae6717f77605aaba444341 Mon Sep 17 00:00:00 2001
From: Marc Deop <marc@marcdeop.com>
Date: Sat, 2 Mar 2019 12:26:57 +0100
Subject: style: apply .clang-format to all .cpp and .h files

---
 lib/csapi/definitions/wellknown/full.cpp            |  6 +++---
 lib/csapi/definitions/wellknown/full.h              | 19 ++++++++-----------
 lib/csapi/definitions/wellknown/homeserver.cpp      |  3 +--
 lib/csapi/definitions/wellknown/homeserver.h        | 10 +++-------
 lib/csapi/definitions/wellknown/identity_server.cpp |  3 +--
 lib/csapi/definitions/wellknown/identity_server.h   | 16 +++++++---------
 6 files changed, 23 insertions(+), 34 deletions(-)

(limited to 'lib/csapi/definitions/wellknown')

diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index 5ecef34f..35c0df5b 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -11,15 +11,15 @@ void JsonObjectConverter<DiscoveryInformation>::dumpTo(
 {
     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)
+        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..9b920eda 100644
--- a/lib/csapi/definitions/wellknown/full.h
+++ b/lib/csapi/definitions/wellknown/full.h
@@ -6,31 +6,28 @@
 
 #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
-{
+namespace QMatrixClient {
     // Data structures
 
     /// 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.
+    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.
+        /// 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>
-    {
+    template <> struct JsonObjectConverter<DiscoveryInformation> {
         static void dumpTo(QJsonObject& jo, const DiscoveryInformation& pod);
         static void fillFrom(QJsonObject jo, DiscoveryInformation& pod);
     };
diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp
index 0783f11b..a7337520 100644
--- a/lib/csapi/definitions/wellknown/homeserver.cpp
+++ b/lib/csapi/definitions/wellknown/homeserver.cpp
@@ -13,8 +13,7 @@ void JsonObjectConverter<HomeserverInformation>::dumpTo(
 }
 
 void JsonObjectConverter<HomeserverInformation>::fillFrom(
-    const QJsonObject& jo, HomeserverInformation& result)
+        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..8bd3c150 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -6,19 +6,15 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Used by clients to discover homeserver information.
-    struct HomeserverInformation
-    {
+    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);
     };
diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp
index 99f36641..46a614d8 100644
--- a/lib/csapi/definitions/wellknown/identity_server.cpp
+++ b/lib/csapi/definitions/wellknown/identity_server.cpp
@@ -13,8 +13,7 @@ void JsonObjectConverter<IdentityServerInformation>::dumpTo(
 }
 
 void JsonObjectConverter<IdentityServerInformation>::fillFrom(
-    const QJsonObject& jo, IdentityServerInformation& result)
+        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..fd53dfc1 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -6,21 +6,19 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Data structures
 
     /// Used by clients to discover identity server information.
-    struct IdentityServerInformation
-    {
+    struct IdentityServerInformation {
         /// The base URL for the identity server for client-server connections.
         QString baseUrl;
     };
-    template <> struct JsonObjectConverter<IdentityServerInformation>
-    {
-        static void dumpTo(QJsonObject& jo, const IdentityServerInformation& pod);
-        static void fillFrom(const QJsonObject& jo, IdentityServerInformation& pod);
+    template <> struct JsonObjectConverter<IdentityServerInformation> {
+        static void dumpTo(QJsonObject& jo,
+                           const IdentityServerInformation& pod);
+        static void fillFrom(const QJsonObject& jo,
+                             IdentityServerInformation& pod);
     };
 
 } // namespace QMatrixClient
-- 
cgit v1.2.3