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, 56 insertions, 50 deletions

diff --git a/lib/csapi/openid.h b/lib/csapi/openid.h
index 6e3c744d..40f1bc40 100644
--- a/lib/csapi/openid.h
+++ b/lib/csapi/openid.h
@@ -4,58 +4,64 @@
 
 #pragma once
 
+#include "converters.h"
+
 #include "jobs/basejob.h"
 
-#include "converters.h"
 #include <QtCore/QJsonObject>
 
-namespace QMatrixClient {
-    // Operations
-
-    /// Get an OpenID token object to verify the requester's identity.
-    ///
-    /// Gets an OpenID token object that the requester may supply to another
-    /// service to verify their identity in Matrix. The generated token is only
-    /// valid for exchanging for user information from the federation API for
-    /// OpenID.
-    ///
-    /// The access token generated is only valid for the OpenID API. It cannot
-    /// be used to request another OpenID access token or call ``/sync``, for
-    /// example.
-    class RequestOpenIdTokenJob : public BaseJob
-    {
-        public:
-        /*! Get an OpenID token object to verify the requester's identity.
-         * \param userId
-         *   The user to request and OpenID token for. Should be the user who
-         *   is authenticated for the request.
-         * \param body
-         *   An empty object. Reserved for future expansion.
-         */
-        explicit RequestOpenIdTokenJob(const QString& userId,
-                                       const QJsonObject& body = {});
-        ~RequestOpenIdTokenJob() override;
-
-        // Result properties
-
-        /// An access token the consumer may use to verify the identity of
-        /// the person who generated the token. This is given to the federation
-        /// API ``GET /openid/userinfo``.
-        const QString& accessToken() const;
-        /// The string ``Bearer``.
-        const QString& tokenType() const;
-        /// The homeserver domain the consumer should use when attempting to
-        /// verify the user's identity.
-        const QString& matrixServerName() const;
-        /// The number of seconds before this token expires and a new one must
-        /// be generated.
-        int expiresIn() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Get an OpenID token object to verify the requester's identity.
+/*!
+ * Gets an OpenID token object that the requester may supply to another
+ * service to verify their identity in Matrix. The generated token is only
+ * valid for exchanging for user information from the federation API for
+ * OpenID.
+ *
+ * The access token generated is only valid for the OpenID API. It cannot
+ * be used to request another OpenID access token or call ``/sync``, for
+ * example.
+ */
+class RequestOpenIdTokenJob : public BaseJob
+{
+public:
+    /*! Get an OpenID token object to verify the requester's identity.
+     * \param userId
+     *   The user to request and OpenID token for. Should be the user who
+     *   is authenticated for the request.
+     * \param body
+     *   An empty object. Reserved for future expansion.
+     */
+    explicit RequestOpenIdTokenJob(const QString& userId,
+                                   const QJsonObject& body = {});
+
+    ~RequestOpenIdTokenJob() override;
+
+    // Result properties
+
+    /// An access token the consumer may use to verify the identity of
+    /// the person who generated the token. This is given to the federation
+    /// API ``GET /openid/userinfo``.
+    const QString& accessToken() const;
+    /// The string ``Bearer``.
+    const QString& tokenType() const;
+    /// The homeserver domain the consumer should use when attempting to
+    /// verify the user's identity.
+    const QString& matrixServerName() const;
+    /// The number of seconds before this token expires and a new one must
+    /// be generated.
+    int expiresIn() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient