X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.cpp;h=1dbb0f08a177e958df9f5538af7d6c82b425533a;hp=5bd4c8b431f0c0b8901b8fce771fa542aaf62719;hb=2fde026f4e0509e164be0ccd50174cb6b1103d55;hpb=f6b9eeda207d42c99fc3e9085631722cf2ec83dc

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 5bd4c8b4..1dbb0f08 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -47,6 +47,10 @@ IrcUser::IrcUser(const QString &hostmask, Network *network) : SyncableObject(net
     _codecForDecoding(0)
 {
   updateObjectName();
+  
+  #ifdef HAVE_QCA2
+  _cipher = 0;
+  #endif
 }
 
 IrcUser::~IrcUser() {
@@ -124,8 +128,8 @@ void IrcUser::setRealName(const QString &realName) {
 void IrcUser::setAway(const bool &away) {
   if(away != _away) {
     _away = away;
-    emit awaySet(away);
     SYNC(ARG(away))
+    emit awaySet(away);
   }
 }
 
@@ -183,8 +187,8 @@ void IrcUser::setNick(const QString &nick) {
   if(!nick.isEmpty() && nick != _nick) {
     _nick = nick;
     updateObjectName();
-    emit nickSet(nick);
     SYNC(ARG(nick))
+    emit nickSet(nick);
   }
 }
 
@@ -257,6 +261,7 @@ void IrcUser::quit() {
     channel->part(this);
   }
   network()->removeIrcUser(this);
+  SYNC(NO_ARG)
   emit quited();
 }
 
@@ -309,3 +314,16 @@ void IrcUser::setLastSpokenTo(BufferId buffer, const QDateTime &time) {
   _lastSpokenTo[buffer] = time;
   emit lastSpokenToUpdated(buffer, time);
 }
+
+#ifdef HAVE_QCA2
+Cipher* IrcUser::cipher() {
+  if(!_cipher)
+    _cipher = new Cipher();
+  return _cipher;
+}
+#endif
+
+void IrcUser::setEncrypted(bool e) {
+  Q_UNUSED(e);
+  // TODO
+}
\ No newline at end of file