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, 47 insertions, 43 deletions

diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index ab235b31..c75421cb 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -6,47 +6,51 @@
 
 #include "jobs/basejob.h"
 
-namespace QMatrixClient {
-    // Operations
-
-    /// Strips all non-integrity-critical information out of an event.
-    ///
-    /// Strips all information out of an event which isn't critical to the
-    /// integrity of the server-side representation of the room.
-    ///
-    /// This cannot be undone.
-    ///
-    /// Users may redact their own events, and any user with a power level
-    /// greater than or equal to the `redact` power level of the room may
-    /// redact events there.
-    class RedactEventJob : public BaseJob
-    {
-        public:
-        /*! Strips all non-integrity-critical information out of an event.
-         * \param roomId
-         *   The room from which to redact the event.
-         * \param eventId
-         *   The ID of the event to redact
-         * \param txnId
-         *   The transaction ID for this event. Clients should generate a
-         *   unique ID; it will be used by the server to ensure idempotency of
-         * requests. \param reason The reason for the event being redacted.
-         */
-        explicit RedactEventJob(const QString& roomId, const QString& eventId,
-                                const QString& txnId,
-                                const QString& reason = {});
-        ~RedactEventJob() override;
-
-        // Result properties
-
-        /// A unique identifier for the event.
-        const QString& eventId() const;
-
-        protected:
-        Status parseJson(const QJsonDocument& data) override;
-
-        private:
-        class Private;
-        QScopedPointer<Private> d;
-    };
+namespace QMatrixClient
+{
+
+// Operations
+
+/// Strips all non-integrity-critical information out of an event.
+/*!
+ * Strips all information out of an event which isn't critical to the
+ * integrity of the server-side representation of the room.
+ *
+ * This cannot be undone.
+ *
+ * Users may redact their own events, and any user with a power level
+ * greater than or equal to the `redact` power level of the room may
+ * redact events there.
+ */
+class RedactEventJob : public BaseJob
+{
+public:
+    /*! Strips all non-integrity-critical information out of an event.
+     * \param roomId
+     *   The room from which to redact the event.
+     * \param eventId
+     *   The ID of the event to redact
+     * \param txnId
+     *   The transaction ID for this event. Clients should generate a
+     *   unique ID; it will be used by the server to ensure idempotency of
+     * requests. \param reason The reason for the event being redacted.
+     */
+    explicit RedactEventJob(const QString& roomId, const QString& eventId,
+                            const QString& txnId, const QString& reason = {});
+
+    ~RedactEventJob() override;
+
+    // Result properties
+
+    /// A unique identifier for the event.
+    const QString& eventId() const;
+
+protected:
+    Status parseJson(const QJsonDocument& data) override;
+
+private:
+    class Private;
+    QScopedPointer<Private> d;
+};
+
 } // namespace QMatrixClient