From 1d0ec32f71e24760780d826fd4560bac7d2348d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81o=C5=9B?= Date: Thu, 3 Oct 2024 10:40:27 +0200 Subject: [PATCH] Extract toQtModifiers to place where it belongs `QEvdevKeyboardHandler` contains static method `toQtModifiers` which is not operating on any of its internal fields or types. This indicates that this method doesn't belong to this class, and in fact it should be moved to `QEvdevKeyboardMap` where types used in it are declared. Move this static method to `QEvdevKeyboardMap` namespace. This is a preparatory change to extract `QEvdevKeyboardMap` to separate header. Task-number: QTBUG-115777 Change-Id: Ibe88b40a56fb96772d903498611777b3ec19dded Reviewed-by: Laszlo Agocs --- .../evdevkeyboard/qevdevkeyboardhandler.cpp | 4 +-- .../evdevkeyboard/qevdevkeyboardhandler_p.h | 29 ++++++++++--------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp index f54ca6a77d4..2b06e985a7b 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp @@ -202,7 +202,7 @@ void QEvdevKeyboardHandler::processKeyEvent(int nativecode, int unicode, int qtc Qt::KeyboardModifiers modifiers, bool isPress, bool autoRepeat) { if (!autoRepeat) - QGuiApplicationPrivate::inputDeviceManager()->setKeyboardModifiers(QEvdevKeyboardHandler::toQtModifiers(m_modifiers)); + QGuiApplicationPrivate::inputDeviceManager()->setKeyboardModifiers(QEvdevKeyboardMap::toQtModifiers(m_modifiers)); QWindow *window = nullptr; #ifdef Q_OS_WEBOS @@ -336,7 +336,7 @@ QEvdevKeyboardHandler::KeycodeAction QEvdevKeyboardHandler::processKeycode(quint // so just report the plain mapping with additional modifiers. if ((it == map_plain && it != map_withmod) || (map_withmod && !(map_withmod->qtcode & modmask))) { - qtcode |= QEvdevKeyboardHandler::toQtModifiers(modifiers); + qtcode |= QEvdevKeyboardMap::toQtModifiers(modifiers); } if (m_composing == 2 && first_press && !(it->flags & QEvdevKeyboardMap::IsModifier)) { diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h index b071e3983c2..feb4fd0cf35 100644 --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h @@ -78,6 +78,21 @@ namespace QEvdevKeyboardMap { ModCtrlR = 0x80 // ModCapsShift = 0x100, // not supported! }; + + inline Qt::KeyboardModifiers toQtModifiers(quint8 mod) + { + Qt::KeyboardModifiers qtmod = Qt::NoModifier; + + if (mod & (ModShift | ModShiftL | ModShiftR)) + qtmod |= Qt::ShiftModifier; + if (mod & (ModControl | ModCtrlL | ModCtrlR)) + qtmod |= Qt::ControlModifier; + if (mod & ModAlt) + qtmod |= Qt::AltModifier; + + return qtmod; + } + } inline QDataStream &operator>>(QDataStream &ds, QEvdevKeyboardMap::Mapping &m) @@ -129,20 +144,6 @@ public: const QString &specification, const QString &defaultKeymapFile = QString()); - static Qt::KeyboardModifiers toQtModifiers(quint8 mod) - { - Qt::KeyboardModifiers qtmod = Qt::NoModifier; - - if (mod & (QEvdevKeyboardMap::ModShift | QEvdevKeyboardMap::ModShiftL | QEvdevKeyboardMap::ModShiftR)) - qtmod |= Qt::ShiftModifier; - if (mod & (QEvdevKeyboardMap::ModControl | QEvdevKeyboardMap::ModCtrlL | QEvdevKeyboardMap::ModCtrlR)) - qtmod |= Qt::ControlModifier; - if (mod & QEvdevKeyboardMap::ModAlt) - qtmod |= Qt::AltModifier; - - return qtmod; - } - bool loadKeymap(const QString &file); void unloadKeymap();