diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-01-11 07:41:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 07:41:53 +0900 |
| commit | f37874c7e55239359d02b926a65cd62d17336522 (patch) | |
| tree | c14ba3abd15c380dd6430240dba46c615fc5eee8 /room.h | |
| parent | 78cfe3c102b686c71a1da5cbe91a2ae42dc03825 (diff) | |
| parent | fb4127da9db32e5e18b14beaaabbee7adf9cc334 (diff) | |
| download | libquotient-f37874c7e55239359d02b926a65cd62d17336522.tar.gz libquotient-f37874c7e55239359d02b926a65cd62d17336522.zip | |
Merge pull request #51 from Fxrh/kitsune-traceable-events
Make events traceable
Diffstat (limited to 'room.h')
| -rw-r--r-- | room.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -26,6 +26,8 @@ #include "jobs/syncjob.h" #include "joinstate.h" +#include <deque> + namespace QMatrixClient { class Event; @@ -38,7 +40,7 @@ namespace QMatrixClient Q_OBJECT Q_PROPERTY(QString readMarkerEventId READ readMarkerEventId WRITE markMessagesAsRead NOTIFY readMarkerPromoted) public: - using Timeline = Owning<Events>; + using Timeline = Owning< std::deque<Event*> >; Room(Connection* connection, QString id); virtual ~Room(); @@ -70,7 +72,6 @@ namespace QMatrixClient Q_INVOKABLE void updateData(SyncRoomData& data ); Q_INVOKABLE void setJoinState( JoinState state ); - Q_INVOKABLE QString lastReadEvent(User* user) const; QString readMarkerEventId() const; /** * @brief Mark the event with uptoEventId as read @@ -140,7 +141,7 @@ namespace QMatrixClient void addNewMessageEvents(const Events& events); void addHistoricalMessageEvents(const Events& events); - void setLastReadEvent(User* user, QString eventId); + void setLastReadEvent(User* user, Event* event); }; class MemberSorter |