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, 24 insertions, 21 deletions

diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index fbfb33ca..17b86388 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -20,27 +20,30 @@
 
 #include "stateevent.h"
 
-namespace QMatrixClient {
-    class RoomCreateEvent : public StateEventBase
-    {
-        public:
-        DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
-
-        explicit RoomCreateEvent() : StateEventBase(typeId(), matrixTypeId()) {}
-        explicit RoomCreateEvent(const QJsonObject& obj)
-            : StateEventBase(typeId(), obj)
-        {
-        }
+namespace QMatrixClient
+{
+class RoomCreateEvent : public StateEventBase
+{
+public:
+    DEFINE_EVENT_TYPEID("m.room.create", RoomCreateEvent)
 
-        struct Predecessor {
-            QString roomId;
-            QString eventId;
-        };
+    explicit RoomCreateEvent()
+        : StateEventBase(typeId(), matrixTypeId())
+    {}
+    explicit RoomCreateEvent(const QJsonObject& obj)
+        : StateEventBase(typeId(), obj)
+    {}
 
-        bool isFederated() const;
-        QString version() const;
-        Predecessor predecessor() const;
-        bool isUpgrade() const;
+    struct Predecessor
+    {
+        QString roomId;
+        QString eventId;
     };
-    REGISTER_EVENT_TYPE(RoomCreateEvent)
-}
+
+    bool isFederated() const;
+    QString version() const;
+    Predecessor predecessor() const;
+    bool isUpgrade() const;
+};
+REGISTER_EVENT_TYPE(RoomCreateEvent)
+} // namespace QMatrixClient