X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=a6af5373b06de79d0c23a1d4e2d5bc1ee3fcd726;hb=c30f8eb1f1d360284b38016655cdb6a3e40db8ed;hp=a00966d2106aa02042a9aae86ecdc45ff8f65253;hpb=cc7f376eb105f7bf931fb7f96c9601a7b3f69511;p=quassel.git diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp index a00966d2..a6af5373 100644 --- a/src/core/basichandler.cpp +++ b/src/core/basichandler.cpp @@ -22,7 +22,6 @@ #include #include "util.h" -#include "networkconnection.h" BasicHandler::BasicHandler(NetworkConnection *parent) : QObject(parent), @@ -33,8 +32,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 &, const QByteArray &)), + networkConnection(), SLOT(putCmd(QString, const QList &, const QByteArray &))); connect(this, SIGNAL(putRawLine(const QByteArray &)), networkConnection(), SLOT(putRawLine(const QByteArray &))); @@ -158,15 +157,6 @@ QList BasicHandler::userEncode(const QString &userNick, const QStrin // ==================== // protected: // ==================== - -Network *BasicHandler::network() const { - return networkConnection()->network(); -} - -NetworkConnection *BasicHandler::networkConnection() const { - return _networkConnection; -} - BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const { if(target.isEmpty()) return BufferInfo::StatusBuffer; @@ -178,17 +168,11 @@ BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const { } void BasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix) { - QVariantList list; + QList list; list << param; emit putCmd(cmd, list, prefix); } -void BasicHandler::putCmd(const QString &cmd, const QList ¶ms, 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) { IrcChannel *channel = network()->ircChannel(target); if(!channel && (target.startsWith('$') || target.startsWith('#')))