src: Yearly copyright bump

[quassel.git] / src / core / corebasichandler.cpp

diff --git a/src/core/corebasichandler.cpp b/src/core/corebasichandler.cpp
index fbfc76c..2d51a3a 100644 (file)
--- a/src/core/corebasichandler.cpp
+++ b/src/core/corebasichandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-2015 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  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -21,116 +21,107 @@
 #include "corebasichandler.h"
 
 #include "util.h"
 #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(putCmd(QString, const QList<QList<QByteArray>> &, const QByteArray &)),
-        network(), SLOT(putCmd(QString, const QList<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);
 }
 
 {
     return network()->serverDecode(string);
 }
 

-
-QStringList CoreBasicHandler::serverDecode(const QList<QByteArray> &stringlist)
+QStringList CoreBasicHandler::serverDecode(const QList<QByteArray>& stringlist)

 {
     QStringList list;
 {
     QStringList list;

-    foreach(QByteArray s, stringlist) list << network()->serverDecode(s);
+    foreach (QByteArray s, stringlist)
+        list << network()->serverDecode(s);

     return list;
 }
 
     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);
 }
 
 {
     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;
 {
     QStringList list;

-    foreach(QByteArray s, stringlist) list << network()->channelDecode(bufferName, s);
+    foreach (QByteArray s, stringlist)
+        list << network()->channelDecode(bufferName, s);

     return list;
 }
 
     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);
 }
 
 {
     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;
 {
     QStringList list;

-    foreach(QByteArray s, stringlist) list << network()->userDecode(userNick, s);
+    foreach (QByteArray s, stringlist)
+        list << network()->userDecode(userNick, s);

     return list;
 }
 
     return list;
 }
 

-

 /*** ***/
 
 /*** ***/
 

-QByteArray CoreBasicHandler::serverEncode(const QString &string)
+QByteArray CoreBasicHandler::serverEncode(const QString& string)

 {
     return network()->serverEncode(string);
 }
 
 {
     return network()->serverEncode(string);
 }
 

-
-QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList &stringlist)
+QList<QByteArray> CoreBasicHandler::serverEncode(const QStringList& stringlist)

 {
     QList<QByteArray> list;
 {
     QList<QByteArray> list;

-    foreach(QString s, stringlist) list << network()->serverEncode(s);
+    foreach (QString s, stringlist)
+        list << network()->serverEncode(s);

     return list;
 }
 
     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);
 }
 
 {
     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;
 {
     QList<QByteArray> list;

-    foreach(QString s, stringlist) list << network()->channelEncode(bufferName, s);
+    foreach (QString s, stringlist)
+        list << network()->channelEncode(bufferName, s);

     return list;
 }
 
     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);
 }
 
 {
     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;
 {
     QList<QByteArray> list;

-    foreach(QString s, stringlist) list << network()->userEncode(userNick, s);
+    foreach (QString s, stringlist)
+        list << network()->userEncode(userNick, s);

     return list;
 }
 
     return list;
 }
 

-

 // ====================
 //  protected:
 // ====================
 // ====================
 //  protected:
 // ====================

-BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const
+BufferInfo::Type CoreBasicHandler::typeByTarget(const QString& target) const

 {
     if (target.isEmpty())
         return BufferInfo::StatusBuffer;
 {
     if (target.isEmpty())
         return BufferInfo::StatusBuffer;


@@ -141,10 +132,9 @@ BufferInfo::Type CoreBasicHandler::typeByTarget(const QString &target) const
     return BufferInfo::QueryBuffer;
 }
 
     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;
 {
     QList<QByteArray> list;
     list << param;

-    emit putCmd(cmd, list, prefix);
+    emit putCmd(cmd, list, prefix, prepend);

 }
 }