New upstream version 0.7.0

1 files changed, 14 insertions, 34 deletions

diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index a72a8ff9..a2e0b73b 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -1,41 +1,21 @@
-/******************************************************************************
- * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
 #include "roomevent.h"
 
-namespace QMatrixClient
-{
-    class RedactionEvent : public RoomEvent
-    {
-        public:
-            DEFINE_EVENT_TYPEID("m.room.redaction", RedactionEvent)
+namespace Quotient {
+class QUOTIENT_API RedactionEvent : public RoomEvent {
+public:
+    QUO_EVENT(RedactionEvent, "m.room.redaction")
 
-            explicit RedactionEvent(const QJsonObject& obj)
-                : RoomEvent(typeId(), obj)
-            { }
+    using RoomEvent::RoomEvent;
 
-            QString redactedEvent() const
-            { return fullJson()["redacts"_ls].toString(); }
-            QString reason() const
-            { return contentJson()["reason"_ls].toString(); }
-    };
-    REGISTER_EVENT_TYPE(RedactionEvent)
-    DEFINE_EVENTTYPE_ALIAS(Redaction, RedactionEvent)
-} // namespace QMatrixClient
+    QString redactedEvent() const
+    {
+        return fullJson()["redacts"_ls].toString();
+    }
+    QUO_CONTENT_GETTER(QString, reason)
+};
+} // namespace Quotient