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, 14 insertions, 13 deletions

diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 0d8b8f74..6b4a08ee 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -20,18 +20,19 @@
 
 #include "event.h"
 
-namespace QMatrixClient {
-    class DirectChatEvent : public Event
-    {
-        public:
-        DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
+namespace QMatrixClient
+{
+class DirectChatEvent : public Event
+{
+public:
+    DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
 
-        explicit DirectChatEvent(const QJsonObject& obj) : Event(typeId(), obj)
-        {
-        }
+    explicit DirectChatEvent(const QJsonObject& obj)
+        : Event(typeId(), obj)
+    {}
 
-        QMultiHash<QString, QString> usersToDirectChats() const;
-    };
-    REGISTER_EVENT_TYPE(DirectChatEvent)
-    DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
-}
+    QMultiHash<QString, QString> usersToDirectChats() const;
+};
+REGISTER_EVENT_TYPE(DirectChatEvent)
+DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
+} // namespace QMatrixClient