From b708d6de79e2893cddf95d72864d4487a483e0c1 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Wed, 2 Nov 2011 10:16:16 -0500
Subject: Revert "KEYMAPPER: Make global keymap that is always active"

This reverts commit ac85d134b31f770f27d085c0fe4c307e278c1875.
---
 backends/keymapper/remap-dialog.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'backends/keymapper/remap-dialog.cpp')

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()];
 
-- 
cgit v1.2.3