From aa42d78658eacc17a36ffe0d86541deffa534f79 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Tue, 21 Feb 2012 06:57:32 -0600
Subject: KEYMAPPER: Remove automapping dead code

---
 backends/keymapper/action.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'backends/keymapper/action.cpp')

diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp
index 6ee506e7c3..515ec70e32 100644
--- a/backends/keymapper/action.cpp
+++ b/backends/keymapper/action.cpp
@@ -28,9 +28,8 @@
 
 namespace Common {
 
-Action::Action(Keymap *boss, const char *i,	String des, ActionType typ,
-			   KeyType prefKey, int pri, int flg)
-	: _boss(boss), description(des), type(typ), preferredKey(prefKey),
+Action::Action(Keymap *boss, const char *i,	String des, int pri, int flg)
+	: _boss(boss), description(des),
 	priority(pri), flags(flg), _hwKey(0) {
 	assert(i);
 	assert(_boss);
-- 
cgit v1.2.3


From e1e9bd5c0e6d8b2593c0d25970eb7d121146d961 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Tue, 21 Feb 2012 13:34:30 -0600
Subject: KEYMAPPER: Clean up more dead code

More automapper related dead code
---
 backends/keymapper/action.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'backends/keymapper/action.cpp')

diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp
index 515ec70e32..e5b2d9415a 100644
--- a/backends/keymapper/action.cpp
+++ b/backends/keymapper/action.cpp
@@ -28,9 +28,8 @@
 
 namespace Common {
 
-Action::Action(Keymap *boss, const char *i,	String des, int pri, int flg)
-	: _boss(boss), description(des),
-	priority(pri), flags(flg), _hwKey(0) {
+Action::Action(Keymap *boss, const char *i,	String des)
+	: _boss(boss), description(des), _hwKey(0) {
 	assert(i);
 	assert(_boss);
 
-- 
cgit v1.2.3


From 6afac4e01eba5c297e99597dd2cb17c2e4732a7e Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 24 Feb 2012 13:23:55 -0600
Subject: KEYMAPPER: Rename HardwareKey to HardwareInput

---
 backends/keymapper/action.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'backends/keymapper/action.cpp')

diff --git a/backends/keymapper/action.cpp b/backends/keymapper/action.cpp
index e5b2d9415a..33f5c423b0 100644
--- a/backends/keymapper/action.cpp
+++ b/backends/keymapper/action.cpp
@@ -29,7 +29,7 @@
 namespace Common {
 
 Action::Action(Keymap *boss, const char *i,	String des)
-	: _boss(boss), description(des), _hwKey(0) {
+	: _boss(boss), description(des), _hwInput(0) {
 	assert(i);
 	assert(_boss);
 
@@ -38,18 +38,18 @@ Action::Action(Keymap *boss, const char *i,	String des)
 	_boss->addAction(this);
 }
 
-void Action::mapKey(const HardwareKey *key) {
-	if (_hwKey)
+void Action::mapInput(const HardwareInput *input) {
+	if (_hwInput)
 		_boss->unregisterMapping(this);
 
-	_hwKey = key;
+	_hwInput = input;
 
-	if (_hwKey)
-		_boss->registerMapping(this, _hwKey);
+	if (_hwInput)
+		_boss->registerMapping(this, _hwInput);
 }
 
-const HardwareKey *Action::getMappedKey() const {
-	return _hwKey;
+const HardwareInput *Action::getMappedInput() const {
+	return _hwInput;
 }
 
 } // End of namespace Common
-- 
cgit v1.2.3