X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=26340ce6fbbb595dc1d8d3af30c698c23220f6f8;hp=e60634a8d3627ce5cb158748729dd41bb69ddf8b;hb=56607f81246f04db3a0e71c9a8757d7f75d6cfcf;hpb=1956aab57bf98ce072ed86f34785e5d7abba35a0

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index e60634a8..26340ce6 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 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        *
@@ -26,48 +26,63 @@
 #include <QStringList>
 #include <QVariantMap>
 
-class SignalProxy;
-class NetworkInfo;
+#include "syncableobject.h"
+
 class IrcUser;
+class Network;
+class SignalProxy;
 
-class IrcChannel : public QObject {
+class IrcChannel : public SyncableObject {
   Q_OBJECT
-  
+
   Q_PROPERTY(QString name READ name STORED false)
   Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
+  Q_PROPERTY(QString password READ password WRITE setPassword STORED false)
 
 public:
-  IrcChannel(const QString &channelname, NetworkInfo *networkInfo);
+  IrcChannel(const QString &channelname, Network *network);
+  ~IrcChannel();
 
   bool isKnownUser(IrcUser *ircuser) const;
   bool isValidChannelUserMode(const QString &mode) const;
 
-  bool initialized() const;
+  inline QString name() const { return _name; }
+  inline QString topic() const { return _topic; }
+  inline QString password() const { return _password; }
+
+  inline QList<IrcUser *> ircUsers() const { return _userModes.keys(); }
 
-  QString name() const;
-  QString topic() const;
-  
-  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;
 
+  inline QTextCodec *codecForEncoding() const { return _codecForEncoding; }
+  inline QTextCodec *codecForDecoding() const { return _codecForDecoding; }
+  void setCodecForEncoding(const QString &codecName);
+  void setCodecForEncoding(QTextCodec *codec);
+  void setCodecForDecoding(const QString &codecName);
+  void setCodecForDecoding(QTextCodec *codec);
 
-public slots:  
+  QString decodeString(const QByteArray &text) const;
+  QByteArray encodeString(const QString &string) const;
+
+public slots:
   void setTopic(const QString &topic);
+  void setPassword(const QString &password);
 
-  void join(IrcUser *ircuser);
-  void join(const QString &nick);
+  void joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes);
+  void joinIrcUsers(const QStringList &nicks, const QStringList &modes);
+  void joinIrcUsers(IrcUser *ircuser);
+  void joinIrcUsers(const QString &nick);
 
   void part(IrcUser *ircuser);
   void part(const QString &nick);
 
   void setUserModes(IrcUser *ircuser, const QString &modes);
   void setUserModes(const QString &nick, const QString &modes);
-  
+
   void addUserMode(IrcUser *ircuser, const QString &mode);
   void addUserMode(const QString &nick, const QString &mode);
-  
+
   void removeUserMode(IrcUser *ircuser, const QString &mode);
   void removeUserMode(const QString &nick, const QString &mode);
 
@@ -76,31 +91,41 @@ public slots:
 
   // init seters
   void initSetUserModes(const QVariantMap &usermodes);
-  
-  void setInitialized();
 
 signals:
-  void topicSet(QString topic);
+  void topicSet(const QString &topic);
+  void passwordSet(const QString &password);
   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 ircUsersJoined(QList<IrcUser *> ircusers);
+  void ircUsersJoined(QStringList nicks, QStringList modes);
   void ircUserParted(IrcUser *ircuser);
-  
-  void initDone();
+  void ircUserNickSet(IrcUser *ircuser, QString nick);
+  void ircUserModeAdded(IrcUser *ircuser, QString mode);
+  void ircUserModeRemoved(IrcUser *ircuser, QString mode);
+  void ircUserModesSet(IrcUser *ircuser, QString modes);
 
 private slots:
    void ircUserDestroyed();
+   void ircUserNickSet(QString nick);
 
 private:
   bool _initialized;
   QString _name;
   QString _topic;
+  QString _password;
+
+  QHash<IrcUser *, QString> _userModes;
+
+  Network *network;
 
-  QHash<IrcUser *, QString> _userModes; 
-  
-  NetworkInfo *networkInfo;
+  QTextCodec *_codecForEncoding;
+  QTextCodec *_codecForDecoding;
 };
 
 #endif