From 7b4e718b849b20b4dc98fa2e14c7f541ee36fc15 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes.zellner@nokia.com>
Date: Tue, 14 Feb 2012 13:09:46 +0100
Subject: Add UDev helper class for evdev plugins

Adopt evdevkeyboard plugin to use new UDev helper

Change-Id: Ie914c77dde9a28a8cf7f7cd972acd963c13bc698
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
---
 .../generic/evdevkeyboard/qevdevkeyboardmanager.h   | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h')

diff --git a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h
index 3caed6ff43..c776af2ec5 100644
--- a/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h
+++ b/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h
@@ -44,12 +44,12 @@
 
 #include "qevdevkeyboardhandler.h"
 
+#include <QtPlatformSupport/private/qudevicehelper_p.h>
+
 #include <QObject>
 #include <QHash>
 #include <QSocketNotifier>
 
-#include <libudev.h>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -62,24 +62,13 @@ public:
     ~QEvdevKeyboardManager();
 
 private slots:
-    void deviceDetected();
+    void addKeyboard(const QString &deviceNode = QString());
+    void removeKeyboard(const QString &deviceNode);
 
 private:
-    void startWatching();
-    void stopWatching();
-    void parseConnectedDevices();
-    void checkDevice(struct udev_device *dev);
-
-    void addKeyboard(const QString &devnode = QString());
-    void removeKeyboard(const QString &devnode);
-
     QString m_spec;
     QHash<QString,QEvdevKeyboardHandler*> m_keyboards;
-
-    struct udev *m_udev;
-    struct udev_monitor *m_udevMonitor;
-    int m_udevMonitorFileDescriptor;
-    QSocketNotifier *m_udevSocketNotifier;
+    QUDeviceHelper *m_udeviceHelper;
 };
 
 QT_END_HEADER
-- 
cgit v1.2.3