diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-11 13:50:30 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-28 17:23:20 +0200 |
| commit | 09025084110702a17b1edd7e2e80cd9e063e64fd (patch) | |
| tree | 980bed89411f5dd79bf5db5d6dea4803261ea8d1 /src/plugins/platformthemes | |
| parent | 673da7d4607cd5597b3c58f8c118459efdcaaeb3 (diff) | |
Fix compiler warnings from QKeyCombination
Change lots of code to avoid the deprecated operator+() or implicit
casts to int.
Change-Id: I0c343cd5b28603afdf1214eefb85e928313345e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platformthemes')
| -rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3menu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3menu.cpp b/src/plugins/platformthemes/gtk3/qgtk3menu.cpp index d9d117faeb..3e00d9610f 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3menu.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3menu.cpp @@ -56,7 +56,7 @@ static guint qt_gdkKey(const QKeySequence &shortcut) // TODO: proper mapping Qt::KeyboardModifiers mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier; - return (shortcut[0] ^ mods) & shortcut[0]; + return (shortcut[0].toCombined() ^ mods) & shortcut[0].toCombined(); } static GdkModifierType qt_gdkModifiers(const QKeySequence &shortcut) @@ -65,7 +65,7 @@ static GdkModifierType qt_gdkModifiers(const QKeySequence &shortcut) return GdkModifierType(0); guint mods = 0; - int m = shortcut[0]; + Qt::KeyboardModifiers m = shortcut[0].keyboardModifiers(); if (m & Qt::ShiftModifier) mods |= GDK_SHIFT_MASK; if (m & Qt::ControlModifier) |