1 files changed, 29 insertions, 36 deletions

diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
index 06025c016e..daa52d690e 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@@ -39,6 +39,8 @@
 
 #include "qevdevmousemanager_p.h"
 
+#include <QtInputSupport/private/qevdevutil_p.h>
+
 #include <QStringList>
 #include <QGuiApplication>
 #include <QScreen>
@@ -63,40 +65,32 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
     if (spec.isEmpty())
         spec = specification;
 
-    QStringList args = spec.split(QLatin1Char(':'));
-    QStringList devices;
+    auto parsed = QEvdevUtil::parseSpecification(spec);
+    m_spec = std::move(parsed.spec);
 
-    foreach (const QString &arg, args) {
-        if (arg.startsWith(QLatin1String("/dev/"))) {
-            // if device is specified try to use it
-            devices.append(arg);
-            args.removeAll(arg);
-        } else if (arg.startsWith(QLatin1String("xoffset="))) {
+    for (const QStringRef &arg : qAsConst(parsed.args)) {
+        if (arg.startsWith(QLatin1String("xoffset="))) {
             m_xoffset = arg.mid(8).toInt();
         } else if (arg.startsWith(QLatin1String("yoffset="))) {
             m_yoffset = arg.mid(8).toInt();
         }
     }
 
-    // build new specification without /dev/ elements
-    m_spec = args.join(QLatin1Char(':'));
-
     // add all mice for devices specified in the argument list
-    foreach (const QString &device, devices)
+    for (const QString &device : qAsConst(parsed.devices))
         addMouse(device);
 
-    if (devices.isEmpty()) {
-        qCDebug(qLcEvdevMouse) << "evdevmouse: Using device discovery";
-        m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this);
-        if (m_deviceDiscovery) {
+    if (parsed.devices.isEmpty()) {
+        qCDebug(qLcEvdevMouse, "evdevmouse: Using device discovery");
+        if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this)) {
             // scan and add already connected keyboards
-            const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
+            const QStringList devices = deviceDiscovery->scanConnectedDevices();
             for (const QString &device : devices)
                 addMouse(device);
 
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
                     this, &QEvdevMouseManager::addMouse);
-            connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
+            connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
                     this, &QEvdevMouseManager::removeMouse);
         }
     }
@@ -111,8 +105,6 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
 
 QEvdevMouseManager::~QEvdevMouseManager()
 {
-    qDeleteAll(m_mice);
-    m_mice.clear();
 }
 
 void QEvdevMouseManager::clampPosition()
@@ -159,31 +151,32 @@ void QEvdevMouseManager::handleWheelEvent(QPoint delta)
 
 void QEvdevMouseManager::addMouse(const QString &deviceNode)
 {
-    qCDebug(qLcEvdevMouse) << "Adding mouse at" << deviceNode;
-    QEvdevMouseHandler *handler = QEvdevMouseHandler::create(deviceNode, m_spec);
+    qCDebug(qLcEvdevMouse, "Adding mouse at %ls", qUtf16Printable(deviceNode));
+    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);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypePointer, m_mice.count());
+        m_mice.add(deviceNode, std::move(handler));
+        updateDeviceCount();
     } else {
-        qWarning("evdevmouse: Failed to open mouse device %s", qPrintable(deviceNode));
+        qWarning("evdevmouse: Failed to open mouse device %ls", qUtf16Printable(deviceNode));
     }
 }
 
 void QEvdevMouseManager::removeMouse(const QString &deviceNode)
 {
-    if (m_mice.contains(deviceNode)) {
-        qCDebug(qLcEvdevMouse) << "Removing mouse at" << deviceNode;
-        QEvdevMouseHandler *handler = m_mice.value(deviceNode);
-        m_mice.remove(deviceNode);
-        QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
-            QInputDeviceManager::DeviceTypePointer, m_mice.count());
-        delete handler;
+    if (m_mice.remove(deviceNode)) {
+        qCDebug(qLcEvdevMouse, "Removing mouse at %ls", qUtf16Printable(deviceNode));
+        updateDeviceCount();
     }
 }
 
+void QEvdevMouseManager::updateDeviceCount()
+{
+    QInputDeviceManagerPrivate::get(QGuiApplicationPrivate::inputDeviceManager())->setDeviceCount(
+        QInputDeviceManager::DeviceTypePointer, m_mice.count());
+}
+
 QT_END_NAMESPACE