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, 57 insertions, 54 deletions

diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index cfefc550..ca06f4b9 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -4,68 +4,71 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include "converters.h"
+
 #include "events/eventloader.h"
+#include "jobs/basejob.h"
 
-namespace QMatrixClient {
-    // Operations
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Get events and state around the specified event.
+/*!
+ * This API returns a number of events that happened just before and
+ * after the specified event. This allows clients to get the context
+ * surrounding an event.
+ */
+class GetEventContextJob : public BaseJob
+{
+public:
+    /*! Get events and state around the specified event.
+     * \param roomId
+     *   The room to get events from.
+     * \param eventId
+     *   The event to get context around.
+     * \param limit
+     *   The maximum number of events to return. Default: 10.
+     */
+    explicit GetEventContextJob(const QString& roomId, const QString& eventId,
+                                Omittable<int> limit = none);
 
-    /// Get events and state around the specified event.
-    ///
-    /// This API returns a number of events that happened just before and
-    /// after the specified event. This allows clients to get the context
-    /// surrounding an event.
-    class GetEventContextJob : public BaseJob
-    {
-        public:
-        /*! Get events and state around the specified event.
-         * \param roomId
-         *   The room to get events from.
-         * \param eventId
-         *   The event to get context around.
-         * \param limit
-         *   The maximum number of events to return. Default: 10.
-         */
-        explicit GetEventContextJob(const QString& roomId,
-                                    const QString& eventId,
-                                    Omittable<int> limit = none);
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetEventContextJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
+                               const QString& eventId,
+                               Omittable<int> limit = none);
 
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetEventContextJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId,
-                                   const QString& eventId,
-                                   Omittable<int> limit = none);
+    ~GetEventContextJob() override;
 
-        ~GetEventContextJob() override;
+    // Result properties
 
-        // Result properties
+    /// A token that can be used to paginate backwards with.
+    const QString& begin() const;
+    /// A token that can be used to paginate forwards with.
+    const QString& end() const;
+    /// A list of room events that happened just before the
+    /// requested event, in reverse-chronological order.
+    RoomEvents&& eventsBefore();
+    /// Details of the requested event.
+    RoomEventPtr&& event();
+    /// A list of room events that happened just after the
+    /// requested event, in chronological order.
+    RoomEvents&& eventsAfter();
+    /// The state of the room at the last event returned.
+    StateEvents&& state();
 
-        /// A token that can be used to paginate backwards with.
-        const QString& begin() const;
-        /// A token that can be used to paginate forwards with.
-        const QString& end() const;
-        /// A list of room events that happened just before the
-        /// requested event, in reverse-chronological order.
-        RoomEvents&& eventsBefore();
-        /// Details of the requested event.
-        RoomEventPtr&& event();
-        /// A list of room events that happened just after the
-        /// requested event, in chronological order.
-        RoomEvents&& eventsAfter();
-        /// The state of the room at the last event returned.
-        StateEvents&& state();
+protected:
+    Status parseJson(const QJsonDocument& data) override;
 
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
 
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
 } // namespace QMatrixClient