From 0f445ac2661b5454d491936bb780196b13d1f4ea Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 25 Jul 2015 07:03:25 +0200 Subject: shortcuts: remove duplication --- opentrack/shortcuts.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp index 1dd77e4c..63cd9088 100644 --- a/opentrack/shortcuts.cpp +++ b/opentrack/shortcuts.cpp @@ -128,8 +128,8 @@ void Shortcuts::bind_keyboard_shortcut(K &key, key_opts& k) if (!key) key = std::make_shared(); else { - key->setEnabled(false); key->setShortcut(QKeySequence::UnknownKey); + key->setEnabled(false); } if (k.keycode != "") @@ -159,23 +159,6 @@ void Shortcuts::bind_keyboard_shortcut(K &key, key_opts& k) #endif void Shortcuts::reload() { -#ifndef _WIN32 - if (keyCenter) - { - keyCenter->setShortcut(QKeySequence::UnknownKey); - keyCenter->setEnabled(false); - } - if (keyToggle) - { - keyToggle->setShortcut(QKeySequence::UnknownKey); - keyToggle->setEnabled(false); - } - if (keyZero) - { - keyZero->setShortcut(QKeySequence::UnknownKey); - keyZero->setEnabled(false); - } -#endif bind_keyboard_shortcut(keyCenter, s.center); bind_keyboard_shortcut(keyToggle, s.toggle); bind_keyboard_shortcut(keyZero, s.zero); -- cgit v1.2.3