X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.h;h=177c35b08dae5757d7df5e9e3f77787ff25d74a4;hp=4cb2eb843bd86e4858afeac94dc01f097b12f38b;hb=d54b44bc5b6e1ff4308f9d143babf29028ae47cd;hpb=82a12eca7978598dafc059df6a2156e8899ef942

diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index 4cb2eb84..177c35b0 100644
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -22,7 +22,9 @@
 #define COREUSERINPUTHANDLER_H
 
 #include "corebasichandler.h"
+#include "corenetwork.h"
 
+class Cipher;
 class Server;
 
 class CoreUserInputHandler : public CoreBasicHandler {
@@ -30,6 +32,7 @@ class CoreUserInputHandler : public CoreBasicHandler {
 
 public:
   CoreUserInputHandler(CoreNetwork *parent = 0);
+  inline CoreNetwork *coreNetwork() const { return qobject_cast<CoreNetwork *>(parent()); }
 
   void handleUserInput(const BufferInfo &bufferInfo, const QString &text);
 
@@ -60,6 +63,7 @@ public slots:
   void handleQuote(const BufferInfo &bufferInfo, const QString &text);
   void handleSay(const BufferInfo &bufferInfo, const QString &text);
   void handleSetkey(const BufferInfo &bufferInfo, const QString &text);
+  void handleShowkey(const BufferInfo &bufferInfo, const QString &text);
   void handleTopic(const BufferInfo &bufferInfo, const QString &text);
   void handleVoice(const BufferInfo &bufferInfo, const QString &text);
   void handleWait(const BufferInfo &bufferInfo, const QString &text);
@@ -77,13 +81,13 @@ protected:
 
 private:
   void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
-  void putPrivmsg(const QByteArray &target, const QByteArray &message, bool encrypted);
+  void putPrivmsg(const QByteArray &target, const QByteArray &message, Cipher *cipher = 0);
   int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
 
-  #ifdef HAVE_QCA2
-  QByteArray encrypt(const QByteArray &target, QByteArray &message);
-  #endif
-  
+#ifdef HAVE_QCA2
+  QByteArray encrypt(const QString &target, const QByteArray &message, bool *didEncrypt = 0) const;
+#endif
+
   struct Command {
     BufferInfo bufferInfo;
     QString command;