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, 17 insertions, 17 deletions

diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index 69cd1f9d..ee460339 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -21,21 +21,21 @@
 #include "eventcontent.h"
 #include "stateevent.h"
 
-namespace QMatrixClient {
-    class RoomAvatarEvent : public StateEvent<EventContent::ImageContent>
-    {
-        // It's a bit of an overkill to use a full-fledged ImageContent
-        // because in reality m.room.avatar usually only has a single URL,
-        // without a thumbnail. But The Spec says there be thumbnails, and
-        // we follow The Spec.
-        public:
-        DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
-        explicit RoomAvatarEvent(const QJsonObject& obj)
-            : StateEvent(typeId(), obj)
-        {
-        }
-        QUrl url() const { return content().url; }
-    };
-    REGISTER_EVENT_TYPE(RoomAvatarEvent)
-    DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
+namespace QMatrixClient
+{
+class RoomAvatarEvent : public StateEvent<EventContent::ImageContent>
+{
+    // It's a bit of an overkill to use a full-fledged ImageContent
+    // because in reality m.room.avatar usually only has a single URL,
+    // without a thumbnail. But The Spec says there be thumbnails, and
+    // we follow The Spec.
+public:
+    DEFINE_EVENT_TYPEID("m.room.avatar", RoomAvatarEvent)
+    explicit RoomAvatarEvent(const QJsonObject& obj)
+        : StateEvent(typeId(), obj)
+    {}
+    QUrl url() const { return content().url; }
+};
+REGISTER_EVENT_TYPE(RoomAvatarEvent)
+DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
 } // namespace QMatrixClient