diff options
Diffstat (limited to 'src/platformsupport/input')
3 files changed, 8 insertions, 7 deletions
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index 150445f520..36de1e0c69 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -101,10 +101,10 @@ QEvdevKeyboardHandler *QEvdevKeyboardHandler::create(const QString &device, bool enableCompose = false; int grab = 0; - QStringList args = specification.split(QLatin1Char(':')); - foreach (const QString &arg, args) { + const auto args = specification.splitRef(QLatin1Char(':')); + for (const QStringRef &arg : args) { if (arg.startsWith(QLatin1String("keymap="))) - keymapFile = arg.mid(7); + keymapFile = arg.mid(7).toString(); else if (arg == QLatin1String("disable-zap")) disableZap = true; else if (arg == QLatin1String("enable-compose")) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp index 178578e5a2..ffe9f82325 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp @@ -135,9 +135,10 @@ void QEvdevKeyboardManager::loadKeymap(const QString &file) // Restore the default, which is either the built-in keymap or // the one given in the plugin spec. QString keymapFromSpec; - foreach (const QString &arg, m_spec.split(QLatin1Char(':'))) { + const auto specs = m_spec.splitRef(QLatin1Char(':')); + for (const QStringRef &arg : specs) { if (arg.startsWith(QLatin1String("keymap="))) - keymapFromSpec = arg.mid(7); + keymapFromSpec = arg.mid(7).toString(); } foreach (QEvdevKeyboardHandler *handler, m_keyboards) { if (keymapFromSpec.isEmpty()) diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp index 7f73a7ef94..382b9b1514 100644 --- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp +++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp @@ -71,8 +71,8 @@ QEvdevMouseHandler *QEvdevMouseHandler::create(const QString &device, const QStr int grab = 0; bool abs = false; - QStringList args = specification.split(QLatin1Char(':')); - foreach (const QString &arg, args) { + const auto args = specification.splitRef(QLatin1Char(':')); + for (const QStringRef &arg : args) { if (arg == QLatin1String("nocompress")) compression = false; else if (arg.startsWith(QLatin1String("dejitter="))) |