Improve evdevtablet plugin with support for multiple tablet devices

Migrated the evdevtablet code to use the same Manager/Handler model
used by the other evdev plugins. The input event parsing code remains
the same, it has just been merged into the new handler class, and
hardcoded device ids have been replaced by proper per-device ids
to support multiple tablet devices as detected by udev.

Also added tablet count reporting to QInputDeviceManager.

Change-Id: Ibd72db568646da4f32e7680dd51698a0a86dca99
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp
index 62524e8f33..3a9fd4f1dd 100644
--- a/src/plugins/generic/evdevtablet/main.cpp
+++ b/src/plugins/generic/evdevtablet/main.cpp
@@ -32,7 +32,7 @@
 ****************************************************************************/
 
 #include <QtGui/qgenericplugin.h>
-#include <QtPlatformSupport/private/qevdevtablet_p.h>
+#include <QtPlatformSupport/private/qevdevtabletmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -44,7 +44,6 @@ class QEvdevTabletPlugin : public QGenericPlugin
 public:
     QEvdevTabletPlugin();
 
-    QStringList keys() const;
     QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE;
 };
 
@@ -52,16 +51,11 @@ QEvdevTabletPlugin::QEvdevTabletPlugin()
 {
 }
 
-QStringList QEvdevTabletPlugin::keys() const
-{
-    return QStringList() << "EvdevTablet";
-}
-
-QObject *QEvdevTabletPlugin::create(const QString &key,
+QObject* QEvdevTabletPlugin::create(const QString &key,
                                     const QString &spec)
 {
     if (!key.compare(QLatin1String("EvdevTablet"), Qt::CaseInsensitive))
-        return new QEvdevTabletHandlerThread(spec);
+        return new QEvdevTabletManager(key, spec);
 
     return 0;
 }