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/roommemberevent.cpp | 44 ++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'lib/events/roommemberevent.cpp')

diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index a5ac3c5f..53203873 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -13,7 +13,7 @@
  *
  * 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
  */
 
 #include "roommemberevent.h"
@@ -23,21 +23,18 @@
 
 #include <array>
 
-static const std::array<QString, 5> membershipStrings = { {
-    QStringLiteral("invite"), QStringLiteral("join"),
-    QStringLiteral("knock"), QStringLiteral("leave"),
-    QStringLiteral("ban")
-} };
+static const std::array<QString, 5> membershipStrings = {
+    { QStringLiteral("invite"), QStringLiteral("join"), QStringLiteral("knock"),
+      QStringLiteral("leave"), QStringLiteral("ban") }
+};
 
 namespace QMatrixClient {
-    template <>
-    struct JsonConverter<MembershipType>
-    {
+    template <> struct JsonConverter<MembershipType> {
         static MembershipType load(const QJsonValue& jv)
         {
             const auto& membershipString = jv.toString();
             for (auto it = membershipStrings.begin();
-                    it != membershipStrings.end(); ++it)
+                 it != membershipStrings.end(); ++it)
                 if (membershipString == *it)
                     return MembershipType(it - membershipStrings.begin());
 
@@ -50,17 +47,18 @@ namespace QMatrixClient {
 using namespace QMatrixClient;
 
 MemberEventContent::MemberEventContent(const QJsonObject& json)
-    : membership(fromJson<MembershipType>(json["membership"_ls]))
-    , isDirect(json["is_direct"_ls].toBool())
-    , displayName(json["displayname"_ls].toString())
-    , avatarUrl(json["avatar_url"_ls].toString())
-{ }
+    : membership(fromJson<MembershipType>(json["membership"_ls])),
+      isDirect(json["is_direct"_ls].toBool()),
+      displayName(json["displayname"_ls].toString()),
+      avatarUrl(json["avatar_url"_ls].toString())
+{
+}
 
 void MemberEventContent::fillJson(QJsonObject* o) const
 {
     Q_ASSERT(o);
     Q_ASSERT_X(membership != MembershipType::Undefined, __FUNCTION__,
-             "The key 'membership' must be explicit in MemberEventContent");
+               "The key 'membership' must be explicit in MemberEventContent");
     if (membership != MembershipType::Undefined)
         o->insert(QStringLiteral("membership"), membershipStrings[membership]);
     o->insert(QStringLiteral("displayname"), displayName);
@@ -70,21 +68,21 @@ void MemberEventContent::fillJson(QJsonObject* o) const
 
 bool RoomMemberEvent::isInvite() const
 {
-    return membership() == MembershipType::Invite &&
-            (!prevContent() || prevContent()->membership != membership());
+    return membership() == MembershipType::Invite
+            && (!prevContent() || prevContent()->membership != membership());
 }
 
 bool RoomMemberEvent::isJoin() const
 {
-    return membership() == MembershipType::Join &&
-            (!prevContent() || prevContent()->membership != membership());
+    return membership() == MembershipType::Join
+            && (!prevContent() || prevContent()->membership != membership());
 }
 
 bool RoomMemberEvent::isLeave() const
 {
-    return membership() == MembershipType::Leave &&
-            prevContent() && prevContent()->membership != membership() &&
-            prevContent()->membership != MembershipType::Ban;
+    return membership() == MembershipType::Leave && prevContent()
+            && prevContent()->membership != membership()
+            && prevContent()->membership != MembershipType::Ban;
 }
 
 bool RoomMemberEvent::isRename() const
-- 
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/roommemberevent.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/events/roommemberevent.cpp')

diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index e6292b73..3cbf6685 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -28,11 +28,9 @@ static const std::array<QString, 5> membershipStrings = {
       QStringLiteral("leave"), QStringLiteral("ban") }
 };
 
-namespace QMatrixClient
-{
+namespace QMatrixClient {
 template <>
-struct JsonConverter<MembershipType>
-{
+struct JsonConverter<MembershipType> {
     static MembershipType load(const QJsonValue& jv)
     {
         const auto& membershipString = jv.toString();
-- 
cgit v1.2.3