diff --git a/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp b/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp index fce9afa1f..365878dda 100644 --- a/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp +++ b/src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp @@ -62,12 +62,6 @@ public: */ bool conflictWithStandardShortcuts(const QKeySequence &seq); - /** - * Conflicts the key sequence @a seq with a current local - * shortcut? - */ - bool conflictWithLocalShortcuts(const QKeySequence &seq); - /** * Conflicts the key sequence @a seq with a current global * shortcut? @@ -89,11 +83,6 @@ public: return checkAgainstShortcutTypes & KeySequenceHelper::GlobalShortcuts; } - bool checkAgainstLocalShortcuts() const - { - return checkAgainstShortcutTypes & KeySequenceHelper::LocalShortcuts; - } - void controlModifierlessTimout() { if (nKey != 0 && !modifierKeys) { @@ -159,7 +148,7 @@ KeySequenceHelperPrivate::KeySequenceHelperPrivate(KeySequenceHelper *q) , isRecording(false) , multiKeyShortcutsAllowed(true) , componentName() -, checkAgainstShortcutTypes(KeySequenceHelper::LocalShortcuts | KeySequenceHelper::GlobalShortcuts) +, checkAgainstShortcutTypes(KeySequenceHelper::StandardShortcuts | KeySequenceHelper::GlobalShortcuts) , stealActions() { diff --git a/src/declarativeimports/kquickcontrols/private/keysequencehelper.h b/src/declarativeimports/kquickcontrols/private/keysequencehelper.h index 65c20d68e..323ecaef9 100644 --- a/src/declarativeimports/kquickcontrols/private/keysequencehelper.h +++ b/src/declarativeimports/kquickcontrols/private/keysequencehelper.h @@ -64,9 +64,8 @@ public: enum ShortcutType { None = 0x00, //!< No checking for conflicts - LocalShortcuts = 0x01, //!< Check with local shortcuts. @see setCheckActionCollections() - StandardShortcuts = 0x02, //!< Check against standard shortcuts. @see KStandardShortcut - GlobalShortcuts = 0x04 //!< Check against global shortcuts. @see KGlobalAccel + StandardShortcuts = 0x01, //!< Check against standard shortcuts. @see KStandardShortcut + GlobalShortcuts = 0x02 //!< Check against global shortcuts. @see KGlobalAccel }; Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)