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

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index dfc8de05..564eda89 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -18,10 +18,11 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _IRCCHANNEL_H_
-#define _IRCCHANNEL_H_
+#ifndef IRCCHANNEL_H
+#define IRCCHANNEL_H
 
 #include <QHash>
+#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QVariantMap>
@@ -30,9 +31,9 @@
 
 class IrcUser;
 class Network;
-class SignalProxy;
 
 class IrcChannel : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(QString name READ name STORED false)
@@ -49,12 +50,18 @@ public:
   inline QString name() const { return _name; }
   inline QString topic() const { return _topic; }
   inline QString password() const { return _password; }
+  inline Network *network() const { return _network; }
 
   inline QList<IrcUser *> ircUsers() const { return _userModes.keys(); }
 
   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 +76,9 @@ 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 joinIrcUser(IrcUser *ircuser);
 
   void part(IrcUser *ircuser);
   void part(const QString &nick);
@@ -84,29 +92,36 @@ 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 topicSet(const QString &topic); // needed by NetworkModel
+//   void passwordSet(const QString &password);
+//   void userModesSet(QString nick, QString modes);
+//   void userModeAdded(QString nick, QString mode);
+//   void userModeRemoved(QString nick, QString mode);
+//   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);
   void ircUserModeRemoved(IrcUser *ircuser, QString mode);
   void ircUserModesSet(IrcUser *ircuser, QString modes);
 
+  void parted(); // convenience signal emitted before channels destruction
+
 private slots:
    void ircUserDestroyed();
    void ircUserNickSet(QString nick);
@@ -119,10 +134,15 @@ private:
 
   QHash<IrcUser *, QString> _userModes;
 
-  Network *network;
+  Network *_network;
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;
+
+  QHash<QChar, QStringList> _A_channelModes;
+  QHash<QChar, QString> _B_channelModes;
+  QHash<QChar, QString> _C_channelModes;
+  QSet<QChar> _D_channelModes;
 };
 
 #endif