Merge branch 'master' into clang-format

# Conflicts:
#	CMakeLists.txt
#	lib/avatar.cpp
#	lib/connection.cpp
#	lib/connection.h
#	lib/connectiondata.cpp
#	lib/csapi/account-data.cpp
#	lib/csapi/account-data.h
#	lib/csapi/capabilities.cpp
#	lib/csapi/capabilities.h
#	lib/csapi/content-repo.cpp
#	lib/csapi/create_room.cpp
#	lib/csapi/filter.cpp
#	lib/csapi/joining.cpp
#	lib/csapi/keys.cpp
#	lib/csapi/list_joined_rooms.cpp
#	lib/csapi/notifications.cpp
#	lib/csapi/openid.cpp
#	lib/csapi/presence.cpp
#	lib/csapi/pushrules.cpp
#	lib/csapi/registration.cpp
#	lib/csapi/room_upgrades.cpp
#	lib/csapi/room_upgrades.h
#	lib/csapi/search.cpp
#	lib/csapi/users.cpp
#	lib/csapi/versions.cpp
#	lib/csapi/whoami.cpp
#	lib/csapi/{{base}}.cpp.mustache
#	lib/events/accountdataevents.h
#	lib/events/eventcontent.h
#	lib/events/roommemberevent.cpp
#	lib/events/stateevent.cpp
#	lib/jobs/basejob.cpp
#	lib/jobs/basejob.h
#	lib/networkaccessmanager.cpp
#	lib/networksettings.cpp
#	lib/room.cpp
#	lib/room.h
#	lib/settings.cpp
#	lib/settings.h
#	lib/syncdata.cpp
#	lib/user.cpp
#	lib/user.h
#	lib/util.cpp

1 files changed, 74 insertions, 74 deletions

diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index 55f419d8..a837b026 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -21,92 +21,92 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient {
-    class MemberEventContent : public EventContent::Base
+namespace QMatrixClient
+{
+class MemberEventContent : public EventContent::Base
+{
+public:
+    enum MembershipType : size_t
     {
-        public:
-        enum MembershipType : size_t {
-            Invite = 0,
-            Join,
-            Knock,
-            Leave,
-            Ban,
-            Undefined
-        };
+        Invite = 0,
+        Join,
+        Knock,
+        Leave,
+        Ban,
+        Undefined
+    };
 
-        explicit MemberEventContent(MembershipType mt = Join) : membership(mt)
-        {
-        }
-        explicit MemberEventContent(const QJsonObject& json);
+    explicit MemberEventContent(MembershipType mt = Join)
+        : membership(mt)
+    {}
+    explicit MemberEventContent(const QJsonObject& json);
 
-        MembershipType membership;
-        bool isDirect = false;
-        QString displayName;
-        QUrl avatarUrl;
+    MembershipType membership;
+    bool isDirect = false;
+    QString displayName;
+    QUrl avatarUrl;
 
-        protected:
-        void fillJson(QJsonObject* o) const override;
-    };
+protected:
+    void fillJson(QJsonObject* o) const override;
+};
 
-    using MembershipType = MemberEventContent::MembershipType;
+using MembershipType = MemberEventContent::MembershipType;
 
-    class RoomMemberEvent : public StateEvent<MemberEventContent>
-    {
-        Q_GADGET
-        public:
-        DEFINE_EVENT_TYPEID("m.room.member", RoomMemberEvent)
+class RoomMemberEvent : public StateEvent<MemberEventContent>
+{
+    Q_GADGET
+public:
+    DEFINE_EVENT_TYPEID("m.room.member", RoomMemberEvent)
 
-        using MembershipType = MemberEventContent::MembershipType;
+    using MembershipType = MemberEventContent::MembershipType;
 
-        explicit RoomMemberEvent(const QJsonObject& obj)
-            : StateEvent(typeId(), obj)
-        {
-        }
-        RoomMemberEvent(MemberEventContent&& c)
-            : StateEvent(typeId(), matrixTypeId(), c)
-        {
-        }
+    explicit RoomMemberEvent(const QJsonObject& obj)
+        : StateEvent(typeId(), obj)
+    {}
+    RoomMemberEvent(MemberEventContent&& c)
+        : StateEvent(typeId(), matrixTypeId(), c)
+    {}
 
-        /// A special constructor to create unknown RoomMemberEvents
-        /**
-         * This is needed in order to use RoomMemberEvent as a "base event
-         * class" in cases like GetMembersByRoomJob when RoomMemberEvents
-         * (rather than RoomEvents or StateEvents) are resolved from JSON.
-         * For such cases loadEvent<> requires an underlying class to be
-         * constructible with unknownTypeId() instead of its genuine id.
-         * Don't use it directly.
-         * \sa GetMembersByRoomJob, loadEvent, unknownTypeId
-         */
-        RoomMemberEvent(Type type, const QJsonObject& fullJson)
-            : StateEvent(type, fullJson)
-        {
-        }
+    /// A special constructor to create unknown RoomMemberEvents
+    /**
+     * This is needed in order to use RoomMemberEvent as a "base event
+     * class" in cases like GetMembersByRoomJob when RoomMemberEvents
+     * (rather than RoomEvents or StateEvents) are resolved from JSON.
+     * For such cases loadEvent<> requires an underlying class to be
+     * constructible with unknownTypeId() instead of its genuine id.
+     * Don't use it directly.
+     * \sa GetMembersByRoomJob, loadEvent, unknownTypeId
+     */
+    RoomMemberEvent(Type type, const QJsonObject& fullJson)
+        : StateEvent(type, fullJson)
+    {}
 
-        MembershipType membership() const { return content().membership; }
-        QString userId() const { return fullJson()["state_key"_ls].toString(); }
-        bool isDirect() const { return content().isDirect; }
-        QString displayName() const { return content().displayName; }
-        QUrl avatarUrl() const { return content().avatarUrl; }
-        bool isInvite() const;
-        bool isJoin() const;
-        bool isLeave() const;
-        bool isRename() const;
-        bool isAvatarUpdate() const;
+    MembershipType membership() const { return content().membership; }
+    QString userId() const { return fullJson()["state_key"_ls].toString(); }
+    bool isDirect() const { return content().isDirect; }
+    QString displayName() const { return content().displayName; }
+    QUrl avatarUrl() const { return content().avatarUrl; }
+    bool isInvite() const;
+    bool isJoin() const;
+    bool isLeave() const;
+    bool isRename() const;
+    bool isAvatarUpdate() const;
 
-        private:
-        REGISTER_ENUM(MembershipType)
-    };
+private:
+    REGISTER_ENUM(MembershipType)
+};
 
-    template <> class EventFactory<RoomMemberEvent>
+template <>
+class EventFactory<RoomMemberEvent>
+{
+public:
+    static event_ptr_tt<RoomMemberEvent> make(const QJsonObject& json,
+                                              const QString&)
     {
-        public:
-        static event_ptr_tt<RoomMemberEvent> make(const QJsonObject& json,
-                                                  const QString&)
-        {
-            return makeEvent<RoomMemberEvent>(json);
-        }
-    };
+        return makeEvent<RoomMemberEvent>(json);
+    }
+};
 
-    REGISTER_EVENT_TYPE(RoomMemberEvent)
-    DEFINE_EVENTTYPE_ALIAS(RoomMember, RoomMemberEvent)
+REGISTER_EVENT_TYPE(RoomMemberEvent)
+DEFINE_EVENTTYPE_ALIAS(RoomMember, RoomMemberEvent)
 } // namespace QMatrixClient