X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.h;h=0df183065a3653fe155bd38d5e7d8252c6db7532;hp=c276c96c3c914eb16a4e3b0cc6d5dbfc729e63d8;hb=a5dfcc8ecf8b81025d24b3c5c816169e3e030ea4;hpb=f7379184b7c0ae4e53d7470809f84e2ad3239ec1

diff --git a/src/core/basichandler.h b/src/core/basichandler.h
index c276c96c..0df18306 100644
--- a/src/core/basichandler.h
+++ b/src/core/basichandler.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _BASICHANDLER_H_
-#define _BASICHANDLER_H_
+#ifndef BASICHANDLER_H_
+#define BASICHANDLER_H_
 
 #include <QObject>
 #include <QString>
@@ -29,7 +29,7 @@
 
 #include "message.h"
 
-#include "networkconnection.h"
+#include "corenetwork.h"
 
 class CoreSession;
 
@@ -37,7 +37,7 @@ class BasicHandler : public QObject {
   Q_OBJECT
 
 public:
-  BasicHandler(NetworkConnection *parent = 0);
+  BasicHandler(CoreNetwork *parent = 0);
 
   QStringList providesHandlers();
 
@@ -71,9 +71,8 @@ protected:
                       QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument());
 
 
-  inline Network *network() const { return _networkConnection->network(); }
-  inline NetworkConnection *networkConnection() const { return _networkConnection; }
-  inline CoreSession *coreSession() const { return _networkConnection->coreSession(); }
+  inline CoreNetwork *network() const { return _network; }
+  inline CoreSession *coreSession() const { return _network->coreSession(); }
 
   BufferInfo::Type typeByTarget(const QString &target) const;
 
@@ -81,7 +80,7 @@ private:
   const QHash<QString, int> &handlerHash();
   QHash<QString, int> _handlerHash;
   int defaultHandler;
-  NetworkConnection *_networkConnection;
+  CoreNetwork *_network;
   bool initDone;
 };
 #endif