remove obsolete qudevhelper and adopt mouse and touch plugins

The QUDevHelper class is now replaced by QUDeviceHelper class.
All evdev input plugins are using the new udev helper now to enable
hotplugin for keyboard and mouse input.

EvdevTouch plugin still only uses the first detected device by udev,
this cannot be tested on my side, due to the lack of multiple touch input devices.

Change-Id: I01a4cfe1a80000bfb27c67a2f53faf560906b73c
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

3 files changed, 2 insertions, 135 deletions

diff --git a/src/platformsupport/udev/qudevhelper.cpp b/src/platformsupport/udev/qudevhelper.cpp
deleted file mode 100644
index b63ef64ed8..0000000000
--- a/src/platformsupport/udev/qudevhelper.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qudevhelper_p.h"
-#include <libudev.h>
-
-QT_BEGIN_NAMESPACE
-
-void q_udev_devicePath(int type, QString *path)
-{
-    *path = QString();
-    udev *u = udev_new();
-    udev_enumerate *ue = udev_enumerate_new(u);
-    udev_enumerate_add_match_subsystem(ue, "input");
-    if (type & UDev_Mouse)
-        udev_enumerate_add_match_property(ue, "ID_INPUT_MOUSE", "1");
-    if (type & UDev_Touchpad)
-        udev_enumerate_add_match_property(ue, "ID_INPUT_TOUCHPAD", "1");
-    if (type & UDev_Touchscreen)
-        udev_enumerate_add_match_property(ue, "ID_INPUT_TOUCHSCREEN", "1");
-    udev_enumerate_scan_devices(ue);
-    udev_list_entry *entry;
-    udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(ue)) {
-        const char *syspath = udev_list_entry_get_name(entry);
-        udev_device *udevice = udev_device_new_from_syspath(u, syspath);
-        QString candidate = QString::fromLocal8Bit(udev_device_get_devnode(udevice));
-        udev_device_unref(udevice);
-        if (path->isEmpty() && candidate.startsWith(QLatin1String("/dev/input/event")))
-            *path = candidate;
-    }
-    udev_enumerate_unref(ue);
-    udev_unref(u);
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/udev/qudevhelper_p.h b/src/platformsupport/udev/qudevhelper_p.h
deleted file mode 100644
index 3895da87b6..0000000000
--- a/src/platformsupport/udev/qudevhelper_p.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QUDEVHELPER_P_H
-#define QUDEVHELPER_P_H
-
-#include <QString>
-#include <QObject>
-
-QT_BEGIN_NAMESPACE
-
-enum QUDeviceType {
-    UDev_Mouse = 0x01,
-    UDev_Touchpad = 0x02,
-    UDev_Touchscreen = 0x04
-};
-
-void q_udev_devicePath(int type, QString *path);
-
-QT_END_NAMESPACE
-
-#endif // QUDEVHELPER_P_H
diff --git a/src/platformsupport/udev/udev.pri b/src/platformsupport/udev/udev.pri
index c99d4b6810..e22be2c363 100644
--- a/src/platformsupport/udev/udev.pri
+++ b/src/platformsupport/udev/udev.pri
@@ -1,6 +1,6 @@
 contains(QT_CONFIG, libudev) {
-    HEADERS += $$PWD/qudevhelper_p.h $$PWD/qudevicehelper_p.h
-    SOURCES += $$PWD/qudevhelper.cpp $$PWD/qudevicehelper.cpp
+    HEADERS += $$PWD/qudevicehelper_p.h
+    SOURCES += $$PWD/qudevicehelper.cpp
 
     INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
 }