X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=8b9fd03a1410026ea2982f4a6e7974025899f052;hp=38205784816f931c4b9ac8ce7c28a290a27f8347;hb=48189e18131e2366eb2790b37f3b6412292f2d6c;hpb=6bff16ce4afeea153ffaf3d1916b6ba977853a27

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index 38205784..8b9fd03a 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -21,7 +21,8 @@
 
 #include <QMetaMethod>
 
-#include "networkconnection.h"
+#include "util.h"
+#include "logger.h"
 
 BasicHandler::BasicHandler(NetworkConnection *parent)
   : QObject(parent),
@@ -29,11 +30,11 @@ BasicHandler::BasicHandler(NetworkConnection *parent)
     _networkConnection(parent),
     initDone(false)
 {
-  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
-         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
+         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
 
-  connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
-         networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
+  connect(this, SIGNAL(putCmd(QString, const QList<QByteArray> &, const QByteArray &)),
+	  networkConnection(), SLOT(putCmd(QString, const QList<QByteArray> &, const QByteArray &)));
 
   connect(this, SIGNAL(putRawLine(const QByteArray &)),
           networkConnection(), SLOT(putRawLine(const QByteArray &)));
@@ -77,7 +78,7 @@ void BasicHandler::handle(const QString &member, QGenericArgument val0,
 
   if(!handlerHash().contains(handler)) {
     if(defaultHandler == -1) {
-      qWarning() << QString("No such Handler: %1::handle%2").arg(metaObject()->className(), handler);
+      quWarning() << QString("No such Handler: %1::handle%2").arg(metaObject()->className(), handler);
       return;
     } else {
       void *param[] = {0, Q_ARG(QString, member).data(), val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
@@ -102,13 +103,13 @@ QStringList BasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
   return list;
 }
 
-QString BasicHandler::bufferDecode(const QString &bufferName, const QByteArray &string) {
-  return networkConnection()->bufferDecode(bufferName, string);
+QString BasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
+  return networkConnection()->channelDecode(bufferName, string);
 }
 
-QStringList BasicHandler::bufferDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
+QStringList BasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
   QStringList list;
-  foreach(QByteArray s, stringlist) list << networkConnection()->bufferDecode(bufferName, s);
+  foreach(QByteArray s, stringlist) list << networkConnection()->channelDecode(bufferName, s);
   return list;
 }
 
@@ -134,13 +135,13 @@ QList<QByteArray> BasicHandler::serverEncode(const QStringList &stringlist) {
   return list;
 }
 
-QByteArray BasicHandler::bufferEncode(const QString &bufferName, const QString &string) {
-  return networkConnection()->bufferEncode(bufferName, string);
+QByteArray BasicHandler::channelEncode(const QString &bufferName, const QString &string) {
+  return networkConnection()->channelEncode(bufferName, string);
 }
 
-QList<QByteArray> BasicHandler::bufferEncode(const QString &bufferName, const QStringList &stringlist) {
+QList<QByteArray> BasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
   QList<QByteArray> list;
-  foreach(QString s, stringlist) list << networkConnection()->bufferEncode(bufferName, s);
+  foreach(QString s, stringlist) list << networkConnection()->channelEncode(bufferName, s);
   return list;
 }
 
@@ -157,15 +158,6 @@ QList<QByteArray> BasicHandler::userEncode(const QString &userNick, const QStrin
 // ====================
 //  protected:
 // ====================
-
-Network *BasicHandler::network() const {
-  return networkConnection()->network();
-}
-
-NetworkConnection *BasicHandler::networkConnection() const {
-  return _networkConnection;
-}
-
 BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
   if(target.isEmpty())
     return BufferInfo::StatusBuffer;
@@ -177,13 +169,15 @@ BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
 }
 
 void BasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix) {
-  QVariantList list;
+  QList<QByteArray> list;
   list << param;
   emit putCmd(cmd, list, prefix);
 }
 
-void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix) {
-  QVariantList list;
-  foreach(QByteArray param, params) list << param;
-  emit putCmd(cmd, list, prefix);
+void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
+  IrcChannel *channel = network()->ircChannel(target);
+  if(!channel && (target.startsWith('$') || target.startsWith('#')))
+    target = nickFromMask(sender);
+
+  emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
 }