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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index b28ec40a..7412d135 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -21,25 +21,12 @@
 #ifndef NETWORKMODEL_H
 #define NETWORKMODEL_H
 
-#include <QtCore>
-
-#include "treemodel.h"
 #include "bufferinfo.h"
-
-#include <QPointer>
-
-class BufferInfo;
-
-#include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
 #include "clientsettings.h"
-#include "ircchannel.h"
-#include "ircuser.h"
 #include "message.h"
 #include "network.h"
+#include "treemodel.h"
 
-class MappedSelectionModel;
-class QAbstractItemView;
 class BufferItem;
 
 /*****************************************
@@ -153,12 +140,13 @@ public:
   QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
   virtual inline bool isActive() const { return (bool)_ircUser; }
   virtual QString toolTip(int column) const;
 
 public slots:
   void attachIrcUser(IrcUser *ircUser);
-  void ircUserDestroyed();
+  void ircUserQuited();
 
 private:
   IrcUser *_ircUser;
@@ -175,6 +163,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;
 
@@ -194,7 +183,7 @@ public slots:
   void userModeChanged(IrcUser *ircUser);
 
 private slots:
-  void ircChannelDestroyed();
+  void ircChannelParted();
 
 private:
   IrcChannel *_ircChannel;
@@ -245,7 +234,7 @@ public:
   virtual QString toolTip(int column) const;
 
 private slots:
-  inline void ircUserDestroyed() { parent()->removeChild(this); }
+  inline void ircUserQuited() { parent()->removeChild(this); }
 
 private:
   QPointer<IrcUser> _ircUser;
@@ -267,7 +256,9 @@ public:
     NetworkIdRole,
     BufferInfoRole,
     ItemTypeRole,
-    UserAwayRole
+    UserAwayRole,
+    IrcUserRole,
+    IrcChannelRole
   };
 
   enum ItemType {
@@ -286,7 +277,6 @@ public:
 
   virtual QStringList mimeTypes() const;
   virtual QMimeData *mimeData(const QModelIndexList &) const;
-  virtual bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
 
   void attachNetwork(Network *network);
 
@@ -305,7 +295,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 +324,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;