/***************************************************************************
- * 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 *
* 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 QString&, const QList<QByteArray>&, const QByteArray&, bool>(&CoreBasicHandler::putCmd),
+ network(), selectOverload<const QString&, const QList<QByteArray>&, const QByteArray&, bool>(&CoreNetwork::putCmd));
+ connect(this, selectOverload<const QString&, const QList<QList<QByteArray>>&, const QByteArray&, bool>(&CoreBasicHandler::putCmd),
+ network(), selectOverload<const QString&, const QList<QList<QByteArray>>&, const QByteArray&, bool>(&CoreNetwork::putCmd));
+}
- connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
- network(), SLOT(putCmd(QString, const QList<QByteArray> &, 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<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
- return list;
+QStringList CoreBasicHandler::serverDecode(const QList<QByteArray> &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<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
- return list;
+
+QStringList CoreBasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &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<QByteArray> &stringlist) {
- QStringList list;
- foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
- return list;
+
+QStringList CoreBasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &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<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist) {
- QList<QByteArray> list;
- foreach(QString s, stringlist) list << network()->serverEncode(s);
- return list;
+
+QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist)
+{
+ QList<QByteArray> 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<QByteArray> CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
- QList<QByteArray> list;
- foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
- return list;
+
+QList<QByteArray> CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist)
+{
+ QList<QByteArray> 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<QByteArray> CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
- QList<QByteArray> list;
- foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
- return list;
+
+QList<QByteArray> CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist)
+{
+ QList<QByteArray> 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<QByteArray> 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<QByteArray> list;
+ list << param;
+ emit putCmd(cmd, list, prefix, prepend);
}
projects / quassel.git / blobdiff