X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebasichandler.cpp;h=2d51a3afe38184387285bf4d025f490083f6eeb8;hp=c08b1c737aad30b00b11c7d5fc0a65be138e1d46;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp
index c08b1c73..2d51a3af 100644
--- a/src/core/corebasichandler.cpp
+++ b/src/core/corebasichandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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,113 +21,107 @@
 #include "corebasichandler.h"
 
 #include "util.h"
-#include "logger.h"
 
-CoreBasicHandler::CoreBasicHandler(CoreNetwork *parent)
-    : BasicHandler(parent),
-    _network(parent)
+CoreBasicHandler::CoreBasicHandler(CoreNetwork* 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, 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 &)));
+    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));
 }
 
-
-QString CoreBasicHandler::serverDecode(const QByteArray &string)
+QString CoreBasicHandler::serverDecode(const QByteArray& string)
 {
     return network()->serverDecode(string);
 }
 
-
-QStringList CoreBasicHandler::serverDecode(const QList<QByteArray> &stringlist)
+QStringList CoreBasicHandler::serverDecode(const QList<QByteArray>& 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<QByteArray> &stringlist)
+QStringList CoreBasicHandler::channelDecode(const QString& bufferName, const QList<QByteArray>& 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<QByteArray> &stringlist)
+QStringList CoreBasicHandler::userDecode(const QString& userNick, const QList<QByteArray>& 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<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist)
+QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList& stringlist)
 {
     QList<QByteArray> 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<QByteArray> CoreBasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist)
+QList<QByteArray> CoreBasicHandler::channelEncode(const QString& bufferName, const QStringList& stringlist)
 {
     QList<QByteArray> 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<QByteArray> CoreBasicHandler::userEncode(const QString &userNick, const QStringList &stringlist)
+QList<QByteArray> CoreBasicHandler::userEncode(const QString& userNick, const QStringList& stringlist)
 {
     QList<QByteArray> 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;
@@ -138,25 +132,9 @@ BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const
     return BufferInfo::QueryBuffer;
 }
 
-
-void CoreBasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix)
+void CoreBasicHandler::putCmd(const QString& cmd, const QByteArray& param, const QByteArray& prefix, const bool prepend)
 {
     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)
-{
-    IrcChannel *channel = network()->ircChannel(target);
-    if (!channel) {
-        if (!target.isEmpty() && network()->prefixes().contains(target[0]))
-            target = target.mid(1);
-
-        if (target.startsWith('$') || target.startsWith('#'))
-            target = nickFromMask(sender);
-    }
-
-    emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
+    emit putCmd(cmd, list, prefix, prepend);
 }