Fix license header for cipher.{cpp|h}

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

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index f624fb4..f74c46f 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -30,11 +30,16 @@
 #include "syncableobject.h"
 #include "types.h"
 
+#ifdef HAVE_QCA2
+#include "cipher.h"
+#endif
+
 class SignalProxy;
 class Network;
 class IrcChannel;
 
 class IrcUser : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(QString user READ user WRITE setUser STORED false)
@@ -95,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);
@@ -121,32 +132,30 @@ 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 realNameSet(QString realName);
-  void awaySet(bool away);
-  void awayMessageSet(QString awayMessage);
-  void idleTimeSet(QDateTime idleTime);
-  void loginTimeSet(QDateTime loginTime);
-  void serverSet(QString server);
-  void ircOperatorSet(QString ircOperator);
-  void lastAwayMessageSet(int lastAwayMessage);
-  void whoisServiceReplySet(QString whoisServiceReply);
-  void suserHostSet(QString suserHost);
-  void hostmaskUpdated(QString mask);
+//   void userSet(QString user);
+//   void hostSet(QString host);
+  void nickSet(QString newnick); // needed in NetworkModel
+//   void realNameSet(QString realName);
+  void awaySet(bool away); // needed in NetworkModel
+//   void awayMessageSet(QString awayMessage);
+//   void idleTimeSet(QDateTime idleTime);
+//   void loginTimeSet(QDateTime loginTime);
+//   void serverSet(QString server);
+//   void ircOperatorSet(QString ircOperator);
+//   void lastAwayMessageSet(int lastAwayMessage);
+//   void whoisServiceReplySet(QString whoisServiceReply);
+//   void suserHostSet(QString suserHost);
 
   void userModesSet(QString modes);
+  void userModesAdded(QString modes);
+  void userModesRemoved(QString modes);
 
   // void channelJoined(QString channel);
   void channelParted(QString channel);
   void quited();
 
-  void userModesAdded(QString modes);
-  void userModesRemoved(QString modes);
-
   void lastChannelActivityUpdated(BufferId id, const QDateTime &newTime);
   void lastSpokenToUpdated(BufferId id, const QDateTime &newTime);
 
@@ -191,6 +200,10 @@ private:
 
   QHash<BufferId, QDateTime> _lastActivity;
   QHash<BufferId, QDateTime> _lastSpokenTo;
+  
+  #ifdef HAVE_QCA2
+  Cipher *_cipher;
+  #endif
 };
 
 #endif