X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=02483d25b6277024cc940731db4371bb5c3b5624;hp=3c981515590efbc12c818e65c2f77c43de23be04;hb=07922d269c097a809fe20a7cbb605d176c7d3083;hpb=5b560ec1a01349562ac58051ca7e7fa899d4b994

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index 3c981515..02483d25 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -21,22 +21,23 @@
 
 #include <QMetaMethod>
 
+#include "util.h"
 #include "networkconnection.h"
 
 BasicHandler::BasicHandler(NetworkConnection *parent)
   : QObject(parent),
-    server(parent),
     defaultHandler(-1),
+    _networkConnection(parent),
     initDone(false)
 {
   connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
-	  server, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
 
-  connect(this, SIGNAL(putCmd(QString, QStringList, QString)),
-	  server, SLOT(putCmd(QString, QStringList, QString)));
+  connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
+         networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
 
-  connect(this, SIGNAL(putRawLine(QString)),
-	  server, SLOT(putRawLine(QString)));
+  connect(this, SIGNAL(putRawLine(const QByteArray &)),
+          networkConnection(), SLOT(putRawLine(const QByteArray &)));
 }
 
 QStringList BasicHandler::providesHandlers() {
@@ -92,11 +93,78 @@ void BasicHandler::handle(const QString &member, QGenericArgument val0,
   qt_metacall(QMetaObject::InvokeMetaMethod, handlerHash()[handler], param);
 }
 
+QString BasicHandler::serverDecode(const QByteArray &string) {
+  return networkConnection()->serverDecode(string);
+}
+
+QStringList BasicHandler::serverDecode(const QList<QByteArray> &stringlist) {
+  QStringList list;
+  foreach(QByteArray s, stringlist) list << networkConnection()->serverDecode(s);
+  return list;
+}
+
+QString BasicHandler::channelDecode(const QString &bufferName, const QByteArray &string) {
+  return networkConnection()->channelDecode(bufferName, string);
+}
+
+QStringList BasicHandler::channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist) {
+  QStringList list;
+  foreach(QByteArray s, stringlist) list << networkConnection()->channelDecode(bufferName, s);
+  return list;
+}
+
+QString BasicHandler::userDecode(const QString &userNick, const QByteArray &string) {
+  return networkConnection()->userDecode(userNick, string);
+}
+
+QStringList BasicHandler::userDecode(const QString &userNick, const QList<QByteArray> &stringlist) {
+  QStringList list;
+  foreach(QByteArray s, stringlist) list << networkConnection()->userDecode(userNick, s);
+  return list;
+}
+
+/*** ***/
+
+QByteArray BasicHandler::serverEncode(const QString &string) {
+  return networkConnection()->serverEncode(string);
+}
+
+QList<QByteArray> BasicHandler::serverEncode(const QStringList &stringlist) {
+  QList<QByteArray> list;
+  foreach(QString s, stringlist) list << networkConnection()->serverEncode(s);
+  return list;
+}
+
+QByteArray BasicHandler::channelEncode(const QString &bufferName, const QString &string) {
+  return networkConnection()->channelEncode(bufferName, string);
+}
+
+QList<QByteArray> BasicHandler::channelEncode(const QString &bufferName, const QStringList &stringlist) {
+  QList<QByteArray> list;
+  foreach(QString s, stringlist) list << networkConnection()->channelEncode(bufferName, s);
+  return list;
+}
+
+QByteArray BasicHandler::userEncode(const QString &userNick, const QString &string) {
+  return networkConnection()->userEncode(userNick, string);
+}
+
+QList<QByteArray> BasicHandler::userEncode(const QString &userNick, const QStringList &stringlist) {
+  QList<QByteArray> list;
+  foreach(QString s, stringlist) list << networkConnection()->userEncode(userNick, s);
+  return list;
+}
+
 // ====================
 //  protected:
 // ====================
+
 Network *BasicHandler::network() const {
-  return server->network();
+  return networkConnection()->network();
+}
+
+NetworkConnection *BasicHandler::networkConnection() const {
+  return _networkConnection;
 }
 
 BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
@@ -108,3 +176,23 @@ BufferInfo::Type BasicHandler::typeByTarget(const QString &target) const {
 
   return BufferInfo::QueryBuffer;
 }
+
+void BasicHandler::putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix) {
+  QVariantList 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, quint8 flags) {
+  IrcChannel *channel = network()->ircChannel(target);
+  if(!channel && (target.startsWith('$') || target.startsWith('#')))
+    target = nickFromMask(sender);
+
+  emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
+}