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/events/callcandidatesevent.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'lib/events/callcandidatesevent.h')

diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 4618832c..e66e0c09 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -13,34 +13,35 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class CallCandidatesEvent: public CallEventBase
+namespace QMatrixClient {
+    class CallCandidatesEvent : public CallEventBase
     {
         public:
-            DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
+        DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
 
-            explicit CallCandidatesEvent(const QJsonObject& obj)
-                : CallEventBase(typeId(), obj)
-            { }
+        explicit CallCandidatesEvent(const QJsonObject& obj)
+            : CallEventBase(typeId(), obj)
+        {
+        }
 
-            explicit CallCandidatesEvent(const QString& callId,
-                                         const QJsonArray& candidates)
-                : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                                {{ QStringLiteral("candidates"), candidates }})
-            { }
+        explicit CallCandidatesEvent(const QString& callId,
+                                     const QJsonArray& candidates)
+            : CallEventBase(typeId(), matrixTypeId(), callId, 0,
+                            { { QStringLiteral("candidates"), candidates } })
+        {
+        }
 
-            QJsonArray candidates() const
-            {
-                return content<QJsonArray>("candidates"_ls);
-            }
+        QJsonArray candidates() const
+        {
+            return content<QJsonArray>("candidates"_ls);
+        }
     };
 
     REGISTER_EVENT_TYPE(CallCandidatesEvent)
-- 
cgit v1.2.3


From c05ade838f0fce81f2bbe80a3295618a8a26ff52 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 2 Aug 2019 19:59:40 +0900
Subject: Apply the new brace wrapping to source files

---
 lib/events/callcandidatesevent.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/events/callcandidatesevent.h')

diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 1c12b800..2a915a43 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -20,10 +20,8 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-class CallCandidatesEvent : public CallEventBase
-{
+namespace QMatrixClient {
+class CallCandidatesEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
 
-- 
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/events/callcandidatesevent.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/events/callcandidatesevent.h')

diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 2a915a43..3d13ba8a 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -20,7 +20,7 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class CallCandidatesEvent : public CallEventBase {
 public:
     DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
@@ -43,4 +43,4 @@ public:
 
 REGISTER_EVENT_TYPE(CallCandidatesEvent)
 DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
-} // namespace QMatrixClient
+} // namespace Quotient
-- 
cgit v1.2.3


From 9ce16ef3123d5e63b931cafefb7dba4e894fc82b Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 11 Aug 2019 13:18:40 +0900
Subject: Drop EventType namespace and DEFINE_EVENTTYPE_ALIAS macro

They've been deprecated for almost a year by now.
---
 lib/events/callcandidatesevent.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib/events/callcandidatesevent.h')

diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 3d13ba8a..e224f048 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -42,5 +42,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(CallCandidatesEvent)
-DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
 } // namespace Quotient
-- 
cgit v1.2.3