summaryrefslogtreecommitdiffstats
path: root/src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:18:59 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:23:14 +1000
commit98dd1781d9256f68025d2a2db408f4f5947f3214 (patch)
treedbe1424abd90014edb5546c920ca585ed62b46e3 /src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h
parent6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff)
parentfa1b9070af66edb81b2a3735c1951f78b22bd666 (diff)
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac. Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h')
-rw-r--r--src/plugins/generic/evdevkeyboard/qevdevkeyboardmanager.h21
1 files changed, 5 insertions, 16 deletions
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