X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.h;h=6e69ce60599f0d8eb76f180b24b14ef942146678;hp=b6ebac1b9a39701fa714ce2f09f42174be50229f;hb=51ced68c9ba7f733c354e0b2dc737caa1f436a47;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index b6ebac1b..6e69ce60 100644
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,6 +36,7 @@ public:
     inline CoreNetwork *coreNetwork() const { return qobject_cast<CoreNetwork *>(parent()); }
 
     void handleUserInput(const BufferInfo &bufferInfo, const QString &text);
+    int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
 
 public slots:
     void handleAway(const BufferInfo &bufferInfo, const QString &text);
@@ -43,11 +44,12 @@ public slots:
     void handleUnban(const BufferInfo &bufferInfo, const QString &text);
     void handleCtcp(const BufferInfo &bufferInfo, const QString &text);
     void handleDelkey(const BufferInfo &bufferInfo, const QString &text);
-    void handleDeop(const BufferInfo &bufferInfo, const QString &text);
-    void handleDehalfop(const BufferInfo &bufferInfo, const QString &text);
-    void handleDevoice(const BufferInfo &bufferInfo, const QString &text);
+    void handleDeop(const BufferInfo& bufferInfo, const QString &nicks);
+    void handleDehalfop(const BufferInfo& bufferInfo, const QString &nicks);
+    void handleDevoice(const BufferInfo& bufferInfo, const QString &nicks);
     void handleInvite(const BufferInfo &bufferInfo, const QString &text);
     void handleJoin(const BufferInfo &bufferInfo, const QString &text);
+    void handleKeyx(const BufferInfo &bufferInfo, const QString &text);
     void handleKick(const BufferInfo &bufferInfo, const QString &text);
     void handleKill(const BufferInfo &bufferInfo, const QString &text);
     void handleList(const BufferInfo &bufferInfo, const QString &text);
@@ -57,10 +59,11 @@ public slots:
     void handleNick(const BufferInfo &bufferInfo, const QString &text);
     void handleNotice(const BufferInfo &bufferInfo, const QString &text);
     void handleOper(const BufferInfo &bufferInfo, const QString &text);
-    void handleOp(const BufferInfo &bufferInfo, const QString &text);
-    void handleHalfop(const BufferInfo &bufferInfo, const QString &text);
+    void handleOp(const BufferInfo& bufferInfo, const QString &nicks);
+    void handleHalfop(const BufferInfo& bufferInfo, const QString &nicks);
     void handlePart(const BufferInfo &bufferInfo, const QString &text);
     void handlePing(const BufferInfo &bufferInfo, const QString &text);
+    void handlePrint(const BufferInfo &bufferInfo, const QString &text);
     void handleQuery(const BufferInfo &bufferInfo, const QString &text);
     void handleQuit(const BufferInfo &bufferInfo, const QString &text);
     void handleQuote(const BufferInfo &bufferInfo, const QString &text);
@@ -83,9 +86,9 @@ protected:
     void timerEvent(QTimerEvent *event);
 
 private:
+    void doMode(const BufferInfo& bufferInfo, const QChar &addOrRemove, const QChar &mode, const QString &nickList);
     void banOrUnban(const BufferInfo &bufferInfo, const QString &text, bool ban);
-    void putPrivmsg(const QByteArray &target, const QByteArray &message, Cipher *cipher = 0);
-    int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
+    void putPrivmsg(const QString &target, const QString &message, std::function<QByteArray(const QString &, const QString &)> encodeFunc, Cipher *cipher = 0);
 
 #ifdef HAVE_QCA2
     QByteArray encrypt(const QString &target, const QByteArray &message, bool *didEncrypt = 0) const;