/***************************************************************************
- * Copyright (C) 2005-09 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 *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+
#include "corebasichandler.h"
#include "util.h"
connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)),
network(), SLOT(displayMsg(Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)));
- connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
- network(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
+ connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &, const bool)),
+ network(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &, const bool)));
+
+ connect(this, SIGNAL(putCmd(QString, const QList<QList<QByteArray>> &, const QByteArray &, const bool)),
+ network(), SLOT(putCmd(QString, const QList<QList<QByteArray>> &, const QByteArray &, const bool)));
- connect(this, SIGNAL(putRawLine(const QByteArray &)),
- network(), SLOT(putRawLine(const QByteArray &)));
+ connect(this, SIGNAL(putRawLine(const QByteArray &, const bool)),
+ network(), SLOT(putRawLine(const QByteArray &, const bool)));
}
}
-void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix)
+void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix, const bool prepend)
{
QList<QByteArray> list;
list << param;
- emit putCmd(cmd, list, prefix);
-}
-
-
-void CoreBasicHandler::displayMsg(Message::Type msgType, QString target, const QString &text, const QString &sender, Message::Flags flags)
-{
- IrcChannel *channel = network()->ircChannel(target);
- if (!channel) {
- if (!target.isEmpty() && network()->prefixes().contains(target[0]))
- target = target.mid(1);
-
- if (target.startsWith('$') || target.startsWith('#'))
- target = nickFromMask(sender);
- }
-
- emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
+ emit putCmd(cmd, list, prefix, prepend);
}