X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=2d51a3afe38184387285bf4d025f490083f6eeb8;hp=a458b79aeb8739d2c68ce39c14a6e3cc74c8398d;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=6eefdfc697067d184a589fc8a231b16316c09106 diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp index a458b79a..2d51a3af 100644 --- a/src/core/corebasichandler.cpp +++ b/src/core/corebasichandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,111 +21,107 @@ #include "corebasichandler.h" #include "util.h" -#include "logmessage.h" -CoreBasicHandler::CoreBasicHandler(CoreNetwork *parent) - : BasicHandler(parent), - _network(parent) +CoreBasicHandler::CoreBasicHandler(CoreNetwork* parent) + : BasicHandler(parent) + , _network(parent) { 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, + 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)); } - -QString CoreBasicHandler::serverDecode(const QByteArray &string) +QString CoreBasicHandler::serverDecode(const QByteArray& string) { return network()->serverDecode(string); } - -QStringList CoreBasicHandler::serverDecode(const QList &stringlist) +QStringList CoreBasicHandler::serverDecode(const QList& stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << network()->serverDecode(s); + foreach (QByteArray s, stringlist) + list << network()->serverDecode(s); return list; } - -QString CoreBasicHandler::channelDecode(const QString &bufferName, const QByteArray &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 CoreBasicHandler::channelDecode(const QString& bufferName, const QList& stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s); + foreach (QByteArray s, stringlist) + list << network()->channelDecode(bufferName, s); return list; } - -QString CoreBasicHandler::userDecode(const QString &userNick, const QByteArray &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 CoreBasicHandler::userDecode(const QString& userNick, const QList& stringlist) { QStringList list; - foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s); + foreach (QByteArray s, stringlist) + list << network()->userDecode(userNick, s); return list; } - /*** ***/ -QByteArray CoreBasicHandler::serverEncode(const QString &string) +QByteArray CoreBasicHandler::serverEncode(const QString& string) { return network()->serverEncode(string); } - -QList CoreBasicHandler::serverEncode(const QStringList &stringlist) +QList CoreBasicHandler::serverEncode(const QStringList& stringlist) { QList list; - foreach(QString s, stringlist) list << network()->serverEncode(s); + foreach (QString s, stringlist) + list << network()->serverEncode(s); return list; } - -QByteArray CoreBasicHandler::channelEncode(const QString &bufferName, const QString &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 CoreBasicHandler::channelEncode(const QString& bufferName, const QStringList& stringlist) { QList list; - foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s); + foreach (QString s, stringlist) + list << network()->channelEncode(bufferName, s); return list; } - -QByteArray CoreBasicHandler::userEncode(const QString &userNick, const QString &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 CoreBasicHandler::userEncode(const QString& userNick, const QStringList& stringlist) { QList list; - foreach(QString s, stringlist) list << network()->userEncode(userNick, s); + foreach (QString s, stringlist) + list << network()->userEncode(userNick, s); return list; } - // ==================== // protected: // ==================== -BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const +BufferInfo::Type CoreBasicHandler::typeByTarget(const QString& target) const { if (target.isEmpty()) return BufferInfo::StatusBuffer; @@ -136,8 +132,7 @@ BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const return BufferInfo::QueryBuffer; } - -void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray ¶m, const QByteArray &prefix, const bool prepend) +void CoreBasicHandler::putCmd(const QString& cmd, const QByteArray& param, const QByteArray& prefix, const bool prepend) { QList list; list << param;