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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index b28ec40a..018d6e7f 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -175,6 +175,7 @@ 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;
 
@@ -267,7 +268,9 @@ public:
     NetworkIdRole,
     BufferInfoRole,
     ItemTypeRole,
-    UserAwayRole
+    UserAwayRole,
+    IrcUserRole,
+    IrcChannelRole
   };
 
   enum ItemType {
@@ -305,7 +308,7 @@ public:
    *  @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) const;
+  BufferId bufferId(NetworkId networkId, const QString &bufferName, Qt::CaseSensitivity cs = Qt::CaseInsensitive) const;
 
   QString bufferName(BufferId bufferId) const;
   BufferInfo::Type bufferType(BufferId bufferId) const;
@@ -334,11 +337,11 @@ 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;