Merge branch 'dev' into pinned

1 files changed, 5 insertions, 9 deletions

diff --git a/lib/eventitem.h b/lib/eventitem.h
index 1986ba77..0ab1a01d 100644
--- a/lib/eventitem.h
+++ b/lib/eventitem.h
@@ -9,11 +9,10 @@
 #include <utility>
 
 namespace Quotient {
-class StateEventBase;
 
-class EventStatus {
-    Q_GADGET
-public:
+namespace EventStatus {
+    Q_NAMESPACE
+
     /** Special marks an event can assume
      *
      * This is used to hint at a special status of some events in UI.
@@ -31,9 +30,8 @@ public:
         Replaced = 0x10, //< The event has been replaced
         Hidden = 0x100, //< The event should not be shown in the timeline
     };
-    Q_DECLARE_FLAGS(Status, Code)
-    Q_FLAG(Status)
-};
+    Q_ENUM_NS(Code)
+} // namespace EventStatus
 
 class EventItemBase {
 public:
@@ -106,7 +104,6 @@ inline const CallEventBase* EventItemBase::viewAs<CallEventBase>() const
 }
 
 class PendingEventItem : public EventItemBase {
-    Q_GADGET
 public:
     using EventItemBase::EventItemBase;
 
@@ -148,4 +145,3 @@ inline QDebug& operator<<(QDebug& d, const TimelineItem& ti)
     return d;
 }
 } // namespace Quotient
-Q_DECLARE_METATYPE(Quotient::EventStatus)