diff options
author | Tarek Soliman | 2011-11-02 10:16:16 -0500 |
---|---|---|
committer | Tarek Soliman | 2011-11-02 10:16:16 -0500 |
commit | b708d6de79e2893cddf95d72864d4487a483e0c1 (patch) | |
tree | f2a040c28783a3da60f4d2cd1da15d7ee7ab203a /backends/keymapper/remap-dialog.cpp | |
parent | 6523454db5c115bcaf1bc24380a444dfbdab43e3 (diff) | |
download | scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.tar.gz scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.tar.bz2 scummvm-rg350-b708d6de79e2893cddf95d72864d4487a483e0c1.zip |
Revert "KEYMAPPER: Make global keymap that is always active"
This reverts commit ac85d134b31f770f27d085c0fe4c307e278c1875.
Diffstat (limited to 'backends/keymapper/remap-dialog.cpp')
-rw-r--r-- | backends/keymapper/remap-dialog.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 8edc5c5d39..b0f42fe426 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -357,26 +357,6 @@ void RemapDialog::loadKeymap() { } } - // get the mapping out of the global keymap - if (_keymapper->getGlobalKeymap()) { - List<const HardwareKey*>::iterator keyIt = freeKeys.begin(); - Keymap *globalKeymap = _keymapper->getGlobalKeymap(); - while (keyIt != freeKeys.end()) { - Action *act = globalKeymap->getMappedAction((*keyIt)->key); - - if (act) { - ActionInfo info = {act, true, act->description + " (" + globalKeymap->getName() + ")"}; - _currentActions.push_back(info); - freeKeys.erase(keyIt++); - } else { - ++keyIt; - } - if (freeKeys.empty()) - break; - } - - } - } else if (_kmPopUp->getSelected() != -1) { Keymap *km = _keymapTable[_kmPopUp->getSelectedTag()]; |