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

diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp
index 9ead6ac6..936b2430 100644
--- a/lib/csapi/event_context.cpp
+++ b/lib/csapi/event_context.cpp
@@ -14,7 +14,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
 
 class GetEventContextJob::Private
 {
-    public:
+public:
     QString begin;
     QString end;
     RoomEvents eventsBefore;
@@ -36,7 +36,7 @@ QUrl GetEventContextJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
                                    basePath % "/rooms/" % roomId % "/context/"
-                                           % eventId,
+                                       % eventId,
                                    queryToGetEventContext(limit));
 }
 
@@ -47,10 +47,9 @@ GetEventContextJob::GetEventContextJob(const QString& roomId,
                                        Omittable<int> limit)
     : BaseJob(HttpVerb::Get, GetEventContextJobName,
               basePath % "/rooms/" % roomId % "/context/" % eventId,
-              queryToGetEventContext(limit)),
-      d(new Private)
-{
-}
+              queryToGetEventContext(limit))
+    , d(new Private)
+{}
 
 GetEventContextJob::~GetEventContextJob() = default;
 
@@ -81,5 +80,6 @@ BaseJob::Status GetEventContextJob::parseJson(const QJsonDocument& data)
     fromJson(json.value("event"_ls), d->event);
     fromJson(json.value("events_after"_ls), d->eventsAfter);
     fromJson(json.value("state"_ls), d->state);
+
     return Success;
 }