Update upstream source from tag 'upstream/0.7.0'

Update to upstream version '0.7.0'
with Debian dir 30dcb77a77433e4a54eab77c0b82ae925dead2d8

1 files changed, 9 insertions, 26 deletions

diff --git a/lib/events/roompowerlevelsevent.h b/lib/events/roompowerlevelsevent.h
index f0f7207f..6150980a 100644
--- a/lib/events/roompowerlevelsevent.h
+++ b/lib/events/roompowerlevelsevent.h
@@ -1,16 +1,18 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #pragma once
 
-#include "eventcontent.h"
 #include "stateevent.h"
 
 namespace Quotient {
-class PowerLevelsEventContent : public EventContent::Base {
-public:
+struct QUOTIENT_API PowerLevelsEventContent {
     struct Notifications {
         int room;
     };
 
     explicit PowerLevelsEventContent(const QJsonObject& json);
+    QJsonObject toJson() const;
 
     int invite;
     int kick;
@@ -26,19 +28,14 @@ public:
     int usersDefault;
 
     Notifications notifications;
-
-protected:
-    void fillJson(QJsonObject* o) const override;
 };
 
-class RoomPowerLevelsEvent : public StateEvent<PowerLevelsEventContent> {
-    Q_GADGET
+class QUOTIENT_API RoomPowerLevelsEvent
+    : public KeylessStateEventBase<RoomPowerLevelsEvent, PowerLevelsEventContent> {
 public:
-    DEFINE_EVENT_TYPEID("m.room.power_levels", RoomPowerLevelsEvent)
+    QUO_EVENT(RoomPowerLevelsEvent, "m.room.power_levels")
 
-    explicit RoomPowerLevelsEvent(const QJsonObject& obj)
-        : StateEvent(typeId(), obj)
-    {}
+    using KeylessStateEventBase::KeylessStateEventBase;
 
     int invite() const { return content().invite; }
     int kick() const { return content().kick; }
@@ -58,19 +55,5 @@ public:
     int powerLevelForEvent(const QString& eventId) const;
     int powerLevelForState(const QString& eventId) const;
     int powerLevelForUser(const QString& userId) const;
-
-private:
 };
-
-template <>
-class EventFactory<RoomPowerLevelsEvent> {
-public:
-    static event_ptr_tt<RoomPowerLevelsEvent> make(const QJsonObject& json,
-                                              const QString&)
-    {
-        return makeEvent<RoomPowerLevelsEvent>(json);
-    }
-};
-
-REGISTER_EVENT_TYPE(RoomPowerLevelsEvent)
 } // namespace Quotient