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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index a6d4f26f..d1ac21e1 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-08 by the Quassel Project                          *
  *   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        *
@@ -40,7 +40,6 @@ class IrcUser : public QObject {
   Q_PROPERTY(QStringList channels READ channels STORED false)
   //  Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
 
-
 public:
   IrcUser(const QString &hostmask, NetworkInfo *networkInfo);
   virtual ~IrcUser();
@@ -56,6 +55,17 @@ public:
 
   QStringList channels() const;
 
+  // user-specific encodings
+  QTextCodec *codecForEncoding() const;
+  QTextCodec *codecForDecoding() const;
+  void setCodecForEncoding(const QString &codecName);
+  void setCodecForEncoding(QTextCodec *codec);
+  void setCodecForDecoding(const QString &codecName);
+  void setCodecForDecoding(QTextCodec *codec);
+
+  QString decodeString(const QByteArray &text) const;
+  QByteArray encodeString(const QString string) const;
+
 public slots:
   void setUser(const QString &user);
   void setHost(const QString &host);
@@ -64,8 +74,10 @@ public slots:
 
   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);
@@ -80,10 +92,9 @@ signals:
   void hostSet(QString host);
   void nickSet(QString newnick);
   void hostmaskUpdated(QString mask);
-  
-  void channelsSet(QStringList channels);
+
   void userModesSet(QString modes);
-  
+
   void channelJoined(QString channel);
   void channelParted(QString channel);
 
@@ -91,7 +102,7 @@ signals:
   void userModeRemoved(QString mode);
 
   void renameObject(QString oldname, QString newname);
-  
+
 //   void setUsermodes(const QSet<QString> &usermodes);
 //   QSet<QString> usermodes() const;
 
@@ -99,7 +110,8 @@ signals:
 
 private slots:
   void updateObjectName();
-  
+  void channelDestroyed();
+
 private:
   inline bool operator==(const IrcUser &ircuser2) {
     return (_nick.toLower() == ircuser2.nick().toLower());
@@ -115,10 +127,14 @@ private:
   QString _user;
   QString _host;
 
-  QSet<QString> _channels;
+  // QSet<QString> _channels;
+  QSet<IrcChannel *> _channels;
   QString _userModes;
-  
+
   NetworkInfo *networkInfo;
+
+  QTextCodec *_codecForEncoding;
+  QTextCodec *_codecForDecoding;
 };
 
 #endif