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 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/csapi/definitions/wellknown/full.cpp')

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);
 }
-
-- 
cgit v1.2.3


From 9e96bc9b8dec6613e3e2f2fd564e9f6bee9bbce4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 24 Jun 2019 07:38:50 +0900
Subject: csapi/*/**: clang-format contents of csapi subdirs as well

---
 lib/csapi/definitions/wellknown/full.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'lib/csapi/definitions/wellknown/full.cpp')

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);
-
 }
-    
-
-
-- 
cgit v1.2.3


From 27ca32a1e5a56e09b9cc1d94224d2831004dcf3d Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 7 Jul 2019 19:32:34 +0900
Subject: Namespace: QMatrixClient -> Quotient (with back comp alias)

---
 lib/csapi/definitions/wellknown/full.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/csapi/definitions/wellknown/full.cpp')

diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
index 34d3bfbe..595db0e5 100644
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ b/lib/csapi/definitions/wellknown/full.cpp
@@ -4,7 +4,7 @@
 
 #include "full.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<DiscoveryInformation>::dumpTo(
     QJsonObject& jo, const DiscoveryInformation& pod)
-- 
cgit v1.2.3


From 32729d9a7519cd2c4cddb0174b8329c6fd4a4a83 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 7 Jun 2020 19:46:40 +0200
Subject: Update generated files according to gtad/* changes

---
 lib/csapi/definitions/wellknown/full.cpp | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 lib/csapi/definitions/wellknown/full.cpp

(limited to 'lib/csapi/definitions/wellknown/full.cpp')

diff --git a/lib/csapi/definitions/wellknown/full.cpp b/lib/csapi/definitions/wellknown/full.cpp
deleted file mode 100644
index 595db0e5..00000000
--- a/lib/csapi/definitions/wellknown/full.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "full.h"
-
-using namespace Quotient;
-
-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);
-}
-- 
cgit v1.2.3