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/joining.cpp | 63 ++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 34 deletions(-)

(limited to 'lib/csapi/joining.cpp')

diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index 00d930fa..fe4c83e3 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -12,13 +12,12 @@ using namespace QMatrixClient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
-    {
-        static void dumpTo(QJsonObject& jo, const JoinRoomByIdJob::ThirdPartySigned& pod)
+    template <> struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned> {
+        static void dumpTo(QJsonObject& jo,
+                           const JoinRoomByIdJob::ThirdPartySigned& pod)
         {
             addParam<>(jo, QStringLiteral("sender"), pod.sender);
             addParam<>(jo, QStringLiteral("mxid"), pod.mxid);
@@ -31,44 +30,42 @@ namespace QMatrixClient
 class JoinRoomByIdJob::Private
 {
     public:
-        QString roomId;
+    QString roomId;
 };
 
 static const auto JoinRoomByIdJobName = QStringLiteral("JoinRoomByIdJob");
 
-JoinRoomByIdJob::JoinRoomByIdJob(const QString& roomId, const Omittable<ThirdPartySigned>& thirdPartySigned)
+JoinRoomByIdJob::JoinRoomByIdJob(
+        const QString& roomId,
+        const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, JoinRoomByIdJobName,
-        basePath % "/rooms/" % roomId % "/join")
-    , d(new Private)
+              basePath % "/rooms/" % roomId % "/join"),
+      d(new Private)
 {
     QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"), thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+                         thirdPartySigned);
     setRequestData(_data);
 }
 
 JoinRoomByIdJob::~JoinRoomByIdJob() = default;
 
-const QString& JoinRoomByIdJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& JoinRoomByIdJob::roomId() const { return d->roomId; }
 
 BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
     // Converters
 
-    template <> struct JsonObjectConverter<JoinRoomJob::Signed>
-    {
+    template <> struct JsonObjectConverter<JoinRoomJob::Signed> {
         static void dumpTo(QJsonObject& jo, const JoinRoomJob::Signed& pod)
         {
             addParam<>(jo, QStringLiteral("sender"), pod.sender);
@@ -78,9 +75,9 @@ namespace QMatrixClient
         }
     };
 
-    template <> struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
-    {
-        static void dumpTo(QJsonObject& jo, const JoinRoomJob::ThirdPartySigned& pod)
+    template <> struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned> {
+        static void dumpTo(QJsonObject& jo,
+                           const JoinRoomJob::ThirdPartySigned& pod)
         {
             addParam<>(jo, QStringLiteral("signed"), pod.signedData);
         }
@@ -90,7 +87,7 @@ namespace QMatrixClient
 class JoinRoomJob::Private
 {
     public:
-        QString roomId;
+    QString roomId;
 };
 
 BaseJob::Query queryToJoinRoom(const QStringList& serverName)
@@ -102,31 +99,29 @@ BaseJob::Query queryToJoinRoom(const QStringList& serverName)
 
 static const auto JoinRoomJobName = QStringLiteral("JoinRoomJob");
 
-JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias, const QStringList& serverName, const Omittable<ThirdPartySigned>& thirdPartySigned)
+JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias,
+                         const QStringList& serverName,
+                         const Omittable<ThirdPartySigned>& thirdPartySigned)
     : BaseJob(HttpVerb::Post, JoinRoomJobName,
-        basePath % "/join/" % roomIdOrAlias,
-        queryToJoinRoom(serverName))
-    , d(new Private)
+              basePath % "/join/" % roomIdOrAlias, queryToJoinRoom(serverName)),
+      d(new Private)
 {
     QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"), thirdPartySigned);
+    addParam<IfNotEmpty>(_data, QStringLiteral("third_party_signed"),
+                         thirdPartySigned);
     setRequestData(_data);
 }
 
 JoinRoomJob::~JoinRoomJob() = default;
 
-const QString& JoinRoomJob::roomId() const
-{
-    return d->roomId;
-}
+const QString& JoinRoomJob::roomId() const { return d->roomId; }
 
 BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data)
 {
     auto json = data.object();
     if (!json.contains("room_id"_ls))
         return { JsonParseError,
-            "The key 'room_id' not found in the response" };
+                 "The key 'room_id' not found in the response" };
     fromJson(json.value("room_id"_ls), d->roomId);
     return Success;
 }
-
-- 
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/joining.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/csapi/joining.cpp')

diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp
index cb40cb96..2dd617bb 100644
--- a/lib/csapi/joining.cpp
+++ b/lib/csapi/joining.cpp
@@ -8,12 +8,12 @@
 
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -29,7 +29,7 @@ struct JsonObjectConverter<JoinRoomByIdJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomByIdJob::Private
 {
@@ -67,7 +67,7 @@ BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data)
 }
 
 // Converters
-namespace QMatrixClient
+namespace Quotient
 {
 
 template <>
@@ -91,7 +91,7 @@ struct JsonObjectConverter<JoinRoomJob::ThirdPartySigned>
     }
 };
 
-} // namespace QMatrixClient
+} // namespace Quotient
 
 class JoinRoomJob::Private
 {
-- 
cgit v1.2.3