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

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 26340ce6..0c0f2ed1 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -18,21 +18,26 @@
  *   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>
 
 #include "syncableobject.h"
 
+#ifdef HAVE_QCA2
+#include "cipher.h"
+#endif
+
 class IrcUser;
 class Network;
-class SignalProxy;
 
 class IrcChannel : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(QString name READ name STORED false)
@@ -55,6 +60,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);
@@ -64,6 +74,12 @@ public:
 
   QString decodeString(const QByteArray &text) const;
   QByteArray encodeString(const QString &string) const;
+    
+  #ifdef HAVE_QCA2
+  Cipher* cipher();
+  #endif
+
+  void setEncrypted(bool);
 
 public slots:
   void setTopic(const QString &topic);
@@ -71,8 +87,7 @@ public slots:
 
   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 joinIrcUser(IrcUser *ircuser);
 
   void part(IrcUser *ircuser);
   void part(const QString &nick);
@@ -86,30 +101,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 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 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,13 +140,22 @@ private:
   QString _name;
   QString _topic;
   QString _password;
-
+  
   QHash<IrcUser *, QString> _userModes;
 
   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;
+
+  #ifdef HAVE_QCA2
+  Cipher *_cipher;
+  #endif
 };
 
 #endif