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/push_condition.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib/csapi/definitions/push_condition.cpp')

diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index ace02755..5bcb845e 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -6,8 +6,8 @@
 
 using namespace QMatrixClient;
 
-void JsonObjectConverter<PushCondition>::dumpTo(
-        QJsonObject& jo, const PushCondition& pod)
+void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
+                                                const PushCondition& pod)
 {
     addParam<>(jo, QStringLiteral("kind"), pod.kind);
     addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
@@ -15,12 +15,11 @@ void JsonObjectConverter<PushCondition>::dumpTo(
     addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is);
 }
 
-void JsonObjectConverter<PushCondition>::fillFrom(
-    const QJsonObject& jo, PushCondition& result)
+void JsonObjectConverter<PushCondition>::fillFrom(const QJsonObject& jo,
+                                                  PushCondition& result)
 {
     fromJson(jo.value("kind"_ls), result.kind);
     fromJson(jo.value("key"_ls), result.key);
     fromJson(jo.value("pattern"_ls), result.pattern);
     fromJson(jo.value("is"_ls), result.is);
 }
-
-- 
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/push_condition.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'lib/csapi/definitions/push_condition.cpp')

diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index 86b3107e..5bcb845e 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -4,27 +4,22 @@
 
 #include "push_condition.h"
 
-
 using namespace QMatrixClient;
 
-    
-void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo, const PushCondition& pod)
+void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
+                                                const PushCondition& pod)
 {
     addParam<>(jo, QStringLiteral("kind"), pod.kind);
     addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
     addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
     addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is);
-
 }
-    
-void JsonObjectConverter<PushCondition>::fillFrom(const QJsonObject& jo, PushCondition& result)
+
+void JsonObjectConverter<PushCondition>::fillFrom(const QJsonObject& jo,
+                                                  PushCondition& result)
 {
     fromJson(jo.value("kind"_ls), result.kind);
     fromJson(jo.value("key"_ls), result.key);
     fromJson(jo.value("pattern"_ls), result.pattern);
     fromJson(jo.value("is"_ls), result.is);
-
 }
-    
-
-
-- 
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/push_condition.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/csapi/definitions/push_condition.cpp')

diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
index 5bcb845e..343b4f1a 100644
--- a/lib/csapi/definitions/push_condition.cpp
+++ b/lib/csapi/definitions/push_condition.cpp
@@ -4,7 +4,7 @@
 
 #include "push_condition.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
                                                 const PushCondition& 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/push_condition.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 lib/csapi/definitions/push_condition.cpp

(limited to 'lib/csapi/definitions/push_condition.cpp')

diff --git a/lib/csapi/definitions/push_condition.cpp b/lib/csapi/definitions/push_condition.cpp
deleted file mode 100644
index 343b4f1a..00000000
--- a/lib/csapi/definitions/push_condition.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "push_condition.h"
-
-using namespace Quotient;
-
-void JsonObjectConverter<PushCondition>::dumpTo(QJsonObject& jo,
-                                                const PushCondition& pod)
-{
-    addParam<>(jo, QStringLiteral("kind"), pod.kind);
-    addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
-    addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
-    addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is);
-}
-
-void JsonObjectConverter<PushCondition>::fillFrom(const QJsonObject& jo,
-                                                  PushCondition& result)
-{
-    fromJson(jo.value("kind"_ls), result.kind);
-    fromJson(jo.value("key"_ls), result.key);
-    fromJson(jo.value("pattern"_ls), result.pattern);
-    fromJson(jo.value("is"_ls), result.is);
-}
-- 
cgit v1.2.3