X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.h;h=4700347813341f16f1c9deccf4a841ea84df031f;hb=79551d95b458b180e66353d079da1c2c947d8908;hp=f641a30bddf52a804a6fdada5e394546b50ce20a;hpb=f3fc0324c8860dff6af722dafbeb05fcb69a0c41;p=quassel.git

diff --git a/src/core/basichandler.h b/src/core/basichandler.h
index f641a30b..47003478 100644
--- 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
@@ -56,13 +55,12 @@ public:
 
 signals:
   void displayMsg(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
-  void putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix);
+  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(),
@@ -71,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: