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

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index 38205784..a00966d2 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -21,6 +21,7 @@
 
 #include <QMetaMethod>
 
+#include "util.h"
 #include "networkconnection.h"
 
 BasicHandler::BasicHandler(NetworkConnection *parent)
@@ -29,8 +30,8 @@ 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 &)));
@@ -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;
 }
 
@@ -187,3 +188,11 @@ void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, c
   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);
+}