X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=0ffc0a0da0de5067a6dff9c59baa42e802ee5502;hp=117bbd78c8f10001c5aab4ae86a2456c7b5fcad7;hb=188b778bd62a10521ab721a212f8ea2f62fd636a;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 117bbd78..0ffc0a0d 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -50,7 +50,7 @@ class NetworkItem : public PropertyMapItem {
   Q_PROPERTY(QString networkName READ networkName)
   Q_PROPERTY(QString currentServer READ currentServer)
   Q_PROPERTY(int nickCount READ nickCount)
-    
+
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
@@ -110,10 +110,11 @@ public:
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
   inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
-  inline void setLastSeenMsgId(const MsgId &msgId) { _lastSeenMsgId = msgId; }
+  inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; }
+  void setLastSeenMsgId(const MsgId &msgId);
   inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
   void setActivityLevel(BufferInfo::ActivityLevel level);
-  //void updateActivityLevel(BufferInfo::ActivityLevel level);
+  void clearActivityLevel();
   void updateActivityLevel(const Message &msg);
 
   bool isCurrentBuffer() const;
@@ -126,6 +127,7 @@ private:
   BufferInfo _bufferInfo;
   BufferInfo::ActivityLevel _activity;
   MsgId _lastSeenMsgId;
+  MsgId _lastSeenMarkerMsgId;
 };
 
 /*****************************************
@@ -178,7 +180,7 @@ public:
 
   virtual inline QString topic() const { return (bool)_ircChannel ? _ircChannel->topic() : QString(); }
   virtual inline int nickCount() const { return (bool)_ircChannel ? _ircChannel->ircUsers().count() : 0; }
-  
+
   void attachIrcChannel(IrcChannel *ircChannel);
 
 public slots:
@@ -205,7 +207,7 @@ class IrcUserItem;
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString categoryName READ categoryName)
-    
+
 public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
@@ -231,7 +233,7 @@ private:
 class IrcUserItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString nickName READ nickName)
-    
+
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
@@ -257,7 +259,7 @@ class NetworkModel : public TreeModel {
   Q_OBJECT
 
 public:
-  enum myRoles {
+  enum Role {
     BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
@@ -265,16 +267,17 @@ public:
     NetworkIdRole,
     BufferInfoRole,
     ItemTypeRole,
-    UserAwayRole
+    UserAwayRole,
+    IrcUserRole
   };
 
-  enum itemType {
+  enum ItemType {
     NetworkItemType = 0x01,
     BufferItemType = 0x02,
     UserCategoryItemType = 0x04,
     IrcUserItemType = 0x08
   };
-  Q_DECLARE_FLAGS(itemTypes, itemType);
+  Q_DECLARE_FLAGS(ItemTypes, ItemType)
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
@@ -297,12 +300,21 @@ public:
 
   BufferInfo::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
 
-  QString bufferName(BufferId bufferId);
-  BufferInfo::Type bufferType(BufferId bufferId);
-  BufferInfo bufferInfo(BufferId bufferId);
-  MsgId lastSeenMsgId(BufferId bufferId);
-  NetworkId networkId(BufferId bufferId);
-  QString networkName(BufferId bufferId);
+  //! Finds a buffer with a given name in a given network
+  /** This performs a linear search through all BufferItems, hence it is expensive.
+   *  @param networkId  The network which we search in
+   *  @param bufferName The bufferName we look for
+   *  @return The id of the buffer if found, an invalid one else
+   */
+  BufferId bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs = Qt::CaseInsensitive) const;
+
+  QString bufferName(BufferId bufferId) const;
+  BufferInfo::Type bufferType(BufferId bufferId) const;
+  BufferInfo bufferInfo(BufferId bufferId) const;
+  MsgId lastSeenMsgId(BufferId bufferId) const;
+  MsgId lastSeenMarkerMsgId(BufferId bufferId) const;
+  NetworkId networkId(BufferId bufferId) const;
+  QString networkName(BufferId bufferId) const;
 
   inline QList<BufferId> allBufferIds() const { return _bufferItemCache.keys(); }
 
@@ -311,23 +323,27 @@ public slots:
   void removeBuffer(BufferId bufferId);
   void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
   void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity);
+  void clearBufferActivity(const BufferId &bufferId);
   void updateBufferActivity(const Message &msg);
   void networkRemoved(const NetworkId &networkId);
 
+signals:
+  void setLastSeenMsg(BufferId bufferId, MsgId msgId);
+
 private slots:
   void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);
   void checkForNewBuffers(const QModelIndex &parent, int start, int end);
 
 private:
-  int networkRow(NetworkId networkId);
-  NetworkItem *findNetworkItem(NetworkId networkId);
+  int networkRow(NetworkId networkId) const;
+  NetworkItem *findNetworkItem(NetworkId networkId) const;
   NetworkItem *networkItem(NetworkId networkId);
-  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
-  BufferItem *findBufferItem(BufferId bufferId);
+  inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) const { return findBufferItem(bufferInfo.bufferId()); }
+  BufferItem *findBufferItem(BufferId bufferId) const;
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
   QHash<BufferId, BufferItem *> _bufferItemCache;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)
 
 #endif // NETWORKMODEL_H