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, 22 insertions, 23 deletions

diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index e66e0c09..1c12b800 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -20,30 +20,29 @@
 
 #include "roomevent.h"
 
-namespace QMatrixClient {
-    class CallCandidatesEvent : public CallEventBase
-    {
-        public:
-        DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
+namespace QMatrixClient
+{
+class CallCandidatesEvent : public CallEventBase
+{
+public:
+    DEFINE_EVENT_TYPEID("m.call.candidates", CallCandidatesEvent)
 
-        explicit CallCandidatesEvent(const QJsonObject& obj)
-            : CallEventBase(typeId(), obj)
-        {
-        }
+    explicit CallCandidatesEvent(const QJsonObject& obj)
+        : CallEventBase(typeId(), obj)
+    {}
 
-        explicit CallCandidatesEvent(const QString& callId,
-                                     const QJsonArray& candidates)
-            : CallEventBase(typeId(), matrixTypeId(), callId, 0,
-                            { { QStringLiteral("candidates"), candidates } })
-        {
-        }
+    explicit CallCandidatesEvent(const QString& callId,
+                                 const QJsonArray& candidates)
+        : CallEventBase(typeId(), matrixTypeId(), callId, 0,
+                        { { QStringLiteral("candidates"), candidates } })
+    {}
 
-        QJsonArray candidates() const
-        {
-            return content<QJsonArray>("candidates"_ls);
-        }
-    };
+    QJsonArray candidates() const
+    {
+        return content<QJsonArray>("candidates"_ls);
+    }
+};
 
-    REGISTER_EVENT_TYPE(CallCandidatesEvent)
-    DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
-}
+REGISTER_EVENT_TYPE(CallCandidatesEvent)
+DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
+} // namespace QMatrixClient