From 78695bbf190bd93915d44386a7b96866dbbd29b5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 4 Sep 2020 09:50:10 +0200 Subject: Fix compiler warnings after QKeyCombination introduction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If5d7c5e037b99c14c51d83adf8b1e20d6b924bc5 Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/cocoa/qcocoamenuitem.mm | 5 ++--- src/plugins/platforms/cocoa/qcocoatheme.mm | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 39a124ea44..511c72988a 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -353,9 +353,8 @@ NSMenuItem *QCocoaMenuItem::sync() #ifndef QT_NO_SHORTCUT if (accel.count() == 1) { - auto shortcut = accel[0]; - auto key = Qt::Key(shortcut & ~Qt::KeyboardModifierMask); - auto modifiers = Qt::KeyboardModifiers(shortcut & Qt::KeyboardModifierMask); + auto key = accel[0].key(); + auto modifiers = accel[0].keyboardModifiers(); QChar cocoaKey = QCocoaKeyMapper::toCocoaKey(key); if (cocoaKey.isNull()) diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 2e305ffb3d..af4c1550e7 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -575,14 +575,14 @@ QList QCocoaTheme::keyBindings(QKeySequence::StandardKey key) cons auto bindings = QPlatformTheme::keyBindings(key); if (qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { - static auto swapCtrlMeta = [](int keySequence) { - auto originalKeySequence = keySequence; - keySequence &= ~(Qt::ControlModifier | Qt::MetaModifier); - if (originalKeySequence & Qt::ControlModifier) - keySequence |= Qt::MetaModifier; - if (originalKeySequence & Qt::MetaModifier) - keySequence |= Qt::ControlModifier; - return keySequence; + static auto swapCtrlMeta = [](QKeyCombination keyCombination) { + const auto originalKeyModifiers = keyCombination.keyboardModifiers(); + auto newKeyboardModifiers = originalKeyModifiers & ~(Qt::ControlModifier | Qt::MetaModifier); + if (originalKeyModifiers & Qt::ControlModifier) + newKeyboardModifiers |= Qt::MetaModifier; + if (originalKeyModifiers & Qt::MetaModifier) + newKeyboardModifiers |= Qt::ControlModifier; + return QKeyCombination(newKeyboardModifiers, keyCombination.key()); }; QList swappedBindings; -- cgit v1.2.3