Fix includes

[quassel.git] / src / client / networkmodel.h

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 09f9ece..daf8243 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -105,9 +105,11 @@ public:
 
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(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);