X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=a499b24cdf5c314f12be74fdb9608eaaf83cd6e0;hb=012e3de3c07f201ec337ebe586190281c83c9e5b;hp=9cdf52a450726e277f3ef84f92b2ce0dd0307f1c;hpb=7795adca52f35204f8c354da6fcc5d8e8ee35531;p=quassel.git

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 9cdf52a4..a499b24c 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005/06 by The Quassel Team                             *
+ *   Copyright (C) 2005/06 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        *
@@ -26,9 +26,9 @@
 #include <QStringList>
 #include <QVariantMap>
 
-class SignalProxy;
-class NetworkInfo;
 class IrcUser;
+class NetworkInfo;
+class SignalProxy;
 
 class IrcChannel : public QObject {
   Q_OBJECT
@@ -50,11 +50,20 @@ public:
 
   QList<IrcUser *> ircUsers() const;
 
-  QString userMode(IrcUser *ircuser) const;
-  QString userMode(const QString &nick) const;
+  QString userModes(IrcUser *ircuser) const;
+  QString userModes(const QString &nick) const;
+
+  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:  
+public slots:
   void setTopic(const QString &topic);
 
   void join(IrcUser *ircuser);
@@ -83,25 +92,36 @@ public slots:
 signals:
   void topicSet(QString topic);
   void userModesSet(QString nick, QString modes);
+  //void userModesSet(IrcUser *ircuser, QString modes);
   void userModeAdded(QString nick, QString mode);
+  //void userModeAdded(IrcUser *ircuser, QString mode);
   void userModeRemoved(QString nick, QString mode);
+  //void userModeRemoved(IrcUser *ircuser, QString mode);
 
   void ircUserJoined(IrcUser *ircuser);
   void ircUserParted(IrcUser *ircuser);
+  void ircUserNickSet(IrcUser *ircuser, QString nick);
+  void ircUserModeAdded(IrcUser *ircuser, QString mode);
+  void ircUserModeRemoved(IrcUser *ircuser, QString mode);
+  void ircUserModesSet(IrcUser *ircuser, QString modes);
 
   void initDone();
 
 private slots:
    void ircUserDestroyed();
+   void ircUserNickSet(QString nick);
 
 private:
   bool _initialized;
   QString _name;
   QString _topic;
 
-  QHash<IrcUser *, QString> _userModes; 
+  QHash<IrcUser *, QString> _userModes;
 
   NetworkInfo *networkInfo;
+
+  QTextCodec *_codecForEncoding;
+  QTextCodec *_codecForDecoding;
 };
 
 #endif