X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=fbfc76c2f6ad3f8e4864fce537d1789f89a2930b;hp=f12b6422a3f461b500c7bd7fa49005f83e7b4c5e;hb=b5e38970ffd55e2dd9f706ce75af9a8d7730b1b8;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp index f12b6422..fbfc76c2 100644 --- a/src/core/corebasichandler.cpp +++ b/src/core/corebasichandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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 * @@ -33,6 +33,9 @@ CoreBasicHandler::CoreBasicHandler(CoreNetwork *parent) connect(this, SIGNAL(putCmd(QString, const QList &, const QByteArray &)), network(), SLOT(putCmd(QString, const QList &, const QByteArray &))); + connect(this, SIGNAL(putCmd(QString, const QList> &, const QByteArray &)), + network(), SLOT(putCmd(QString, const QList> &, const QByteArray &))); + connect(this, SIGNAL(putRawLine(const QByteArray &)), network(), SLOT(putRawLine(const QByteArray &))); } @@ -145,18 +148,3 @@ void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const 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); -}