X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=daf824351d4972aabc9fa637c4d49d8c6933f6b0;hp=09f9ece3a0f27f4fcd80b6b7d151845ffdeac557;hb=46984aca05b2d5f8dddd0c8739e60a1753078123;hpb=6b31f4c8abb36ebe658c2e5ce2a8e9ba2a50f443 diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index 09f9ece3..daf82435 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -105,9 +105,11 @@ public: virtual inline bool isActive() const { return qobject_cast(parent())->isActive(); } - inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; } - inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; } - void setLastSeenMsgId(const MsgId &msgId); + inline MsgId lastSeenMsgId() const { return _lastSeenMsgId; } + inline MsgId markerLineMsgId() const { return _markerLineMsgId; } + void setLastSeenMsgId(MsgId msgId); + void setMarkerLineMsgId(MsgId msgId); + inline BufferInfo::ActivityLevel activityLevel() const { return _activity; } void setActivityLevel(BufferInfo::ActivityLevel level); void clearActivityLevel(); @@ -125,7 +127,7 @@ private: BufferInfo _bufferInfo; BufferInfo::ActivityLevel _activity; MsgId _lastSeenMsgId; - MsgId _lastSeenMarkerMsgId; + MsgId _markerLineMsgId; MsgId _firstUnreadMsgId; }; @@ -275,6 +277,7 @@ public: IrcUserRole, IrcChannelRole, BufferFirstUnreadMsgIdRole, + MarkerLineMsgIdRole, }; enum ItemType { @@ -317,7 +320,7 @@ public: BufferInfo::Type bufferType(BufferId bufferId) const; BufferInfo bufferInfo(BufferId bufferId) const; MsgId lastSeenMsgId(BufferId bufferId) const; - MsgId lastSeenMarkerMsgId(BufferId bufferId) const; + MsgId markerLineMsgId(BufferId bufferId) const; NetworkId networkId(BufferId bufferId) const; QString networkName(BufferId bufferId) const; @@ -330,13 +333,16 @@ public slots: void removeBuffer(BufferId bufferId); MsgId lastSeenMsgId(const BufferId &bufferId); void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId); + void setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId); void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity); void clearBufferActivity(const BufferId &bufferId); void updateBufferActivity(Message &msg); void networkRemoved(const NetworkId &networkId); signals: - void setLastSeenMsg(BufferId bufferId, MsgId msgId); + void requestSetLastSeenMsg(BufferId buffer, MsgId msg); + void lastSeenMsgSet(BufferId buffer, MsgId msg); + void markerLineSet(BufferId buffer, MsgId msg); private slots: void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);