X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=d9598c94c9baf15f72f1927a9effccff92c12e3e;hp=41e5f1d76f4da34464a7c0249abf5c5d73e0975b;hb=56607f81246f04db3a0e71c9a8757d7f75d6cfcf;hpb=8b17f1bad397489b6d1e1fd30b3691c6fdd376ab

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 41e5f1d7..d9598c94 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -45,7 +45,7 @@ class IrcUser;
  *****************************************/
 class BufferItem : public PropertyMapItem {
   Q_OBJECT
-  Q_PROPERTY(QString bufferName READ bufferName)
+  Q_PROPERTY(QString bufferName READ bufferName WRITE setBufferName)
   Q_PROPERTY(QString topic READ topic)
   Q_PROPERTY(int nickCount READ nickCount)
 
@@ -60,6 +60,7 @@ public:
   void attachIrcChannel(IrcChannel *ircChannel);
 
   QString bufferName() const;
+  void setBufferName(const QString &name);
   QString topic() const;
   int nickCount() const;
 
@@ -76,12 +77,15 @@ public:
   bool setLastSeen();
   QDateTime lastSeen();
 
+  virtual QString toolTip(int column) const;
+
 public slots:
   void setTopic(const QString &topic);
-  void join(IrcUser *ircUser);
+  void join(const QList<IrcUser *> &ircUsers);
   void part(IrcUser *ircUser);
 
   void addUserToCategory(IrcUser *ircUser);
+  void addUsersToCategory(const QList<IrcUser *> &ircUser);
   void removeUserFromCategory(IrcUser *ircUser);
   void userModeChanged(IrcUser *ircUser);
 
@@ -91,6 +95,7 @@ private slots:
 
 private:
   BufferInfo _bufferInfo;
+  QString _bufferName;
   Buffer::ActivityLevel _activity;
 
   QPointer<IrcChannel> _ircChannel;
@@ -114,18 +119,20 @@ public:
   virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
-  
+
   QString networkName() const;
   QString currentServer() const;
   int nickCount() const;
-  
+
+  virtual QString toolTip(int column) const;
+
 public slots:
   void setNetworkName(const QString &networkName);
   void setCurrentServer(const QString &serverName);
 
   void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
-  
+
 private:
   NetworkId _networkId;
 
@@ -146,7 +153,7 @@ public:
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
   
-  void addUser(IrcUser *ircUser);
+  void addUsers(const QList<IrcUser *> &ircUser);
   bool removeUser(IrcUser *ircUser);
 
   static int categoryFromModes(const QString &modes);
@@ -180,9 +187,10 @@ public:
   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 setAway(bool);
 
 private:
   QPointer<IrcUser> _ircUser;
@@ -236,6 +244,7 @@ public:
 
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
+  void removeBuffer(BufferId bufferId);
   void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
   void networkRemoved(const NetworkId &networkId);