added cipher to channel + user

[quassel.git] / src / common / ircchannel.h

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 5bcaa79..0c0f2ed 100644 (file)
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -29,10 +29,15 @@
 
 #include "syncableobject.h"
 
+#ifdef HAVE_QCA2
+#include "cipher.h"
+#endif
+
 class IrcUser;
 class Network;
 
 class IrcChannel : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(QString name READ name STORED false)
@@ -69,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);
@@ -76,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);
@@ -93,7 +103,7 @@ public slots:
 
   void addChannelMode(const QChar &mode, const QString &value);
   void removeChannelMode(const QChar &mode, const QString &value);
-
+ 
   // init geters
   QVariantMap initUserModes() const;
   QVariantMap initChanModes() const;
@@ -101,18 +111,18 @@ public slots:
   // 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 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 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);
@@ -130,7 +140,7 @@ private:
   QString _name;
   QString _topic;
   QString _password;
-
+  
   QHash<IrcUser *, QString> _userModes;
 
   Network *network;
@@ -143,6 +153,9 @@ private:
   QHash<QChar, QString> _C_channelModes;
   QSet<QChar> _D_channelModes;
 
+  #ifdef HAVE_QCA2
+  Cipher *_cipher;
+  #endif
 };
 
 #endif