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

diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index 00552af0..1fe63c4d 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -4,70 +4,74 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include "converters.h"
+
 #include "events/eventloader.h"
+#include "jobs/basejob.h"
 
-namespace QMatrixClient {
-    // Operations
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Listen on the event stream.
+/*!
+ * This will listen for new events related to a particular room and return
+ * them to the caller. This will block until an event is received, or until
+ * the ``timeout`` is reached.
+ *
+ * This API is the same as the normal ``/events`` endpoint, but can be
+ * called by users who have not joined the room.
+ *
+ * Note that the normal ``/events`` endpoint has been deprecated. This
+ * API will also be deprecated at some point, but its replacement is not
+ * yet known.
+ */
+class PeekEventsJob : public BaseJob
+{
+public:
+    /*! Listen on the event stream.
+     * \param from
+     *   The token to stream from. This token is either from a previous
+     *   request to this API or from the initial sync API.
+     * \param timeout
+     *   The maximum time in milliseconds to wait for an event.
+     * \param roomId
+     *   The room ID for which events should be returned.
+     */
+    explicit PeekEventsJob(const QString& from = {},
+                           Omittable<int> timeout = none,
+                           const QString& roomId = {});
 
-    /// Listen on the event stream.
-    ///
-    /// This will listen for new events related to a particular room and return
-    /// them to the caller. This will block until an event is received, or until
-    /// the ``timeout`` is reached.
-    ///
-    /// This API is the same as the normal ``/events`` endpoint, but can be
-    /// called by users who have not joined the room.
-    ///
-    /// Note that the normal ``/events`` endpoint has been deprecated. This
-    /// API will also be deprecated at some point, but its replacement is not
-    /// yet known.
-    class PeekEventsJob : public BaseJob
-    {
-        public:
-        /*! Listen on the event stream.
-         * \param from
-         *   The token to stream from. This token is either from a previous
-         *   request to this API or from the initial sync API.
-         * \param timeout
-         *   The maximum time in milliseconds to wait for an event.
-         * \param roomId
-         *   The room ID for which events should be returned.
-         */
-        explicit PeekEventsJob(const QString& from = {},
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * PeekEventsJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
                                Omittable<int> timeout = none,
                                const QString& roomId = {});
 
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * PeekEventsJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
-                                   Omittable<int> timeout = none,
-                                   const QString& roomId = {});
+    ~PeekEventsJob() override;
 
-        ~PeekEventsJob() override;
+    // Result properties
 
-        // Result properties
+    /// A token which correlates to the first value in ``chunk``. This
+    /// is usually the same token supplied to ``from=``.
+    const QString& begin() const;
+    /// A token which correlates to the last value in ``chunk``. This
+    /// token should be used in the next request to ``/events``.
+    const QString& end() const;
+    /// An array of events.
+    RoomEvents&& chunk();
 
-        /// A token which correlates to the first value in ``chunk``. This
-        /// is usually the same token supplied to ``from=``.
-        const QString& begin() const;
-        /// A token which correlates to the last value in ``chunk``. This
-        /// token should be used in the next request to ``/events``.
-        const QString& end() const;
-        /// An array of events.
-        RoomEvents&& chunk();
+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