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, 81 insertions, 75 deletions

diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index 49bc33e9..4170d539 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -4,88 +4,94 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include "converters.h"
+
 #include "events/eventloader.h"
+#include "jobs/basejob.h"
+
 #include <QtCore/QJsonObject>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 
-namespace QMatrixClient {
-    // Operations
+namespace QMatrixClient
+{
 
-    /// Gets a list of events that the user has been notified about
-    ///
-    /// This API is used to paginate through the list of events that the
-    /// user has been, or would have been notified about.
-    class GetNotificationsJob : public BaseJob
+// Operations
+
+/// Gets a list of events that the user has been notified about
+/*!
+ * This API is used to paginate through the list of events that the
+ * user has been, or would have been notified about.
+ */
+class GetNotificationsJob : public BaseJob
+{
+public:
+    // Inner data structures
+
+    /// This API is used to paginate through the list of events that theuser has
+    /// been, or would have been notified about.
+    struct Notification
     {
-        public:
-        // Inner data structures
-
-        /// This API is used to paginate through the list of events that the
-        /// user has been, or would have been notified about.
-        struct Notification {
-            /// The action(s) to perform when the conditions for this rule are
-            /// met. See `Push Rules: API`_.
-            QVector<QVariant> actions;
-            /// The Event object for the event that triggered the notification.
-            EventPtr event;
-            /// The profile tag of the rule that matched this event.
-            QString profileTag;
-            /// Indicates whether the user has sent a read receipt indicating
-            /// that they have read this message.
-            bool read;
-            /// The ID of the room in which the event was posted.
-            QString roomId;
-            /// The unix timestamp at which the event notification was sent,
-            /// in milliseconds.
-            int ts;
-        };
-
-        // Construction/destruction
-
-        /*! Gets a list of events that the user has been notified about
-         * \param from
-         *   Pagination token given to retrieve the next set of events.
-         * \param limit
-         *   Limit on the number of events to return in this request.
-         * \param only
-         *   Allows basic filtering of events returned. Supply ``highlight``
-         *   to return only events where the notification had the highlight
-         *   tweak set.
-         */
-        explicit GetNotificationsJob(const QString& from = {},
-                                     Omittable<int> limit = none,
-                                     const QString& only = {});
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetNotificationsJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
-                                   Omittable<int> limit = none,
-                                   const QString& only = {});
-
-        ~GetNotificationsJob() override;
-
-        // Result properties
-
-        /// The token to supply in the ``from`` param of the next
-        /// ``/notifications`` request in order to request more
-        /// events. If this is absent, there are no more results.
-        const QString& nextToken() const;
-        /// The list of events that triggered notifications.
-        std::vector<Notification>&& notifications();
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
+        /// The action(s) to perform when the conditions for this rule are
+        /// met.See `Push Rules: API`_.
+        QVector<QVariant> actions;
+        /// The Event object for the event that triggered the notification.
+        EventPtr event;
+        /// The profile tag of the rule that matched this event.
+        QString profileTag;
+        /// Indicates whether the user has sent a read receipt indicatingthat
+        /// they have read this message.
+        bool read;
+        /// The ID of the room in which the event was posted.
+        QString roomId;
+        /// The unix timestamp at which the event notification was sent,in
+        /// milliseconds.
+        int ts;
     };
+
+    // Construction/destruction
+
+    /*! Gets a list of events that the user has been notified about
+     * \param from
+     *   Pagination token given to retrieve the next set of events.
+     * \param limit
+     *   Limit on the number of events to return in this request.
+     * \param only
+     *   Allows basic filtering of events returned. Supply ``highlight``
+     *   to return only events where the notification had the highlight
+     *   tweak set.
+     */
+    explicit GetNotificationsJob(const QString& from = {},
+                                 Omittable<int> limit = none,
+                                 const QString& only = {});
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetNotificationsJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {},
+                               Omittable<int> limit = none,
+                               const QString& only = {});
+
+    ~GetNotificationsJob() override;
+
+    // Result properties
+
+    /// The token to supply in the ``from`` param of the next
+    /// ``/notifications`` request in order to request more
+    /// events. If this is absent, there are no more results.
+    const QString& nextToken() const;
+    /// The list of events that triggered notifications.
+    std::vector<Notification>&& notifications();
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient