X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.h;h=ebac6dd3e805be2bea58fd4af2676264186ff489;hb=fe4b38e66592f11fdf4c4651863968983daecd2d;hp=7af38942e2b279013e06127cd998ecee5851cc78;hpb=723db5bff304ad3fdf5a0609198c65a66bfbaea7;p=quassel.git

diff --git a/src/core/basichandler.h b/src/core/basichandler.h
index 7af38942..ebac6dd3 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
@@ -55,11 +54,12 @@ public:
   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 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 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());
 
@@ -70,8 +70,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: