alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused check against local shortcuts

Browse Source
This commit is contained in:
David Edmundson 2014-03-05 23:22:36 +01:00
parent fdd627c629
commit 58e45d97b1
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/declarativeimports/kquickcontrols/private/keysequencehelper.cpp
View File

@ -62,12 +62,6 @@ public:
*/ */
bool conflictWithStandardShortcuts(const QKeySequence &seq); 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 * Conflicts the key sequence @a seq with a current global
* shortcut? * shortcut?
@ -89,11 +83,6 @@ public:
return checkAgainstShortcutTypes & KeySequenceHelper::GlobalShortcuts; return checkAgainstShortcutTypes & KeySequenceHelper::GlobalShortcuts;
} }
bool checkAgainstLocalShortcuts() const
{
return checkAgainstShortcutTypes & KeySequenceHelper::LocalShortcuts;
}
void controlModifierlessTimout() void controlModifierlessTimout()
{ {
if (nKey != 0 && !modifierKeys) { if (nKey != 0 && !modifierKeys) {
@ -159,7 +148,7 @@ KeySequenceHelperPrivate::KeySequenceHelperPrivate(KeySequenceHelper *q)
, isRecording(false) , isRecording(false)
, multiKeyShortcutsAllowed(true) , multiKeyShortcutsAllowed(true)
, componentName() , componentName()
, checkAgainstShortcutTypes(KeySequenceHelper::LocalShortcuts | KeySequenceHelper::GlobalShortcuts) , checkAgainstShortcutTypes(KeySequenceHelper::StandardShortcuts | KeySequenceHelper::GlobalShortcuts)
, stealActions() , stealActions()
{ {

5
src/declarativeimports/kquickcontrols/private/keysequencehelper.h
View File

@ -64,9 +64,8 @@ public:
enum ShortcutType { enum ShortcutType {
None = 0x00, //!< No checking for conflicts None = 0x00, //!< No checking for conflicts
LocalShortcuts = 0x01, //!< Check with local shortcuts. @see setCheckActionCollections() StandardShortcuts = 0x01, //!< Check against standard shortcuts. @see KStandardShortcut
StandardShortcuts = 0x02, //!< Check against standard shortcuts. @see KStandardShortcut GlobalShortcuts = 0x02 //!< Check against global shortcuts. @see KGlobalAccel
GlobalShortcuts = 0x04 //!< Check against global shortcuts. @see KGlobalAccel
}; };
Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType) Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)