X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.h;h=f7cd0242d009d5b10913079a1be2c1275c0a4f8e;hp=b55052e564d6c4b0362597e0ac7dffc97b5f2892;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/core/corebasichandler.h b/src/core/corebasichandler.h
index b55052e5..f7cd0242 100644
--- a/src/core/corebasichandler.h
+++ b/src/core/corebasichandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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(); }