X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=018d6e7f450fa0dba388de59d883531be20edc0a;hp=d61798651bab869ccf73d9d12ed3761a487600fd;hb=e3ad107e9783ac5ca4064fd7ce3cac7ff092e316;hpb=adff595449304996ee1a5b21f9ee768f83e0a4b1

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index d6179865..018d6e7f 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);
 
@@ -175,12 +175,13 @@ class ChannelBufferItem : public BufferItem {
 public:
   ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
+  virtual QVariant data(int column, int role) const;
   virtual inline bool isActive() const { return (bool)_ircChannel; }
   virtual QString toolTip(int column) const;
 
   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:
@@ -207,7 +208,7 @@ class IrcUserItem;
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString categoryName READ categoryName)
-    
+
 public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
@@ -233,7 +234,7 @@ private:
 class IrcUserItem : public PropertyMapItem {
   Q_OBJECT
   Q_PROPERTY(QString nickName READ nickName)
-    
+
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
@@ -259,7 +260,7 @@ class NetworkModel : public TreeModel {
   Q_OBJECT
 
 public:
-  enum myRoles {
+  enum Role {
     BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
@@ -267,16 +268,18 @@ public:
     NetworkIdRole,
     BufferInfoRole,
     ItemTypeRole,
-    UserAwayRole
+    UserAwayRole,
+    IrcUserRole,
+    IrcChannelRole
   };
 
-  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();
@@ -299,13 +302,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);
-  MsgId lastSeenMarkerMsgId(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(); }
 
@@ -326,15 +337,15 @@ private slots:
   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