X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.h;h=0777de57da1a4b18732d9cc241b528ade7f09e47;hp=37f629ddd5ff6e0d582e41a285f782804a8fac62;hb=8961f348947fc55cc4bc769563684af3f2ea7ccc;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003

diff --git a/src/core/corebasichandler.h b/src/core/corebasichandler.h
index 37f629dd..0777de57 100644
--- a/src/core/corebasichandler.h
+++ b/src/core/corebasichandler.h
@@ -52,35 +52,30 @@ public:
     QList<QByteArray> userEncode(const QString& userNick, const QStringList& stringlist);
 
 signals:
-    void displayMsg(Message::Type,
-                    BufferInfo::Type,
-                    const QString& target,
-                    const QString& text,
-                    const QString& sender = "",
-                    Message::Flags flags = Message::None);
+    void displayMsg(const NetworkInternalMessage& msg);
 
     /**
      * Sends the raw (encoded) line, adding to the queue if needed, optionally with higher priority.
      *
      * @see CoreNetwork::putRawLine()
      */
-    void putRawLine(const QByteArray& msg, const bool prepend = false);
+    void putRawLine(const QByteArray& msg, bool prepend = false);
 
     /**
      * Sends the command with encoded parameters, with optional prefix or high priority.
      *
-     * @see CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix = QByteArray(), const bool
-     * prepend = false)
+     * @see CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix = QByteArray(), const
+     * QHash<IrcTagKey, QString>& tags = {}, bool prepend = false)
      */
-    void putCmd(const QString& cmd, const QList<QByteArray>& params, const QByteArray& prefix = {}, bool prepend = false);
+    void putCmd(const QString& cmd, const QList<QByteArray>& params, const QByteArray& prefix = {}, const QHash<IrcTagKey, QString>& tags = {}, bool prepend = false);
 
     /**
      * Sends the command for each set of encoded parameters, with optional prefix or high priority.
      *
      * @see CoreNetwork::putCmd(const QString &cmd, const QList<QList<QByteArray>> &params, const QByteArray &prefix = QByteArray(), const
-     * bool prepend = false)
+     * QHash<IrcTagKey, QString>& tags = {}, bool prepend = false)
      */
-    void putCmd(const QString& cmd, const QList<QList<QByteArray>>& params, const QByteArray& prefix = {}, bool prepend = false);
+    void putCmd(const QString& cmd, const QList<QList<QByteArray>>& params, const QByteArray& prefix = {}, const QHash<IrcTagKey, QString>& tags = {}, bool prepend = false);
 
 protected:
     /**
@@ -89,6 +84,7 @@ protected:
      * @param[in] cmd      Command to send, ignoring capitalization
      * @param[in] param    Parameter for the command, encoded within a QByteArray
      * @param[in] prefix   Optional command prefix
+     * @param[in] tags     Optional command tags
      * @param[in] prepend
      * @parmblock
      * If true, the command is prepended into the start of the queue, otherwise, it's appended to
@@ -96,7 +92,7 @@ protected:
      * maintain PING/PONG replies, the other side will close the connection.
      * @endparmblock
      */
-    void putCmd(const QString& cmd, const QByteArray& param, const QByteArray& prefix = QByteArray(), const bool prepend = false);
+    void putCmd(const QString& cmd, const QByteArray& param, const QByteArray& prefix = QByteArray(), const QHash<IrcTagKey, QString>& tags = {}, bool prepend = false);
 
     inline CoreNetwork* network() const { return _network; }
     inline CoreSession* coreSession() const { return _network->coreSession(); }