- MessageTypes are now binary exclusive which allows easy checks with multimple condi...

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

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 959d89a..8c36233 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -62,15 +62,9 @@ public:
   QString bufferName() const;
   QString topic() const;
   int nickCount() const;
-
-  enum Type {
-    StatusType,
-    ChannelType,
-    QueryType
-  };
   
   bool isStatusBuffer() const;
-  Type bufferType() const;
+  BufferInfo::Type bufferType() const;
 
   bool isActive() const;
   
@@ -101,11 +95,11 @@ public slots:
                                         
 private slots:
   void ircChannelDestroyed();
+  void ircUserDestroyed();
   
 private:
   BufferInfo _bufferInfo;
   ActivityLevel _activity;
-  Type _type;
   QDateTime _lastMsgInsert;
   QDateTime _lastSeen;
 
@@ -191,6 +185,8 @@ public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
   QString nickName() const;
+  bool isActive() const;
+
   IrcUser *ircUser();
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
@@ -200,7 +196,8 @@ private slots:
   void setNick(QString newNick);
 
 private:
-  IrcUser *_ircUser;
+  QPointer<IrcUser> _ircUser;
+  quint64 _id;
 };
 
 
@@ -250,7 +247,8 @@ public:
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
   void updateBufferActivity(const Message &msg);
-
+  void networkRemoved(const NetworkId &networkId);
+  
 private:
   QModelIndex networkIndex(NetworkId networkId);
   NetworkItem *networkItem(NetworkId networkId);