X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=24347a8e670c1af02b586fff91791d15ca5b8ba4;hp=dfc8de05f6b924bfcdd2435653c0153a99f91966;hb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5;hpb=da3aa4136fe01e142238f0f42fe1273481037b9d

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index dfc8de05..24347a8e 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -22,6 +22,7 @@
 #define _IRCCHANNEL_H_
 
 #include <QHash>
+#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QVariantMap>
@@ -30,7 +31,6 @@
 
 class IrcUser;
 class Network;
-class SignalProxy;
 
 class IrcChannel : public SyncableObject {
   Q_OBJECT
@@ -41,7 +41,6 @@ class IrcChannel : public SyncableObject {
 
 public:
   IrcChannel(const QString &channelname, Network *network);
-  ~IrcChannel();
 
   bool isKnownUser(IrcUser *ircuser) const;
   bool isValidChannelUserMode(const QString &mode) const;
@@ -55,6 +54,11 @@ public:
   QString userModes(IrcUser *ircuser) const;
   QString userModes(const QString &nick) const;
 
+  bool hasMode(const QChar &mode) const;
+  QString modeValue(const QChar &mode) const;
+  QStringList modeValueList(const QChar &mode) const;
+  QString channelModeString() const;
+  
   inline QTextCodec *codecForEncoding() const { return _codecForEncoding; }
   inline QTextCodec *codecForDecoding() const { return _codecForDecoding; }
   void setCodecForEncoding(const QString &codecName);
@@ -69,8 +73,10 @@ 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);
@@ -84,23 +90,28 @@ public slots:
   void removeUserMode(IrcUser *ircuser, const QString &mode);
   void removeUserMode(const QString &nick, const QString &mode);
 
+  void addChannelMode(const QChar &mode, const QString &value);
+  void removeChannelMode(const QChar &mode, const QString &value);
+
   // init geters
   QVariantMap initUserModes() const;
+  QVariantMap initChanModes() const;
 
   // init seters
   void initSetUserModes(const QVariantMap &usermodes);
+  void initSetChanModes(const QVariantMap &chanModes);
 
 signals:
   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 channelModeAdded(const QChar &mode, const QString &value);
+  void channelModeRemoved(const QChar &mode, const QString &value);
+  
+  void ircUsersJoined(QList<IrcUser *> ircusers);
+  void ircUsersJoined(QStringList nicks, QStringList modes);
   void ircUserParted(IrcUser *ircuser);
   void ircUserNickSet(IrcUser *ircuser, QString nick);
   void ircUserModeAdded(IrcUser *ircuser, QString mode);
@@ -123,6 +134,12 @@ private:
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;
+
+  QHash<QChar, QStringList> _A_channelModes;
+  QHash<QChar, QString> _B_channelModes;
+  QHash<QChar, QString> _C_channelModes;
+  QSet<QChar> _D_channelModes;
+
 };
 
 #endif