X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=d2bb0d5ac79f43fbbd1bc194aaa725da43821778;hp=6bcc8def95b348744bd216df5ba88dcca25152f8;hb=02666f58f85f8c8a127804716e7df2d52d1e273c;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp index 6bcc8def..d2bb0d5a 100644 --- a/src/core/corebasichandler.cpp +++ b/src/core/corebasichandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,8 +15,9 @@ * 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" @@ -144,18 +145,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); -}