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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index a6d4f26f..e933fb61 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -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;