X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=0bb1438bf31de24ea919eb0ccda2546b5cc0e451;hp=adf9fa47357893210ff34e68fad3639cbcb89645;hb=9ba9f4c7b0122803fe0d73a8556b1506e77d32a4;hpb=fe4b38e66592f11fdf4c4651863968983daecd2d

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index adf9fa47..0bb1438b 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -22,6 +22,7 @@
 #include <QMetaMethod>
 
 #include "util.h"
+#include "logger.h"
 
 BasicHandler::BasicHandler(NetworkConnection *parent)
   : QObject(parent),
@@ -32,8 +33,8 @@ BasicHandler::BasicHandler(NetworkConnection *parent)
   connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
          networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
 
-  connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
-         networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
+  connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
+	  networkConnection(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
 
   connect(this, SIGNAL(putRawLine(const QByteArray &)),
           networkConnection(), SLOT(putRawLine(const QByteArray &)));
@@ -168,18 +169,15 @@ BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
 }
 
 void BasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix) {
-  QVariantList list;
+  QList<QByteArray> list;
   list << param;
   emit putCmd(cmd, list, prefix);
 }
 
-void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix) {
-  QVariantList list;
-  foreach(QByteArray param, params) list << param;
-  emit putCmd(cmd, list, prefix);
-}
-
 void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
+  if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+    target = target.mid(1);
+
   IrcChannel *channel = network()->ircChannel(target);
   if(!channel && (target.startsWith('$') || target.startsWith('#')))
     target = nickFromMask(sender);