X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.h;h=406540875f83b3627ba4eba35ac969d9dafc6879;hp=f459ac532c9d3a70d0c2a91d32adc0aac0f2cadc;hb=c4f9c122f56d2c58296c6a8663f79d605b033ae2;hpb=7a44d67d565fe4f627e64b158a91a5978591c743

diff --git a/src/client/clientuserinputhandler.h b/src/client/clientuserinputhandler.h
index f459ac53..40654087 100644
--- a/src/client/clientuserinputhandler.h
+++ b/src/client/clientuserinputhandler.h
@@ -1,54 +1,61 @@
 /***************************************************************************
-*   Copyright (C) 2005-09 by the Quassel Project                          *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
 
 #ifndef CLIENTUSERINPUTHANDLER_H_
 #define CLIENTUSERINPUTHANDLER_H_
 
-#include <QPair>
+#include "basichandler.h"
 
-#include "clientaliasmanager.h"
-#include "bufferinfo.h"
+class BufferInfo;
+class NetworkId;
 
-class ClientUserInputHandler : public QObject {
-  Q_OBJECT
+class ClientUserInputHandler : public BasicHandler
+{
+    Q_OBJECT
 
 public:
-  ClientUserInputHandler(QObject *parent = 0);
+    ClientUserInputHandler(QObject *parent = 0);
 
 public slots:
-  void handleUserInput(const BufferInfo &bufferInfo, const QString &msg);
+    void handleUserInput(const BufferInfo &bufferInfo, const QString &msg);
 
 signals:
-  void sendInput(const BufferInfo &, const QString &);
+    void sendInput(const BufferInfo &, const QString &);
 
 private slots:
-  void clientConnected();
-  void clientDisconnected();
-  void initDone();
-  void completionSuffixChanged(const QVariant &);
+    void completionSuffixChanged(const QVariant &);
+
+    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);
 
 private:
-  bool _initialized;
-  QRegExp _nickRx;
-  ClientAliasManager _aliasManager;
-  AliasManager::CommandList _inputBuffer;
+    QRegExp _nickRx;
+
+    //! 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