evdev*,libinput: use functor-based connections

This results in less boilerplate code, among other benefits that
come with functor-based connections. Simple expressions have been
converted to use lambda.

Change-Id: I6887980524027eada24beed95e6f9ba43f0fc8d5
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

3 files changed, 5 insertions, 7 deletions

diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
index 20dfda89f7..8d848d6ebb 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h
@@ -63,15 +63,12 @@ class QEvdevTabletData;
 
 class QEvdevTabletHandler : public QObject
 {
-    Q_OBJECT
-
 public:
     explicit QEvdevTabletHandler(const QString &device, const QString &spec = QString(), QObject *parent = 0);
     ~QEvdevTabletHandler();
 
     qint64 deviceId() const;
 
-private slots:
     void readData();
 
 private:
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
index 4b00424e92..90949408ac 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -88,8 +88,11 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
             const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addDevice(device);
-            connect(m_deviceDiscovery, SIGNAL(deviceDetected(QString)), this, SLOT(addDevice(QString)));
-            connect(m_deviceDiscovery, SIGNAL(deviceRemoved(QString)), this, SLOT(removeDevice(QString)));
+
+            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+                    this, &QEvdevTabletManager::addDevice);
+            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+                    this, &QEvdevTabletManager::removeDevice);
         }
     }
 }
diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
index d166c06cf3..cde91c55aa 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
@@ -62,12 +62,10 @@ class QEvdevTabletHandlerThread;
 
 class QEvdevTabletManager : public QObject
 {
-    Q_OBJECT
 public:
     QEvdevTabletManager(const QString &key, const QString &spec, QObject *parent = 0);
     ~QEvdevTabletManager();
 
-private slots:
     void addDevice(const QString &deviceNode);
     void removeDevice(const QString &deviceNode);