X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=e933fb61fc6081252ec23cc14a1a78bf2bf4fb79;hb=fede47ff7b5098c66615be85024c2467f91f1d18;hp=cba3d03c8ed99f267a0814fd3c84c1561a1fc780;hpb=d6b056e936ec441258d291b7a8af7b83f9f53016;p=quassel.git

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index cba3d03c..e933fb61 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -63,9 +63,11 @@ public slots:
   void updateHostmask(const QString &mask);
 
   void setUserModes(const QString &modes);
-
-  void joinChannel(const QString &channel);
-  void partChannel(const QString &channel);
+  
+  void joinChannel(IrcChannel *channel);
+  void joinChannel(const QString &channelname);
+  void partChannel(IrcChannel *channel);
+  void partChannel(const QString &channelname);
 
   void addUserMode(const QString &mode);
   void removeUserMode(const QString &mode);
@@ -81,7 +83,6 @@ signals:
   void nickSet(QString newnick);
   void hostmaskUpdated(QString mask);
   
-  void channelsSet(QStringList channels);
   void userModesSet(QString modes);
   
   void channelJoined(QString channel);
@@ -99,6 +100,7 @@ signals:
 
 private slots:
   void updateObjectName();
+  void channelDestroyed();
   
 private:
   inline bool operator==(const IrcUser &ircuser2) {
@@ -115,7 +117,8 @@ private:
   QString _user;
   QString _host;
 
-  QSet<QString> _channels;
+  // QSet<QString> _channels;
+  QSet<IrcChannel *> _channels;
   QString _userModes;
   
   NetworkInfo *networkInfo;