replaced Client::fakeInput() with Client::userInpt() (now static but no longer a...

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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 2946872..8213648 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -116,8 +116,8 @@ class NetworkItem : public PropertyMapItem {
 public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
-  virtual QVariant data(int column, int row) const;
   virtual quint64 id() const;
+  virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
   
@@ -150,7 +150,8 @@ public:
 
   QString categoryId();
   virtual quint64 id() const;
-
+  virtual QVariant data(int column, int role) const;
+  
   void addUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
@@ -180,13 +181,11 @@ public:
   QString nickName() const;
   IrcUser *ircUser();
   virtual quint64 id() const;
-
   virtual QVariant data(int column, int role) const;
-                           
-
+  virtual QString toolTip(int column) const;
+                                  
 private slots:
   void setNick(QString newNick);
-  void ircUserDestroyed();
 
 private:
   IrcUser *_ircUser;
@@ -205,15 +204,15 @@ public:
     ItemActiveRole,
     BufferIdRole,
     NetworkIdRole,
+    BufferInfoRole,
     ItemTypeRole
   };
 
   enum itemTypes {
-    AbstractItemType,
-    SimpleItemType,
     NetworkItemType,
     BufferItemType,
-    NickItemType
+    UserCategoryItemType,
+    IrcUserItemType
   };
     
   NetworkModel(QObject *parent = 0);