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, 32 insertions, 27 deletions

diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h
index d75b8df3..9566a9a4 100644
--- a/lib/csapi/kicking.h
+++ b/lib/csapi/kicking.h
@@ -6,32 +6,37 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient {
-    // Operations
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Kick a user from the room.
+/*!
+ * Kick a user from the room.
+ *
+ * The caller must have the required power level in order to perform this
+ * operation.
+ *
+ * Kicking a user adjusts the target member's membership state to be ``leave``
+ * with an optional ``reason``. Like with other membership changes, a user can
+ * directly adjust the target member's state by making a request to
+ * ``/rooms/<room id>/state/m.room.member/<user id>``.
+ */
+class KickJob : public BaseJob
+{
+public:
+    /*! Kick a user from the room.
+     * \param roomId
+     *   The room identifier (not alias) from which the user should be kicked.
+     * \param userId
+     *   The fully qualified user ID of the user being kicked.
+     * \param reason
+     *   The reason the user has been kicked. This will be supplied as the
+     *   ``reason`` on the target's updated `m.room.member`_ event.
+     */
+    explicit KickJob(const QString& roomId, const QString& userId,
+                     const QString& reason = {});
+};
 
-    /// Kick a user from the room.
-    ///
-    /// Kick a user from the room.
-    ///
-    /// The caller must have the required power level in order to perform this
-    /// operation.
-    ///
-    /// Kicking a user adjusts the target member's membership state to be
-    /// ``leave`` with an optional ``reason``. Like with other membership
-    /// changes, a user can directly adjust the target member's state by making
-    /// a request to ``/rooms/<room id>/state/m.room.member/<user id>``.
-    class KickJob : public BaseJob
-    {
-        public:
-        /*! Kick a user from the room.
-         * \param roomId
-         *   The room identifier (not alias) from which the user should be
-         * kicked. \param userId The fully qualified user ID of the user being
-         * kicked. \param reason The reason the user has been kicked. This will
-         * be supplied as the
-         *   ``reason`` on the target's updated `m.room.member`_ event.
-         */
-        explicit KickJob(const QString& roomId, const QString& userId,
-                         const QString& reason = {});
-    };
 } // namespace QMatrixClient