Merge branch 'master' of openslx.org:pvs

Conflicts:
	src/gui/mainWindow.cpp

1 files changed, 3 insertions, 2 deletions

diff --git a/src/pvs.h b/src/pvs.h
index 92e965e..e3ff329 100755
--- a/src/pvs.h
+++ b/src/pvs.h
@@ -29,7 +29,7 @@
 #include <QFile>
 #include <QTextStream>
 #include <QDir>
-#include "src/input/inputHandlerChain.h"
+#include "src/input/inputEventHandler.h"
 
 class PVSServiceDiscovery;
 class PVSDiscoveredServer;
@@ -174,7 +174,8 @@ private:
     QString processName;
 
     // input event handling:
-    unprivileged_handler_chain _inputEventHandlers;
+    InputEventHandlerChain _inputEventHandlers;
+    bool inputEventsAllowed();
     void handleInputEvent(InputEvent const& evt);
     void initializeInputEventHandling();