Merge input handling work to master

1 files changed, 11 insertions, 2 deletions

diff --git a/src/input/pvsPrivInputHandler.h b/src/input/pvsPrivInputHandler.h
index 9980cdf..015dfa1 100644
--- a/src/input/pvsPrivInputHandler.h
+++ b/src/input/pvsPrivInputHandler.h
@@ -20,14 +20,23 @@
 #include <QObject>
 #include <QHash>
 #include <QPointer>
-#include "inputHandlerChain.h"
+#include "inputEventHandler.h"
 
 class QSocketNotifier;
 
+/**
+ * Handle socket communication with instances of the PVS Client Daemon.
+ *
+ * \note This runs in the context of a Qt main loop. It does not start
+ *   a handler thread.
+ */
 class PVSPrivInputHandler : public QObject
 {
 	Q_OBJECT
 public:
+	/**
+	 * Listen for InputEvents on file descriptor \c fd.
+	 */
 	PVSPrivInputHandler(int fd, QObject* parent = 0);
 	virtual ~PVSPrivInputHandler();
 
@@ -39,7 +48,7 @@ private:
 	QByteArray _messageAssembly;
 	int _bytes;
 	int _fd;
-	privileged_handler_chain _handlerChain;
+	InputEventHandlerChain _handlerChain;
 };
 
 #endif /* PVSPRIVINPUTHANDLER_H_ */