Merge branch 'seezer'

[quassel.git] / src / core / basichandler.h

diff --git a/src/core/basichandler.h b/src/core/basichandler.h
index a520087..4700347 100644 (file)
--- a/src/core/basichandler.h
+++ b/src/core/basichandler.h
@@ -29,8 +29,7 @@
 
 #include "message.h"
 
-class NetworkConnection;
-class Network;
+#include "networkconnection.h"
 
 class BasicHandler : public QObject {
   Q_OBJECT
@@ -42,26 +41,26 @@ public:
 
   QString serverDecode(const QByteArray &string);
   QStringList serverDecode(const QList<QByteArray> &stringlist);
-  QString bufferDecode(const QString &bufferName, const QByteArray &string);
-  QStringList bufferDecode(const QString &bufferName, const QList<QByteArray> &stringlist);
+  QString channelDecode(const QString &bufferName, const QByteArray &string);
+  QStringList channelDecode(const QString &bufferName, const QList<QByteArray> &stringlist);
   QString userDecode(const QString &userNick, const QByteArray &string);
   QStringList userDecode(const QString &userNick, const QList<QByteArray> &stringlist);
 
   QByteArray serverEncode(const QString &string);
   QList<QByteArray> serverEncode(const QStringList &stringlist);
-  QByteArray bufferEncode(const QString &bufferName, const QString &string);
-  QList<QByteArray> bufferEncode(const QString &bufferName, const QStringList &stringlist);
+  QByteArray channelEncode(const QString &bufferName, const QString &string);
+  QList<QByteArray> channelEncode(const QString &bufferName, const QStringList &stringlist);
   QByteArray userEncode(const QString &userNick, const QString &string);
   QList<QByteArray> userEncode(const QString &userNick, const QStringList &stringlist);
 
 signals:
-  void displayMsg(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix);
+  void displayMsg(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
+  void putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix = QByteArray());
   void putRawLine(const QByteArray &msg);
 
 protected:
+  void displayMsg(Message::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
   void putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix = QByteArray());
-  void putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix = QByteArray());
 
   virtual void handle(const QString &member, QGenericArgument val0 = QGenericArgument(0),
                       QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(),
@@ -70,8 +69,9 @@ protected:
                       QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument());
 
 
-  Network * network() const;
-  NetworkConnection * networkConnection() const;
+  inline Network *network() const { return _networkConnection->network(); }
+  inline NetworkConnection *networkConnection() const { return _networkConnection; }
+
   BufferInfo::Type typeByTarget(const QString &target) const;
 
 private: