Merge branch 'dev' into kitsune-fix-read-receipts-and-markers

1 files changed, 9 insertions, 7 deletions

diff --git a/lib/room.h b/lib/room.h
index 73f28a6e..260510e6 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -169,14 +169,16 @@ public:
         TagsChange = 0x40,
         MembersChange = 0x80,
         /* = 0x100, */
-        AccountDataChange = 0x200,
+        AccountDataChange Q_DECL_ENUMERATOR_DEPRECATED_X(
+            "AccountDataChange will be merged into OtherChange in 0.8") = 0x200,
         SummaryChange = 0x400,
-        ReadMarkerChange = 0x800,
+        ReadMarkerChange Q_DECL_ENUMERATOR_DEPRECATED_X(
+            "ReadMarkerChange will be merged into OtherChange in 0.8") = 0x800,
         OtherChange = 0x8000,
+        OtherChanges = OtherChange,
         AnyChange = 0xFFFF
     };
-    Q_DECLARE_FLAGS(Changes, Change)
-    Q_FLAG(Changes)
+    QUO_DECLARE_FLAGS(Changes, Change)
 
     Room(Connection* connection, QString id, JoinState initialJoinState);
     ~Room() override;
@@ -720,11 +722,11 @@ Q_SIGNALS:
      */
     void baseStateLoaded();
     void eventsHistoryJobChanged();
-    void aboutToAddHistoricalMessages(RoomEventsRange events);
-    void aboutToAddNewMessages(RoomEventsRange events);
+    void aboutToAddHistoricalMessages(Quotient::RoomEventsRange events);
+    void aboutToAddNewMessages(Quotient::RoomEventsRange events);
     void addedMessages(int fromIndex, int toIndex);
     /// The event is about to be appended to the list of pending events
-    void pendingEventAboutToAdd(RoomEvent* event);
+    void pendingEventAboutToAdd(Quotient::RoomEvent* event);
     /// An event has been appended to the list of pending events
     void pendingEventAdded();
     /// The remote echo has arrived with the sync and will be merged