diff options
| -rw-r--r-- | lib/room.cpp | 7 | ||||
| -rw-r--r-- | lib/room.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/room.cpp b/lib/room.cpp index 4e7b29d8..6bccc405 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -633,7 +633,9 @@ Room::Changes Room::Private::setLastReadEvent(User* u, QString eventId) connection->callApi<SetReadMarkerJob>(BackgroundRequest, id, storedId); emit q->readMarkerMoved(eventId, storedId); - return Change::ReadMarkerChange; + // TODO: Drop ReadMarkerChange in 0.8 + return QT_IGNORE_DEPRECATIONS(Change::ReadMarkerChange) + | Change::OtherChange; } return Change::NoChange; } @@ -2813,7 +2815,8 @@ Room::Changes Room::processAccountDataEvent(EventPtr&& event) qCDebug(STATE) << "Updated account data of type" << currentData->matrixType(); emit accountDataChanged(currentData->matrixType()); - changes |= Change::AccountDataChange; + // TODO: Drop AccountDataChange in 0.8 + QT_IGNORE_DEPRECATIONS(changes |= AccountDataChange|OtherChange); } return changes; } @@ -142,10 +142,13 @@ 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 }; QUO_DECLARE_FLAGS(Changes, Change) |