X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fircuser.h;h=f74c46fdca4f9005085dd00a684bcba2dc6b4d8d;hb=2fde026f4e0509e164be0ccd50174cb6b1103d55;hp=8499dd1c5154816ead4bbc2b771b117bcbedabbd;hpb=2a00e8f57d66d9913a10c30408b89676a74010a1;p=quassel.git

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index 8499dd1c..f74c46fd 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -30,6 +30,10 @@
 #include "syncableobject.h"
 #include "types.h"
 
+#ifdef HAVE_QCA2
+#include "cipher.h"
+#endif
+
 class SignalProxy;
 class Network;
 class IrcChannel;
@@ -96,6 +100,12 @@ public:
   inline QDateTime lastSpokenTo(BufferId id) const { return _lastSpokenTo.value(id); }
   void setLastSpokenTo(BufferId id, const QDateTime &time);
 
+  #ifdef HAVE_QCA2
+  Cipher* cipher();
+  #endif
+
+  void setEncrypted(bool);
+  
 public slots:
   void setUser(const QString &user);
   void setHost(const QString &host);
@@ -122,13 +132,13 @@ public slots:
 
   void addUserModes(const QString &modes);
   void removeUserModes(const QString &modes);
-
+  
 signals:
 //   void userSet(QString user);
 //   void hostSet(QString host);
-//   void nickSet(QString newnick);
+  void nickSet(QString newnick); // needed in NetworkModel
 //   void realNameSet(QString realName);
-//   void awaySet(bool away);
+  void awaySet(bool away); // needed in NetworkModel
 //   void awayMessageSet(QString awayMessage);
 //   void idleTimeSet(QDateTime idleTime);
 //   void loginTimeSet(QDateTime loginTime);
@@ -138,9 +148,9 @@ signals:
 //   void whoisServiceReplySet(QString whoisServiceReply);
 //   void suserHostSet(QString suserHost);
 
-//   void userModesSet(QString modes);
-//   void userModesAdded(QString modes);
-//   void userModesRemoved(QString modes);
+  void userModesSet(QString modes);
+  void userModesAdded(QString modes);
+  void userModesRemoved(QString modes);
 
   // void channelJoined(QString channel);
   void channelParted(QString channel);
@@ -190,6 +200,10 @@ private:
 
   QHash<BufferId, QDateTime> _lastActivity;
   QHash<BufferId, QDateTime> _lastSpokenTo;
+  
+  #ifdef HAVE_QCA2
+  Cipher *_cipher;
+  #endif
 };
 
 #endif