Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 41 insertions, 45 deletions

diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h
index d02abfd0..541e433a 100644
--- a/lib/csapi/redaction.h
+++ b/lib/csapi/redaction.h
@@ -6,48 +6,44 @@
 
 #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
+namespace Quotient {
+
+/*! \brief 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:
+    /*! \brief 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 = {});
+
+    // Result properties
+
+    /// A unique identifier for the event.
+    QString eventId() const { return loadFromJson<QString>("event_id"_ls); }
+};
+
+} // namespace Quotient