summaryrefslogtreecommitdiffstats
path: root/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h
diff options
context:
space:
mode:
authorJohannes Zellner <johannes.zellner@nokia.com>2012-05-25 16:42:55 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-30 04:25:48 +0200
commite6a4d6054d6c4c9c2d8796255659bb6b3fcca635 (patch)
tree0d925b86b6ed07b6679c10b712043811916a3efc /src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h
parenta530ffd6def62b0d81f8bdfd02e54c62cd4d8d8f (diff)
evdev: Cleanup mouse and keyboard plugins
Remove fallback event0 device usage. All available devices should be detected automatically from DeviceDiscovery either through udev or the static fallback discovery method. This also removes the never used 'key' argument, which was pulled over from Qt4. Change-Id: Iffe8bd80f0770664024019a220cbbc6f98843340 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h')
-rw-r--r--src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h b/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h
index 5a1253857f..6b7901f42e 100644
--- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h
+++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardhandler.h
@@ -125,7 +125,7 @@ class QEvdevKeyboardHandler : public QObject
{
Q_OBJECT
public:
- QEvdevKeyboardHandler(int deviceDescriptor, bool disableZap, bool enableCompose, const QString &keymapFile);
+ QEvdevKeyboardHandler(const QString &device, int fd, bool disableZap, bool enableCompose, const QString &keymapFile);
~QEvdevKeyboardHandler();
enum KeycodeAction {
@@ -147,7 +147,7 @@ public:
SwitchConsoleMask = 0x0000007f
};
- static QEvdevKeyboardHandler *createLinuxInputKeyboardHandler(const QString &key, const QString &specification);
+ static QEvdevKeyboardHandler *create(const QString &device, const QString &specification);
static Qt::KeyboardModifiers toQtModifiers(quint8 mod)
{
@@ -173,6 +173,7 @@ private:
void processKeyEvent(int unicode, int keycode, Qt::KeyboardModifiers modifiers, bool isPress, bool autoRepeat);
void switchLed(int, bool);
+ QString m_device;
int m_fd;
// keymap handling