X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=a458b79aeb8739d2c68ce39c14a6e3cc74c8398d;hp=d15a594fe81d063a10b5328ef2a76c5e40ed5c59;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=513c0edce6f4c69f16e6a00c144877e8d5940096 diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp index d15a594f..a458b79a 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-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,115 +15,131 @@ * 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" -#include "logger.h" +#include "logmessage.h" CoreBasicHandler::CoreBasicHandler(CoreNetwork *parent) - : BasicHandler(parent), + : BasicHandler(parent), _network(parent) { - 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, &CoreBasicHandler::displayMsg, network(), &CoreNetwork::onDisplayMsg); + connect(this, &CoreBasicHandler::putRawLine, network(), &CoreNetwork::putRawLine); + connect(this, selectOverload&, const QByteArray&, bool>(&CoreBasicHandler::putCmd), + network(), selectOverload&, const QByteArray&, bool>(&CoreNetwork::putCmd)); + connect(this, selectOverload>&, const QByteArray&, bool>(&CoreBasicHandler::putCmd), + network(), selectOverload>&, const QByteArray&, bool>(&CoreNetwork::putCmd)); +} - 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 &))); +QString CoreBasicHandler::serverDecode(const QByteArray &string) +{ + return network()->serverDecode(string); } -QString CoreBasicHandler::serverDecode(const QByteArray &string) { - return network()->serverDecode(string); -} -QStringList CoreBasicHandler::serverDecode(const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << network()->serverDecode(s); - return list; +QStringList CoreBasicHandler::serverDecode(const QList &stringlist) +{ + QStringList list; + foreach(QByteArray s, stringlist) list << network()->serverDecode(s); + return list; } -QString CoreBasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) { - return network()->channelDecode(bufferName, string); + +QString CoreBasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) +{ + return network()->channelDecode(bufferName, string); } -QStringList CoreBasicHandler::channelDecode(const QString &bufferName, const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s); - return list; + +QStringList CoreBasicHandler::channelDecode(const QString &bufferName, const QList &stringlist) +{ + QStringList list; + foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s); + return list; } -QString CoreBasicHandler::userDecode(const QString &userNick, const QByteArray &string) { - return network()->userDecode(userNick, string); + +QString CoreBasicHandler::userDecode(const QString &userNick, const QByteArray &string) +{ + return network()->userDecode(userNick, string); } -QStringList CoreBasicHandler::userDecode(const QString &userNick, const QList &stringlist) { - QStringList list; - foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s); - return list; + +QStringList CoreBasicHandler::userDecode(const QString &userNick, const QList &stringlist) +{ + QStringList list; + foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s); + return list; } + /*** ***/ -QByteArray CoreBasicHandler::serverEncode(const QString &string) { - return network()->serverEncode(string); +QByteArray CoreBasicHandler::serverEncode(const QString &string) +{ + return network()->serverEncode(string); } -QList CoreBasicHandler::serverEncode(const QStringList &stringlist) { - QList list; - foreach(QString s, stringlist) list << network()->serverEncode(s); - return list; + +QList CoreBasicHandler::serverEncode(const QStringList &stringlist) +{ + QList list; + foreach(QString s, stringlist) list << network()->serverEncode(s); + return list; } -QByteArray CoreBasicHandler::channelEncode(const QString &bufferName, const QString &string) { - return network()->channelEncode(bufferName, string); + +QByteArray CoreBasicHandler::channelEncode(const QString &bufferName, const QString &string) +{ + return network()->channelEncode(bufferName, string); } -QList CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) { - QList list; - foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s); - return list; + +QList CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) +{ + QList list; + foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s); + return list; } -QByteArray CoreBasicHandler::userEncode(const QString &userNick, const QString &string) { - return network()->userEncode(userNick, string); + +QByteArray CoreBasicHandler::userEncode(const QString &userNick, const QString &string) +{ + return network()->userEncode(userNick, string); } -QList CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) { - QList list; - foreach(QString s, stringlist) list << network()->userEncode(userNick, s); - return list; + +QList CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) +{ + QList list; + foreach(QString s, stringlist) list << network()->userEncode(userNick, s); + return list; } + // ==================== // protected: // ==================== -BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const { - if(target.isEmpty()) - return BufferInfo::StatusBuffer; +BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const +{ + if (target.isEmpty()) + return BufferInfo::StatusBuffer; - if(network()->isChannelName(target)) - return BufferInfo::ChannelBuffer; + if (network()->isChannelName(target)) + return BufferInfo::ChannelBuffer; - return BufferInfo::QueryBuffer; + return BufferInfo::QueryBuffer; } -void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix) { - QList 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) { - 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); - - emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags); +void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix, const bool prepend) +{ + QList list; + list << param; + emit putCmd(cmd, list, prefix, prepend); }