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, 136 insertions, 129 deletions

diff --git a/lib/csapi/device_management.h b/lib/csapi/device_management.h
index 628f26d2..01838c6f 100644
--- a/lib/csapi/device_management.h
+++ b/lib/csapi/device_management.h
@@ -4,138 +4,145 @@
 
 #pragma once
 
-#include "jobs/basejob.h"
-
 #include "converters.h"
+
 #include "csapi/definitions/auth_data.h"
 #include "csapi/definitions/client_device.h"
+
+#include "jobs/basejob.h"
+
 #include <QtCore/QVector>
 
-namespace QMatrixClient {
-    // Operations
-
-    /// List registered devices for the current user
-    ///
-    /// Gets information about all devices for the current user.
-    class GetDevicesJob : public BaseJob
-    {
-        public:
-        explicit GetDevicesJob();
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetDevicesJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl);
-
-        ~GetDevicesJob() override;
-
-        // Result properties
-
-        /// A list of all registered devices for this user.
-        const QVector<Device>& devices() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
-
-    /// Get a single device
-    ///
-    /// Gets information on a single device, by device id.
-    class GetDeviceJob : public BaseJob
-    {
-        public:
-        /*! Get a single device
-         * \param deviceId
-         *   The device to retrieve.
-         */
-        explicit GetDeviceJob(const QString& deviceId);
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetDeviceJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl, const QString& deviceId);
-
-        ~GetDeviceJob() override;
-
-        // Result properties
-
-        /// Device information
-        const Device& data() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
-
-    /// Update a device
-    ///
-    /// Updates the metadata on the given device.
-    class UpdateDeviceJob : public BaseJob
-    {
-        public:
-        /*! Update a device
-         * \param deviceId
-         *   The device to update.
-         * \param displayName
-         *   The new display name for this device. If not given, the
-         *   display name is unchanged.
-         */
-        explicit UpdateDeviceJob(const QString& deviceId,
-                                 const QString& displayName = {});
-    };
-
-    /// Delete a device
-    ///
-    /// This API endpoint uses the `User-Interactive Authentication API`_.
-    ///
-    /// Deletes the given device, and invalidates any access token associated
-    /// with it.
-    class DeleteDeviceJob : public BaseJob
-    {
-        public:
-        /*! Delete a device
-         * \param deviceId
-         *   The device to delete.
-         * \param auth
-         *   Additional authentication information for the
-         *   user-interactive authentication API.
-         */
-        explicit DeleteDeviceJob(
-                const QString& deviceId,
-                const Omittable<AuthenticationData>& auth = none);
-    };
-
-    /// Bulk deletion of devices
-    ///
-    /// This API endpoint uses the `User-Interactive Authentication API`_.
-    ///
-    /// Deletes the given devices, and invalidates any access token associated
-    /// with them.
-    class DeleteDevicesJob : public BaseJob
-    {
-        public:
-        /*! Bulk deletion of devices
-         * \param devices
-         *   The list of device IDs to delete.
-         * \param auth
-         *   Additional authentication information for the
-         *   user-interactive authentication API.
-         */
-        explicit DeleteDevicesJob(
-                const QStringList& devices,
-                const Omittable<AuthenticationData>& auth = none);
-    };
+namespace QMatrixClient
+{
+
+// Operations
+
+/// List registered devices for the current user
+/*!
+ * Gets information about all devices for the current user.
+ */
+class GetDevicesJob : public BaseJob
+{
+public:
+    explicit GetDevicesJob();
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetDevicesJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl);
+
+    ~GetDevicesJob() override;
+
+    // Result properties
+
+    /// A list of all registered devices for this user.
+    const QVector<Device>& devices() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+/// Get a single device
+/*!
+ * Gets information on a single device, by device id.
+ */
+class GetDeviceJob : public BaseJob
+{
+public:
+    /*! Get a single device
+     * \param deviceId
+     *   The device to retrieve.
+     */
+    explicit GetDeviceJob(const QString& deviceId);
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetDeviceJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& deviceId);
+
+    ~GetDeviceJob() override;
+
+    // Result properties
+
+    /// Device information
+    const Device& data() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
+/// Update a device
+/*!
+ * Updates the metadata on the given device.
+ */
+class UpdateDeviceJob : public BaseJob
+{
+public:
+    /*! Update a device
+     * \param deviceId
+     *   The device to update.
+     * \param displayName
+     *   The new display name for this device. If not given, the
+     *   display name is unchanged.
+     */
+    explicit UpdateDeviceJob(const QString& deviceId,
+                             const QString& displayName = {});
+};
+
+/// Delete a device
+/*!
+ * This API endpoint uses the `User-Interactive Authentication API`_.
+ *
+ * Deletes the given device, and invalidates any access token associated with it.
+ */
+class DeleteDeviceJob : public BaseJob
+{
+public:
+    /*! Delete a device
+     * \param deviceId
+     *   The device to delete.
+     * \param auth
+     *   Additional authentication information for the
+     *   user-interactive authentication API.
+     */
+    explicit DeleteDeviceJob(const QString& deviceId,
+                             const Omittable<AuthenticationData>& auth = none);
+};
+
+/// Bulk deletion of devices
+/*!
+ * This API endpoint uses the `User-Interactive Authentication API`_.
+ *
+ * Deletes the given devices, and invalidates any access token associated with
+ * them.
+ */
+class DeleteDevicesJob : public BaseJob
+{
+public:
+    /*! Bulk deletion of devices
+     * \param devices
+     *   The list of device IDs to delete.
+     * \param auth
+     *   Additional authentication information for the
+     *   user-interactive authentication API.
+     */
+    explicit DeleteDevicesJob(const QStringList& devices,
+                              const Omittable<AuthenticationData>& auth = none);
+};
+
 } // namespace QMatrixClient