KEYMAPPER: Remove automapping dead code

1 files changed, 37 insertions, 38 deletions

diff --git a/backends/platform/linuxmoto/hardwarekeys.cpp b/backends/platform/linuxmoto/hardwarekeys.cpp
index cbd9dccf52..da093c6508 100644
--- a/backends/platform/linuxmoto/hardwarekeys.cpp
+++ b/backends/platform/linuxmoto/hardwarekeys.cpp
@@ -33,60 +33,59 @@ struct Key {
 	KeyCode keycode;
 	uint16 ascii;
 	const char *desc;
-	KeyType preferredAction;
 	bool shiftable;
 };
 
 static const Key keys[] = {
-	{ "FIRE", KEYCODE_RETURN, ASCII_RETURN, "Fire", kActionKeyType, false },
-	{ "CAMERA", KEYCODE_PAUSE, 0, "Camera", kActionKeyType, false },
-	{ "HANGUP", KEYCODE_ESCAPE, ASCII_ESCAPE, "Hangup", kStartKeyType, false },
-	{ "CALL", KEYCODE_SPACE, ASCII_SPACE, "Call", kActionKeyType, false },
-	{ "PLUS", KEYCODE_PLUS, '+', "+", kActionKeyType, false },
-	{ "MINUS", KEYCODE_MINUS, '-', "-", kActionKeyType, false },
+	{ "FIRE", KEYCODE_RETURN, ASCII_RETURN, "Fire", false },
+	{ "CAMERA", KEYCODE_PAUSE, 0, "Camera", false },
+	{ "HANGUP", KEYCODE_ESCAPE, ASCII_ESCAPE, "Hangup", false },
+	{ "CALL", KEYCODE_SPACE, ASCII_SPACE, "Call", false },
+	{ "PLUS", KEYCODE_PLUS, '+', "+", false },
+	{ "MINUS", KEYCODE_MINUS, '-', "-", false },
 #ifdef MOTOMAGX
-	{"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", kActionKeyType, false},
-	{"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", kActionKeyType, false},
-	{"HASH", KEYCODE_HASH, '#', "#", kActionKeyType, false},
-	{"ASTERISK", KEYCODE_ASTERISK, '*', "*", kActionKeyType, false},
-	{"LEFTSOFT", KEYCODE_F9, ASCII_F9, "LeftSoft", kActionKeyType, false},
-	{"RIGHTSOFT", KEYCODE_F11, ASCII_F11, "RightSoft", kActionKeyType, false},
-	{"0", KEYCODE_0, '0', "0", kActionKeyType, false},
-	{"1", KEYCODE_1, '1', "1", kActionKeyType, false},
-	{"2", KEYCODE_2, '2', "2", kActionKeyType, false},
-	{"3", KEYCODE_3, '3', "3", kActionKeyType, false},
-	{"4", KEYCODE_4, '4', "4", kActionKeyType, false},
-	{"5", KEYCODE_5, '5', "5", kActionKeyType, false},
-	{"6", KEYCODE_6, '6', "6", kActionKeyType, false},
-	{"7", KEYCODE_7, '7', "7", kActionKeyType, false},
-	{"8", KEYCODE_8, '8', "8", kActionKeyType, false},
-	{"9", KEYCODE_9, '9', "9", kActionKeyType, false},
+	{"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", false},
+	{"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", false},
+	{"HASH", KEYCODE_HASH, '#', "#", false},
+	{"ASTERISK", KEYCODE_ASTERISK, '*', "*", false},
+	{"LEFTSOFT", KEYCODE_F9, ASCII_F9, "LeftSoft", false},
+	{"RIGHTSOFT", KEYCODE_F11, ASCII_F11, "RightSoft", false},
+	{"0", KEYCODE_0, '0', "0", false},
+	{"1", KEYCODE_1, '1', "1", false},
+	{"2", KEYCODE_2, '2', "2", false},
+	{"3", KEYCODE_3, '3', "3", false},
+	{"4", KEYCODE_4, '4', "4", false},
+	{"5", KEYCODE_5, '5', "5", false},
+	{"6", KEYCODE_6, '6', "6", false},
+	{"7", KEYCODE_7, '7', "7", false},
+	{"8", KEYCODE_8, '8', "8", false},
+	{"9", KEYCODE_9, '9', "9", false},
 #endif
 #ifdef MOTOEZX
-	{ "a", KEYCODE_a, 'a', "a", kActionKeyType, true },
-	{ "b", KEYCODE_b, 'b', "b", kActionKeyType, true },
-	{ "c", KEYCODE_c, 'c', "c", kActionKeyType, true },
-	{ "d", KEYCODE_d, 'd', "d", kActionKeyType, true },
-	{ "e", KEYCODE_e, 'e', "e", kActionKeyType, true },
-	{ "f", KEYCODE_f, 'f', "f", kActionKeyType, true },
-	{ "g", KEYCODE_g, 'g', "g", kActionKeyType, true },
-	{ "h", KEYCODE_h, 'h', "h", kActionKeyType, true },
-	{ "i", KEYCODE_i, 'i', "i", kActionKeyType, true },
-	{ "j", KEYCODE_j, 'j', "j", kActionKeyType, true },
+	{ "a", KEYCODE_a, 'a', "a", true },
+	{ "b", KEYCODE_b, 'b', "b", true },
+	{ "c", KEYCODE_c, 'c', "c", true },
+	{ "d", KEYCODE_d, 'd', "d", true },
+	{ "e", KEYCODE_e, 'e', "e", true },
+	{ "f", KEYCODE_f, 'f', "f", true },
+	{ "g", KEYCODE_g, 'g', "g", true },
+	{ "h", KEYCODE_h, 'h', "h", true },
+	{ "i", KEYCODE_i, 'i', "i", true },
+	{ "j", KEYCODE_j, 'j', "j", true },
 #endif
 	// Numeric keypad
 
 	// Arrows + Home/End pad
-	{"UP", KEYCODE_UP, 0, "Up", kDirUpKeyType, false},
-	{"DOWN", KEYCODE_DOWN, 0, "Down", kDirDownKeyType, false},
-	{"RIGHT", KEYCODE_RIGHT, 0, "Right", kDirRightKeyType, false},
-	{"LEFT", KEYCODE_LEFT, 0, "Left", kDirLeftKeyType, false},
+	{"UP", KEYCODE_UP, 0, "Up", false},
+	{"DOWN", KEYCODE_DOWN, 0, "Down", false},
+	{"RIGHT", KEYCODE_RIGHT, 0, "Right", false},
+	{"LEFT", KEYCODE_LEFT, 0, "Left", false},
 
 	// Function keys
 
 	// Miscellaneous function keys
 
-	{0, KEYCODE_INVALID, 0, 0, kGenericKeyType, false}
+	{0, KEYCODE_INVALID, 0, 0, false}
 };
 
 struct Mod {