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, 49 insertions, 46 deletions

diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index 4bbb8526..c03af180 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -6,50 +6,53 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient {
-    // Operations
-
-    /// Invalidates a user access token
-    ///
-    /// Invalidates an existing access token, so that it can no longer be used
-    /// for authorization.
-    class LogoutJob : public BaseJob
-    {
-        public:
-        explicit LogoutJob();
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * LogoutJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl);
-    };
-
-    /// Invalidates all access tokens for a user
-    ///
-    /// Invalidates all access tokens for a user, so that they can no longer be
-    /// used for authorization. This includes the access token that made this
-    /// request.
-    ///
-    /// This endpoint does not require UI authorization because UI authorization
-    /// is designed to protect against attacks where the someone gets hold of a
-    /// single access token then takes over the account. This endpoint
-    /// invalidates all access tokens for the user, including the token used in
-    /// the request, and therefore the attacker is unable to take over the
-    /// account in this way.
-    class LogoutAllJob : public BaseJob
-    {
-        public:
-        explicit LogoutAllJob();
-
-        /*! Construct a URL without creating a full-fledged job object
-         *
-         * This function can be used when a URL for
-         * LogoutAllJob is necessary but the job
-         * itself isn't.
-         */
-        static QUrl makeRequestUrl(QUrl baseUrl);
-    };
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Invalidates a user access token
+/*!
+ * Invalidates an existing access token, so that it can no longer be used for
+ * authorization.
+ */
+class LogoutJob : public BaseJob
+{
+public:
+    explicit LogoutJob();
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * LogoutJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl);
+};
+
+/// Invalidates all access tokens for a user
+/*!
+ * Invalidates all access tokens for a user, so that they can no longer be used
+ * for authorization. This includes the access token that made this request.
+ *
+ * This endpoint does not require UI authorization because UI authorization is
+ * designed to protect against attacks where the someone gets hold of a single
+ * access token then takes over the account. This endpoint invalidates all
+ * access tokens for the user, including the token used in the request, and
+ * therefore the attacker is unable to take over the account in this way.
+ */
+class LogoutAllJob : public BaseJob
+{
+public:
+    explicit LogoutAllJob();
+
+    /*! Construct a URL without creating a full-fledged job object
+     *
+     * This function can be used when a URL for
+     * LogoutAllJob is necessary but the job
+     * itself isn't.
+     */
+    static QUrl makeRequestUrl(QUrl baseUrl);
+};
+
 } // namespace QMatrixClient