X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.h;h=e27f26ea4ab850a190ed5eacc7f2fdb15e195664;hp=3b2749f393aae87b9697c6c687589b413fe14af2;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=62ff1c782104674e29df9e4744d9b41133b1eb7d

diff --git a/src/client/clientuserinputhandler.h b/src/client/clientuserinputhandler.h
index 3b2749f3..e27f26ea 100644
--- a/src/client/clientuserinputhandler.h
+++ b/src/client/clientuserinputhandler.h
@@ -21,12 +21,12 @@
 #ifndef CLIENTUSERINPUTHANDLER_H_
 #define CLIENTUSERINPUTHANDLER_H_
 
-#include <QPair>
+#include "basichandler.h"
 
-#include "aliasmanager.h"
-#include "bufferinfo.h"
+class BufferInfo;
+class NetworkId;
 
-class ClientUserInputHandler : public QObject {
+class ClientUserInputHandler : public BasicHandler {
   Q_OBJECT
 
 public:
@@ -39,18 +39,21 @@ signals:
   void sendInput(const BufferInfo &, const QString &);
 
 private slots:
-  void clientConnected();
-  void clientDisconnected();
-  void initDone();
   void completionSuffixChanged(const QVariant &);
 
-private:
-  void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg);
+  void handleExec(const BufferInfo &bufferInfo, const QString &execString);
+  void handleJoin(const BufferInfo &bufferInfo, const QString &text);
+  void handleQuery(const BufferInfo &bufferInfo, const QString &text);
+  void defaultHandler(const QString &cmd, const BufferInfo &bufferInfo, const QString &text);
 
-  bool _initialized;
+private:
   QRegExp _nickRx;
-  AliasManager _aliasManager;
-  QList<QPair<BufferInfo, QString> > _inputBuffer;
+
+  //! Helper method for switching to new/existing buffers
+  /** Immediately switches to the given buffer or schedules a switch for whenever
+    * the buffer is created
+    */
+  void switchBuffer(const NetworkId &networkId, const QString &bufferName);
 };
 
 #endif