X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreuserinputhandler.h;h=a45fcaec75b4fe8f440e353d3861020f1666f4b9;hp=0aae980eccbfaf10a69d0995f97d6699a38a3ca2;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=ba9e218feccbf16895f08ae4ec63aaa77de447d0

diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h
index 0aae980e..a45fcaec 100644
--- a/src/core/coreuserinputhandler.h
+++ b/src/core/coreuserinputhandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,6 +21,8 @@
 #ifndef COREUSERINPUTHANDLER_H
 #define COREUSERINPUTHANDLER_H
 
+#include <utility>
+
 #include "corebasichandler.h"
 #include "corenetwork.h"
 
@@ -32,22 +34,34 @@ class CoreUserInputHandler : public CoreBasicHandler
     Q_OBJECT
 
 public:
-    CoreUserInputHandler(CoreNetwork *parent = 0);
+    CoreUserInputHandler(CoreNetwork *parent = nullptr);
     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);
+    /**
+     * Handle the away command, marking as away or unaway
+     *
+     * Applies to the current network unless text begins with "-all".
+     *
+     * @param[in] bufferInfo      Currently active buffer
+     * @param[in] text            Away message, or blank to set unaway
+     * @param[in] skipFormatting  If true, skip timestamp formatting codes (e.g. if already done)
+     */
+    void handleAway(const BufferInfo &bufferInfo, const QString &text,
+                    const bool skipFormatting = false);
     void handleBan(const BufferInfo &bufferInfo, const QString &text);
     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& nicks);
-    void handleDehalfop(const BufferInfo& bufferInfo, const QString& nicks);
-    void handleDevoice(const BufferInfo& bufferInfo, const QString& nicks);
+    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 +71,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& nicks);
-    void handleHalfop(const BufferInfo& bufferInfo, const QString& nicks);
+    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);
@@ -76,27 +91,40 @@ public slots:
 
     void defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &text);
 
-    void issueQuit(const QString &reason);
-    void issueAway(const QString &msg, bool autoCheck = true);
+    /**
+     * Send a QUIT to the IRC server, optionally skipping the command queue.
+     *
+     * @param reason          Reason for quitting, often displayed to other IRC clients
+     * @param forceImmediate  Immediately quit, skipping queue of other commands
+     */
+    void issueQuit(const QString &reason, bool forceImmediate = false);
+
+    /**
+     * Issues the away command, marking as away or unaway on the current network
+     *
+     * @param[in] msg             Away message, or blank to set unaway
+     * @param[in] autoCheck       If true, always set away, defaulting to the identity away message
+     * @param[in] skipFormatting  If true, skip timestamp formatting codes (e.g. if already done)
+     */
+    void issueAway(const QString &msg, bool autoCheck = true, const bool skipFormatting = false);
 
 protected:
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
 
 private:
-    void doMode(const BufferInfo& bufferInfo, const QChar& addOrRemove, const QChar& mode, const QString &nickList);
+    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 = nullptr);
 
 #ifdef HAVE_QCA2
-    QByteArray encrypt(const QString &target, const QByteArray &message, bool *didEncrypt = 0) const;
+    QByteArray encrypt(const QString &target, const QByteArray &message, bool *didEncrypt = nullptr) const;
 #endif
 
     struct Command {
         BufferInfo bufferInfo;
         QString command;
-        Command(const BufferInfo &info, const QString &command) : bufferInfo(info), command(command) {}
-        Command() {}
+        Command(BufferInfo info, QString command) : bufferInfo(std::move(info)), command(std::move(command)) {}
+        Command() = default;
     };
 
     QHash<int, Command> _delayedCommands;