Refactoring of BasicHandler

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

diff --git a/src/core/basichandler.h b/src/core/corebasichandler.h
similarity index 77%
rename from src/core/basichandler.h
rename to src/core/corebasichandler.h
index ad954b5..d04beed 100644 (file)
--- a/src/core/basichandler.h
+++ b/src/core/corebasichandler.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-10 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,28 +18,24 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef BASICHANDLER_H_
-#define BASICHANDLER_H_
+#ifndef COREBASICHANDLER_H
+#define COREBASICHANDLER_H
 
-#include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QHash>
-#include <QGenericArgument>
 
+#include "basichandler.h"
 #include "message.h"
 
 #include "corenetwork.h"
 
 class CoreSession;
 
-class BasicHandler : public QObject {
+class CoreBasicHandler : public BasicHandler {
   Q_OBJECT
 
 public:
-  BasicHandler(CoreNetwork *parent = 0);
-
-  QStringList providesHandlers();
+  CoreBasicHandler(CoreNetwork *parent = 0);
 
   QString serverDecode(const QByteArray &string);
   QStringList serverDecode(const QList<QByteArray> &stringlist);
@@ -64,23 +60,12 @@ protected:
   void displayMsg(Message::Type, QString target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);
   void putCmd(const QString &cmd, const QByteArray &param, const QByteArray &prefix = QByteArray());
 
-  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());
-
-
   inline CoreNetwork *network() const { return _network; }
   inline CoreSession *coreSession() const { return _network->coreSession(); }
 
   BufferInfo::Type typeByTarget(const QString &target) const;
 
 private:
-  const QHash<QString, int> &handlerHash();
-  QHash<QString, int> _handlerHash;
-  int defaultHandler;
   CoreNetwork *_network;
-  bool initDone;
 };
 #endif