QEvdev: Replace manual memory management with unique_ptr

Make create() return, and m_mice/m_keyboards/etc store, handlers by unique_ptr.
In most cases, we can't use qt_make_unique(), since the ctor we're calling is
marked as private.

Since QHash can't hold move-only types, use a std::vector<{QString, unique_ptr}>
instead. As this pattern repeats in all four QEvdev*Manager classes, create a
small class template.

Saves almost 6KiB on optimized Linux AMD64 GCC 9.1 builds across all .so's that
link to QtInputSupport.a.

Change-Id: I8f62b6b629d6e1855314c0a4fb4fc069db9ae0ce
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 
 
 
 
 
 
 
 
 
 
 

4 files changed, 14 insertions, 15 deletions

diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
index 86a4cd0076..6a53ad2088 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(qLcEvdevMouse, "qt.qpa.input")
 
-QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QString &specification)
+std::unique_ptr<QEvdevMouseHandler> QEvdevMouseHandler::create(const QString &device, const QString &specification)
 {
     qCDebug(qLcEvdevMouse) << "create mouse handler for" << device << specification;
 
@@ -91,10 +91,10 @@ QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QStr
     fd = qt_safe_open(device.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0);
     if (fd >= 0) {
         ::ioctl(fd, EVIOCGRAB, grab);
-        return new QEvdevMouseHandler(device, fd, abs, compression, jitterLimit);
+        return std::unique_ptr<QEvdevMouseHandler>(new QEvdevMouseHandler(device, fd, abs, compression, jitterLimit));
     } else {
         qErrnoWarning(errno, "Cannot open mouse input device %s", qPrintable(device));
-        return 0;
+        return nullptr;
     }
 }
 
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
index c7f2b04eb2..727f1a02f9 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
@@ -56,6 +56,8 @@
 #include <QPoint>
 #include <QEvent>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
@@ -64,7 +66,7 @@ class QEvdevMouseHandler : public QObject
 {
     Q_OBJECT
 public:
-    static QEvdevMouseHandler *create(const QString &device, const QString &specification);
+    static std::unique_ptr<QEvdevMouseHandler> create(const QString &device, const QString &specification);
     ~QEvdevMouseHandler();
 
     void readMouseData();
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
index 7abca215da..0873981436 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@@ -111,8 +111,6 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
 
 QEvdevMouseManager::~QEvdevMouseManager()
 {
-    qDeleteAll(m_mice);
-    m_mice.clear();
 }
 
 void QEvdevMouseManager::clampPosition()
@@ -160,13 +158,13 @@ void QEvdevMouseManager::handleWheelEvent(QPoint delta)
 void QEvdevMouseManager::addMouse(const QString &deviceNode)
 {
     qCDebug(qLcEvdevMouse, "Adding mouse at %ls", qUtf16Printable(deviceNode));
-    QEvdevMouseHandler *handler = QEvdevMouseHandler::create(deviceNode, m_spec);
+    auto handler = QEvdevMouseHandler::create(deviceNode, m_spec);
     if (handler) {
-        connect(handler, &QEvdevMouseHandler::handleMouseEvent,
+        connect(handler.get(), &QEvdevMouseHandler::handleMouseEvent,
                 this, &QEvdevMouseManager::handleMouseEvent);
-        connect(handler, &QEvdevMouseHandler::handleWheelEvent,
+        connect(handler.get(), &QEvdevMouseHandler::handleWheelEvent,
                 this, &QEvdevMouseManager::handleWheelEvent);
-        m_mice.insert(deviceNode, handler);
+        m_mice.add(deviceNode, std::move(handler));
         updateDeviceCount();
     } else {
         qWarning("evdevmouse: Failed to open mouse device %ls", qUtf16Printable(deviceNode));
@@ -175,12 +173,9 @@ void QEvdevMouseManager::addMouse(const QString &deviceNode)
 
 void QEvdevMouseManager::removeMouse(const QString &deviceNode)
 {
-    if (m_mice.contains(deviceNode)) {
+    if (m_mice.remove(deviceNode)) {
         qCDebug(qLcEvdevMouse, "Removing mouse at %ls", qUtf16Printable(deviceNode));
-        QEvdevMouseHandler *handler = m_mice.value(deviceNode);
-        m_mice.remove(deviceNode);
         updateDeviceCount();
-        delete handler;
     }
 }
 
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
index 62b3c1beea..1d547da1e8 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
@@ -53,6 +53,8 @@
 
 #include "qevdevmousehandler_p.h"
 
+#include <QtInputSupport/private/devicehandlerlist_p.h>
+
 #include <QObject>
 #include <QHash>
 #include <QSocketNotifier>
@@ -80,7 +82,7 @@ private:
     void updateDeviceCount();
 
     QString m_spec;
-    QHash<QString,QEvdevMouseHandler*> m_mice;
+    QtInputSupport::DeviceHandlerList<QEvdevMouseHandler> m_mice;
     QDeviceDiscovery *m_deviceDiscovery;
     int m_x;
     int m_y;