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>
 
 
 
 
 
 
 
 
 
 
 

1 files changed, 10 insertions, 16 deletions

diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
index d11eabeebb..5fc080b765 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
@@ -98,17 +98,14 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &
 
 QEvdevKeyboardManager::~QEvdevKeyboardManager()
 {
-    qDeleteAll(m_keyboards);
-    m_keyboards.clear();
 }
 
 void QEvdevKeyboardManager::addKeyboard(const QString &deviceNode)
 {
     qCDebug(qLcEvdevKey, "Adding keyboard at %ls", qUtf16Printable(deviceNode));
-    QEvdevKeyboardHandler *keyboard;
-    keyboard = QEvdevKeyboardHandler::create(deviceNode, m_spec, m_defaultKeymapFile);
+    auto keyboard = QEvdevKeyboardHandler::create(deviceNode, m_spec, m_defaultKeymapFile);
     if (keyboard) {
-        m_keyboards.insert(deviceNode, keyboard);
+        m_keyboards.add(deviceNode, std::move(keyboard));
         updateDeviceCount();
     } else {
         qWarning("Failed to open keyboard device %ls", qUtf16Printable(deviceNode));
@@ -117,12 +114,9 @@ void QEvdevKeyboardManager::addKeyboard(const QString &deviceNode)
 
 void QEvdevKeyboardManager::removeKeyboard(const QString &deviceNode)
 {
-    if (m_keyboards.contains(deviceNode)) {
+    if (m_keyboards.remove(deviceNode)) {
         qCDebug(qLcEvdevKey, "Removing keyboard at %ls", qUtf16Printable(deviceNode));
-        QEvdevKeyboardHandler *keyboard = m_keyboards.value(deviceNode);
-        m_keyboards.remove(deviceNode);
         updateDeviceCount();
-        delete keyboard;
     }
 }
 
@@ -145,22 +139,22 @@ void QEvdevKeyboardManager::loadKeymap(const QString &file)
             if (arg.startsWith(QLatin1String("keymap=")))
                 keymapFromSpec = arg.mid(7).toString();
         }
-        foreach (QEvdevKeyboardHandler *handler, m_keyboards) {
+        for (const auto &keyboard : m_keyboards) {
             if (keymapFromSpec.isEmpty())
-                handler->unloadKeymap();
+                keyboard.handler->unloadKeymap();
             else
-                handler->loadKeymap(keymapFromSpec);
+                keyboard.handler->loadKeymap(keymapFromSpec);
         }
     } else {
-        foreach (QEvdevKeyboardHandler *handler, m_keyboards)
-            handler->loadKeymap(file);
+        for (const auto &keyboard : m_keyboards)
+            keyboard.handler->loadKeymap(file);
     }
 }
 
 void QEvdevKeyboardManager::switchLang()
 {
-    foreach (QEvdevKeyboardHandler *handler, m_keyboards)
-        handler->switchLang();
+    for (const auto &keyboard : m_keyboards)
+        keyboard.handler->switchLang();
 }
 
 QT_END_NAMESPACE