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

diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h
index 3c21e2cb..bc27c025 100644
--- a/lib/csapi/admin.h
+++ b/lib/csapi/admin.h
@@ -4,92 +4,94 @@
 
 #pragma once
 
+#include "converters.h"
+
 #include "jobs/basejob.h"
 
-#include "converters.h"
 #include <QtCore/QHash>
 #include <QtCore/QVector>
 
-namespace QMatrixClient {
-    // Operations
-
-    /// Gets information about a particular user.
-    ///
-    /// Gets information about a particular user.
-    ///
-    /// This API may be restricted to only be called by the user being looked
-    /// up, or by a server admin. Server-local administrator privileges are not
-    /// specified in this document.
-    class GetWhoIsJob : public BaseJob
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Gets information about a particular user.
+/*!
+ * Gets information about a particular user.
+ *
+ * This API may be restricted to only be called by the user being looked
+ * up, or by a server admin. Server-local administrator privileges are not
+ * specified in this document.
+ */
+class GetWhoIsJob : public BaseJob
+{
+public:
+    // Inner data structures
+
+    /// Gets information about a particular user.This API may be restricted to
+    /// only be called by the user being lookedup, or by a server admin.
+    /// Server-local administrator privileges are notspecified in this document.
+    struct ConnectionInfo
     {
-        public:
-        // Inner data structures
-
-        /// Gets information about a particular user.
-        ///
-        /// This API may be restricted to only be called by the user being
-        /// looked up, or by a server admin. Server-local administrator
-        /// privileges are not specified in this document.
-        struct ConnectionInfo {
-            /// Most recently seen IP address of the session.
-            QString ip;
-            /// Unix timestamp that the session was last active.
-            Omittable<qint64> lastSeen;
-            /// User agent string last seen in the session.
-            QString userAgent;
-        };
-
-        /// Gets information about a particular user.
-        ///
-        /// This API may be restricted to only be called by the user being
-        /// looked up, or by a server admin. Server-local administrator
-        /// privileges are not specified in this document.
-        struct SessionInfo {
-            /// Information particular connections in the session.
-            QVector<ConnectionInfo> connections;
-        };
-
-        /// Gets information about a particular user.
-        ///
-        /// This API may be restricted to only be called by the user being
-        /// looked up, or by a server admin. Server-local administrator
-        /// privileges are not specified in this document.
-        struct DeviceInfo {
-            /// A user's sessions (i.e. what they did with an access token from
-            /// one login).
-            QVector<SessionInfo> sessions;
-        };
-
-        // Construction/destruction
-
-        /*! Gets information about a particular user.
-         * \param userId
-         *   The user to look up.
-         */
-        explicit GetWhoIsJob(const QString& userId);
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * GetWhoIsJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
-
-        ~GetWhoIsJob() override;
-
-        // Result properties
-
-        /// The Matrix user ID of the user.
-        const QString& userId() const;
-        /// Each key is an identitfier for one of the user's devices.
-        const QHash<QString, DeviceInfo>& devices() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
+        /// Most recently seen IP address of the session.
+        QString ip;
+        /// Unix timestamp that the session was last active.
+        Omittable<qint64> lastSeen;
+        /// User agent string last seen in the session.
+        QString userAgent;
     };
+
+    /// Gets information about a particular user.This API may be restricted to
+    /// only be called by the user being lookedup, or by a server admin.
+    /// Server-local administrator privileges are notspecified in this document.
+    struct SessionInfo
+    {
+        /// Information particular connections in the session.
+        QVector<ConnectionInfo> connections;
+    };
+
+    /// Gets information about a particular user.This API may be restricted to
+    /// only be called by the user being lookedup, or by a server admin.
+    /// Server-local administrator privileges are notspecified in this document.
+    struct DeviceInfo
+    {
+        /// A user's sessions (i.e. what they did with an access token from one
+        /// login).
+        QVector<SessionInfo> sessions;
+    };
+
+    // Construction/destruction
+
+    /*! Gets information about a particular user.
+     * \param userId
+     *   The user to look up.
+     */
+    explicit GetWhoIsJob(const QString& userId);
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * GetWhoIsJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId);
+
+    ~GetWhoIsJob() override;
+
+    // Result properties
+
+    /// The Matrix user ID of the user.
+    const QString& userId() const;
+    /// Each key is an identitfier for one of the user's devices.
+    const QHash<QString, DeviceInfo>& devices() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient