X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.h;h=a3cc5a89042a5543645c0aab40ace9df0085ff6b;hp=db9dc787bb895fd5b55a549b55e43d7803d360f3;hb=f9fc50a5e043668a2525a6c0903ea339d4ba05b7;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/core/basichandler.h b/src/core/basichandler.h
index db9dc787..a3cc5a89 100644
--- a/src/core/basichandler.h
+++ b/src/core/basichandler.h
@@ -24,20 +24,21 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+#include <QHash>
 #include <QGenericArgument>
 
 #include "message.h"
 
-class Server;
-class NetworkInfo;
+class NetworkConnection;
+class Network;
 
 class BasicHandler : public QObject {
   Q_OBJECT
 
 public:
-  BasicHandler(Server *parent = 0);
+  BasicHandler(NetworkConnection *parent = 0);
 
-  QStringList providesHandlers() const;
+  QStringList providesHandlers();
 
 signals:
   void displayMsg(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
@@ -45,17 +46,20 @@ signals:
   void putRawLine(QString msg);
   
 protected:
-  virtual void handle(const QString &member, const QGenericArgument &val0 = QGenericArgument(0),
-		      const QGenericArgument &val1 = QGenericArgument(), const QGenericArgument &val2 = QGenericArgument(),
-		      const QGenericArgument &val3 = QGenericArgument(), const QGenericArgument &val4 = QGenericArgument(),
-		      const QGenericArgument &val5 = QGenericArgument(), const QGenericArgument &val6 = QGenericArgument(),
-		      const QGenericArgument &val7 = QGenericArgument(), const QGenericArgument &val8 = QGenericArgument());
+  virtual void handle(const QString &member, QGenericArgument val0 = QGenericArgument(0),
+		      QGenericArgument val1 = QGenericArgument(), QGenericArgument val2 = QGenericArgument(),
+		      QGenericArgument val3 = QGenericArgument(), QGenericArgument val4 = QGenericArgument(),
+		      QGenericArgument val5 = QGenericArgument(), QGenericArgument val6 = QGenericArgument(),
+		      QGenericArgument val7 = QGenericArgument(), QGenericArgument val8 = QGenericArgument());
 	    
-  Server *server;
-  
+  NetworkConnection *server;
 
-protected:
-  NetworkInfo *networkInfo() const;
+  Network *network() const;
 
+private:
+  const QHash<QString, int> &handlerHash();
+  QHash<QString, int> _handlerHash;
+  int defaultHandler;
+  bool initDone;
 };
 #endif