Move inputaction into separate file.

1 files changed, 325 insertions, 324 deletions

diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 891875d7c..7a3131a74 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -24,6 +24,7 @@
 #ifndef GUI_SETUPACTIONDATA_H
 #define GUI_SETUPACTIONDATA_H
 
+#include "input/inputaction.h"
 #include "input/keydata.h"
 
 #include "utils/gettext.h"
@@ -55,162 +56,162 @@ static SetupActionData setupActionData0[] =
     {
         // TRANSLATORS: input action name
         N_("Target and attack keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Attack"),
-        Input::KEY_ATTACK,
+        InputAction::ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target & Attack"),
-        Input::KEY_TARGET_ATTACK,
+        InputAction::TARGET_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to Target"),
-        Input::KEY_MOVE_TO_TARGET,
+        InputAction::MOVE_TO_TARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Move to Target type"),
-        Input::KEY_CHANGE_MOVE_TO_TARGET,
+        InputAction::CHANGE_MOVE_TO_TARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to Home location"),
-        Input::KEY_MOVE_TO_HOME,
+        InputAction::MOVE_TO_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Set home location"),
-        Input::KEY_SET_HOME,
+        InputAction::SET_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to navigation point"),
-        Input::KEY_MOVE_TO_POINT,
+        InputAction::MOVE_TO_POINT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Talk"),
-        Input::KEY_TALK,
+        InputAction::TALK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Stop Attack / Modifier key"),
-        Input::KEY_STOP_ATTACK,
+        InputAction::STOP_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Untarget"),
-        Input::KEY_UNTARGET,
+        InputAction::UNTARGET,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target monster"),
-        Input::KEY_TARGET_MONSTER,
+        InputAction::TARGET_MONSTER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target NPC"),
-        Input::KEY_TARGET_NPC,
+        InputAction::TARGET_NPC,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Target Player"),
-        Input::KEY_TARGET_PLAYER,
+        InputAction::TARGET_PLAYER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Other Keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Pickup"),
-        Input::KEY_PICKUP,
+        InputAction::PICKUP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Pickup Type"),
-        Input::KEY_CHANGE_PICKUP_TYPE,
+        InputAction::CHANGE_PICKUP_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Sit"),
-        Input::KEY_SIT,
+        InputAction::SIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Screenshot"),
-        Input::KEY_SCREENSHOT,
+        InputAction::SCREENSHOT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Enable/Disable Trading"),
-        Input::KEY_TRADE,
+        InputAction::TRADE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Open trade window"),
-        Input::KEY_OPEN_TRADE,
+        InputAction::OPEN_TRADE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Map View Mode"),
-        Input::KEY_PATHFIND,
+        InputAction::PATHFIND,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select OK"),
-        Input::KEY_OK,
+        InputAction::OK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quit"),
-        Input::KEY_QUIT,
+        InputAction::QUIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Stop or sit"),
-        Input::KEY_STOP_SIT,
+        InputAction::STOP_SIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Return to safe video mode"),
-        Input::KEY_SAFE_VIDEO,
+        InputAction::SAFE_VIDEO,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -220,144 +221,144 @@ static SetupActionData setupActionData1[] =
     {
         // TRANSLATORS: input action name
         N_("Shortcuts modifiers keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Item Shortcuts Key"),
-        Input::KEY_SHORTCUTS_KEY,
+        InputAction::SHORTCUTS_KEY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Shortcuts keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 1),
-        Input::KEY_SHORTCUT_1,
+        InputAction::SHORTCUT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 2),
-        Input::KEY_SHORTCUT_2,
+        InputAction::SHORTCUT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 3),
-        Input::KEY_SHORTCUT_3,
+        InputAction::SHORTCUT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 4),
-        Input::KEY_SHORTCUT_4,
+        InputAction::SHORTCUT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 5),
-        Input::KEY_SHORTCUT_5,
+        InputAction::SHORTCUT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 6),
-        Input::KEY_SHORTCUT_6,
+        InputAction::SHORTCUT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 7),
-        Input::KEY_SHORTCUT_7,
+        InputAction::SHORTCUT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 8),
-        Input::KEY_SHORTCUT_8,
+        InputAction::SHORTCUT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 9),
-        Input::KEY_SHORTCUT_9,
+        InputAction::SHORTCUT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 10),
-        Input::KEY_SHORTCUT_10,
+        InputAction::SHORTCUT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 11),
-        Input::KEY_SHORTCUT_11,
+        InputAction::SHORTCUT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 12),
-        Input::KEY_SHORTCUT_12,
+        InputAction::SHORTCUT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 13),
-        Input::KEY_SHORTCUT_13,
+        InputAction::SHORTCUT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 14),
-        Input::KEY_SHORTCUT_14,
+        InputAction::SHORTCUT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 15),
-        Input::KEY_SHORTCUT_15,
+        InputAction::SHORTCUT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 16),
-        Input::KEY_SHORTCUT_16,
+        InputAction::SHORTCUT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 17),
-        Input::KEY_SHORTCUT_17,
+        InputAction::SHORTCUT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 18),
-        Input::KEY_SHORTCUT_18,
+        InputAction::SHORTCUT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 19),
-        Input::KEY_SHORTCUT_19,
+        InputAction::SHORTCUT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Item Shortcut %d"), 20),
-        Input::KEY_SHORTCUT_20,
+        InputAction::SHORTCUT_20,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -367,186 +368,186 @@ static SetupActionData setupActionData2[] =
     {
         // TRANSLATORS: input action name
         N_("Show Windows Menu"),
-        Input::KEY_SHOW_WINDOWS,
+        InputAction::SHOW_WINDOWS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Hide Windows"),
-        Input::KEY_HIDE_WINDOWS,
+        InputAction::HIDE_WINDOWS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("About Window"),
-        Input::KEY_WINDOW_ABOUT,
+        InputAction::WINDOW_ABOUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Help Window"),
-        Input::KEY_WINDOW_HELP,
+        InputAction::WINDOW_HELP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Status Window"),
-        Input::KEY_WINDOW_STATUS,
+        InputAction::WINDOW_STATUS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Inventory Window"),
-        Input::KEY_WINDOW_INVENTORY,
+        InputAction::WINDOW_INVENTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Equipment Window"),
-        Input::KEY_WINDOW_EQUIPMENT,
+        InputAction::WINDOW_EQUIPMENT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Skill Window"),
-        Input::KEY_WINDOW_SKILL,
+        InputAction::WINDOW_SKILL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Minimap Window"),
-        Input::KEY_WINDOW_MINIMAP,
+        InputAction::WINDOW_MINIMAP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Chat Window"),
-        Input::KEY_WINDOW_CHAT,
+        InputAction::WINDOW_CHAT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Item Shortcut Window"),
-        Input::KEY_WINDOW_SHORTCUT,
+        InputAction::WINDOW_SHORTCUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Setup Window"),
-        Input::KEY_WINDOW_SETUP,
+        InputAction::WINDOW_SETUP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Debug Window"),
-        Input::KEY_WINDOW_DEBUG,
+        InputAction::WINDOW_DEBUG,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Social Window"),
-        Input::KEY_WINDOW_SOCIAL,
+        InputAction::WINDOW_SOCIAL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emote Shortcut Window"),
-        Input::KEY_WINDOW_EMOTE_SHORTCUT,
+        InputAction::WINDOW_EMOTE_SHORTCUT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Outfits Window"),
-        Input::KEY_WINDOW_OUTFIT,
+        InputAction::WINDOW_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Shop Window"),
-        Input::KEY_WINDOW_SHOP,
+        InputAction::WINDOW_SHOP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick drop Window"),
-        Input::KEY_WINDOW_DROP,
+        InputAction::WINDOW_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Kill Stats Window"),
-        Input::KEY_WINDOW_KILLS,
+        InputAction::WINDOW_KILLS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Commands Window"),
-        Input::KEY_WINDOW_SPELLS,
+        InputAction::WINDOW_SPELLS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Bot Checker Window"),
-        Input::KEY_WINDOW_BOT_CHECKER,
+        InputAction::WINDOW_BOT_CHECKER,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Who Is Online Window"),
-        Input::KEY_WINDOW_ONLINE,
+        InputAction::WINDOW_ONLINE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Did you know Window"),
-        Input::KEY_WINDOW_DIDYOUKNOW,
+        InputAction::WINDOW_DIDYOUKNOW,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quests Window"),
-        Input::KEY_WINDOW_QUESTS,
+        InputAction::WINDOW_QUESTS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Social Tab"),
-        Input::KEY_PREV_SOCIAL_TAB,
+        InputAction::PREV_SOCIAL_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Social Tab"),
-        Input::KEY_NEXT_SOCIAL_TAB,
+        InputAction::NEXT_SOCIAL_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Shortcuts tab"),
-        Input::KEY_PREV_SHORTCUTS_TAB,
+        InputAction::PREV_SHORTCUTS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Shortcuts tab"),
-        Input::KEY_NEXT_SHORTCUTS_TAB,
+        InputAction::NEXT_SHORTCUTS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Commands tab"),
-        Input::KEY_PREV_COMMANDS_TAB,
+        InputAction::PREV_COMMANDS_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Commands tab"),
-        Input::KEY_NEXT_COMMANDS_TAB,
+        InputAction::NEXT_COMMANDS_TAB,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -556,312 +557,312 @@ static SetupActionData setupActionData3[] =
     {
         // TRANSLATORS: input action name
         N_("Emote modifiers keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Emote modifier key"),
-        Input::KEY_EMOTE,
+        InputAction::EMOTE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emote shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 1),
-        Input::KEY_EMOTE_1,
+        InputAction::EMOTE_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 2),
-        Input::KEY_EMOTE_2,
+        InputAction::EMOTE_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 3),
-        Input::KEY_EMOTE_3,
+        InputAction::EMOTE_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 4),
-        Input::KEY_EMOTE_4,
+        InputAction::EMOTE_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 5),
-        Input::KEY_EMOTE_5,
+        InputAction::EMOTE_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 6),
-        Input::KEY_EMOTE_6,
+        InputAction::EMOTE_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 7),
-        Input::KEY_EMOTE_7,
+        InputAction::EMOTE_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 8),
-        Input::KEY_EMOTE_8,
+        InputAction::EMOTE_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 9),
-        Input::KEY_EMOTE_9,
+        InputAction::EMOTE_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 10),
-        Input::KEY_EMOTE_10,
+        InputAction::EMOTE_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 11),
-        Input::KEY_EMOTE_11,
+        InputAction::EMOTE_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 12),
-        Input::KEY_EMOTE_12,
+        InputAction::EMOTE_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 13),
-        Input::KEY_EMOTE_13,
+        InputAction::EMOTE_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 14),
-        Input::KEY_EMOTE_14,
+        InputAction::EMOTE_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 15),
-        Input::KEY_EMOTE_15,
+        InputAction::EMOTE_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 16),
-        Input::KEY_EMOTE_16,
+        InputAction::EMOTE_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 17),
-        Input::KEY_EMOTE_17,
+        InputAction::EMOTE_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 18),
-        Input::KEY_EMOTE_18,
+        InputAction::EMOTE_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 19),
-        Input::KEY_EMOTE_19,
+        InputAction::EMOTE_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 20),
-        Input::KEY_EMOTE_20,
+        InputAction::EMOTE_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 21),
-        Input::KEY_EMOTE_21,
+        InputAction::EMOTE_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 22),
-        Input::KEY_EMOTE_22,
+        InputAction::EMOTE_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 23),
-        Input::KEY_EMOTE_23,
+        InputAction::EMOTE_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 24),
-        Input::KEY_EMOTE_24,
+        InputAction::EMOTE_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 25),
-        Input::KEY_EMOTE_25,
+        InputAction::EMOTE_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 26),
-        Input::KEY_EMOTE_26,
+        InputAction::EMOTE_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 27),
-        Input::KEY_EMOTE_27,
+        InputAction::EMOTE_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 28),
-        Input::KEY_EMOTE_28,
+        InputAction::EMOTE_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 29),
-        Input::KEY_EMOTE_29,
+        InputAction::EMOTE_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 30),
-        Input::KEY_EMOTE_30,
+        InputAction::EMOTE_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 31),
-        Input::KEY_EMOTE_31,
+        InputAction::EMOTE_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 32),
-        Input::KEY_EMOTE_32,
+        InputAction::EMOTE_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 33),
-        Input::KEY_EMOTE_33,
+        InputAction::EMOTE_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 34),
-        Input::KEY_EMOTE_34,
+        InputAction::EMOTE_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 35),
-        Input::KEY_EMOTE_35,
+        InputAction::EMOTE_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 36),
-        Input::KEY_EMOTE_36,
+        InputAction::EMOTE_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 37),
-        Input::KEY_EMOTE_37,
+        InputAction::EMOTE_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 38),
-        Input::KEY_EMOTE_38,
+        InputAction::EMOTE_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 39),
-        Input::KEY_EMOTE_39,
+        InputAction::EMOTE_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 40),
-        Input::KEY_EMOTE_40,
+        InputAction::EMOTE_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 41),
-        Input::KEY_EMOTE_41,
+        InputAction::EMOTE_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 42),
-        Input::KEY_EMOTE_42,
+        InputAction::EMOTE_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 43),
-        Input::KEY_EMOTE_43,
+        InputAction::EMOTE_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 44),
-        Input::KEY_EMOTE_44,
+        InputAction::EMOTE_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 45),
-        Input::KEY_EMOTE_45,
+        InputAction::EMOTE_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 46),
-        Input::KEY_EMOTE_46,
+        InputAction::EMOTE_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 47),
-        Input::KEY_EMOTE_47,
+        InputAction::EMOTE_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Emote Shortcut %d"), 48),
-        Input::KEY_EMOTE_48,
+        InputAction::EMOTE_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -871,324 +872,324 @@ static SetupActionData setupActionData4[] =
     {
         // TRANSLATORS: input action name
         N_("Outfits keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         N_("Wear Outfit"),
-        Input::KEY_WEAR_OUTFIT,
+        InputAction::WEAR_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Copy Outfit"),
-        Input::KEY_COPY_OUTFIT,
+        InputAction::COPY_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Copy equipped to Outfit"),
-        Input::KEY_COPY_EQUIPED_OUTFIT,
+        InputAction::COPY_EQUIPED_OUTFIT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Outfits shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 1),
-        Input::KEY_OUTFIT_1,
+        InputAction::OUTFIT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 2),
-        Input::KEY_OUTFIT_2,
+        InputAction::OUTFIT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 3),
-        Input::KEY_OUTFIT_3,
+        InputAction::OUTFIT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 4),
-        Input::KEY_OUTFIT_4,
+        InputAction::OUTFIT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 5),
-        Input::KEY_OUTFIT_5,
+        InputAction::OUTFIT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 6),
-        Input::KEY_OUTFIT_6,
+        InputAction::OUTFIT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 7),
-        Input::KEY_OUTFIT_7,
+        InputAction::OUTFIT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 8),
-        Input::KEY_OUTFIT_8,
+        InputAction::OUTFIT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 9),
-        Input::KEY_OUTFIT_9,
+        InputAction::OUTFIT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 10),
-        Input::KEY_OUTFIT_10,
+        InputAction::OUTFIT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 11),
-        Input::KEY_OUTFIT_11,
+        InputAction::OUTFIT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 12),
-        Input::KEY_OUTFIT_12,
+        InputAction::OUTFIT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 13),
-        Input::KEY_OUTFIT_13,
+        InputAction::OUTFIT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 14),
-        Input::KEY_OUTFIT_14,
+        InputAction::OUTFIT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 15),
-        Input::KEY_OUTFIT_15,
+        InputAction::OUTFIT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 16),
-        Input::KEY_OUTFIT_16,
+        InputAction::OUTFIT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 17),
-        Input::KEY_OUTFIT_17,
+        InputAction::OUTFIT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 18),
-        Input::KEY_OUTFIT_18,
+        InputAction::OUTFIT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 19),
-        Input::KEY_OUTFIT_19,
+        InputAction::OUTFIT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 20),
-        Input::KEY_OUTFIT_20,
+        InputAction::OUTFIT_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 21),
-        Input::KEY_OUTFIT_21,
+        InputAction::OUTFIT_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 22),
-        Input::KEY_OUTFIT_22,
+        InputAction::OUTFIT_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 23),
-        Input::KEY_OUTFIT_23,
+        InputAction::OUTFIT_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 24),
-        Input::KEY_OUTFIT_24,
+        InputAction::OUTFIT_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 25),
-        Input::KEY_OUTFIT_25,
+        InputAction::OUTFIT_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 26),
-        Input::KEY_OUTFIT_26,
+        InputAction::OUTFIT_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 27),
-        Input::KEY_OUTFIT_27,
+        InputAction::OUTFIT_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 28),
-        Input::KEY_OUTFIT_28,
+        InputAction::OUTFIT_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 29),
-        Input::KEY_OUTFIT_29,
+        InputAction::OUTFIT_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 30),
-        Input::KEY_OUTFIT_30,
+        InputAction::OUTFIT_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 31),
-        Input::KEY_OUTFIT_31,
+        InputAction::OUTFIT_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 32),
-        Input::KEY_OUTFIT_32,
+        InputAction::OUTFIT_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 33),
-        Input::KEY_OUTFIT_33,
+        InputAction::OUTFIT_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 34),
-        Input::KEY_OUTFIT_34,
+        InputAction::OUTFIT_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 35),
-        Input::KEY_OUTFIT_35,
+        InputAction::OUTFIT_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 36),
-        Input::KEY_OUTFIT_36,
+        InputAction::OUTFIT_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 37),
-        Input::KEY_OUTFIT_37,
+        InputAction::OUTFIT_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 38),
-        Input::KEY_OUTFIT_38,
+        InputAction::OUTFIT_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 39),
-        Input::KEY_OUTFIT_39,
+        InputAction::OUTFIT_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 40),
-        Input::KEY_OUTFIT_40,
+        InputAction::OUTFIT_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 41),
-        Input::KEY_OUTFIT_41,
+        InputAction::OUTFIT_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 42),
-        Input::KEY_OUTFIT_42,
+        InputAction::OUTFIT_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 43),
-        Input::KEY_OUTFIT_43,
+        InputAction::OUTFIT_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 44),
-        Input::KEY_OUTFIT_44,
+        InputAction::OUTFIT_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 45),
-        Input::KEY_OUTFIT_45,
+        InputAction::OUTFIT_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 46),
-        Input::KEY_OUTFIT_46,
+        InputAction::OUTFIT_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 47),
-        Input::KEY_OUTFIT_47,
+        InputAction::OUTFIT_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Outfit Shortcut %d"), 48),
-        Input::KEY_OUTFIT_48,
+        InputAction::OUTFIT_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1198,121 +1199,121 @@ static SetupActionData setupActionData5[] =
     {
         // TRANSLATORS: input action name
         N_("Toggle Chat"),
-        Input::KEY_TOGGLE_CHAT,
+        InputAction::TOGGLE_CHAT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Scroll Chat Up"),
-        Input::KEY_SCROLL_CHAT_UP,
+        InputAction::SCROLL_CHAT_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Scroll Chat Down"),
-        Input::KEY_SCROLL_CHAT_DOWN,
+        InputAction::SCROLL_CHAT_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous Chat Tab"),
-        Input::KEY_PREV_CHAT_TAB,
+        InputAction::PREV_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next Chat Tab"),
-        Input::KEY_NEXT_CHAT_TAB,
+        InputAction::NEXT_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Close current Chat Tab"),
-        Input::KEY_CLOSE_CHAT_TAB,
+        InputAction::CLOSE_CHAT_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Previous chat line"),
-        Input::KEY_CHAT_PREV_HISTORY,
+        InputAction::CHAT_PREV_HISTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Next chat line"),
-        Input::KEY_CHAT_NEXT_HISTORY,
+        InputAction::CHAT_NEXT_HISTORY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Chat modifier key"),
-        Input::KEY_CHAT_MOD,
+        InputAction::CHAT_MOD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Show smiles"),
-        Input::KEY_GUI_F1,
+        InputAction::GUI_F1,
         "",
     },
     {
         "F2",
-        Input::KEY_GUI_F2,
+        InputAction::GUI_F2,
         "",
     },
     {
         "F3",
-        Input::KEY_GUI_F3,
+        InputAction::GUI_F3,
         "",
     },
     {
         "F4",
-        Input::KEY_GUI_F4,
+        InputAction::GUI_F4,
         "",
     },
     {
         "F5",
-        Input::KEY_GUI_F5,
+        InputAction::GUI_F5,
         "",
     },
     {
         "F6",
-        Input::KEY_GUI_F6,
+        InputAction::GUI_F6,
         "",
     },
     {
         "F7",
-        Input::KEY_GUI_F7,
+        InputAction::GUI_F7,
         "",
     },
     {
         "F8",
-        Input::KEY_GUI_F8,
+        InputAction::GUI_F8,
         "",
     },
     {
         "F9",
-        Input::KEY_GUI_F9,
+        InputAction::GUI_F9,
         "",
     },
     {
         "F10",
-        Input::KEY_GUI_F10,
+        InputAction::GUI_F10,
         "",
     },
     {
         "F11",
-        Input::KEY_GUI_F11,
+        InputAction::GUI_F11,
         "",
     },
     {
         "F12",
-        Input::KEY_GUI_F12,
+        InputAction::GUI_F12,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1322,168 +1323,168 @@ static SetupActionData setupActionData6[] =
     {
         // TRANSLATORS: input action name
         N_("Ignore input 1"),
-        Input::KEY_IGNORE_INPUT_1,
+        InputAction::IGNORE_INPUT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Ignore input 2"),
-        Input::KEY_IGNORE_INPUT_2,
+        InputAction::IGNORE_INPUT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Up"),
-        Input::KEY_DIRECT_UP,
+        InputAction::DIRECT_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Down"),
-        Input::KEY_DIRECT_DOWN,
+        InputAction::DIRECT_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Left"),
-        Input::KEY_DIRECT_LEFT,
+        InputAction::DIRECT_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Direct Right"),
-        Input::KEY_DIRECT_RIGHT,
+        InputAction::DIRECT_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Crazy moves"),
-        Input::KEY_CRAZY_MOVES,
+        InputAction::CRAZY_MOVES,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Crazy Move mode"),
-        Input::KEY_CHANGE_CRAZY_MOVES_TYPE,
+        InputAction::CHANGE_CRAZY_MOVES_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick Drop N Items from 0 slot"),
-        Input::KEY_QUICK_DROP,
+        InputAction::QUICK_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick Drop N Items"),
-        Input::KEY_QUICK_DROPN,
+        InputAction::QUICK_DROPN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch Quick Drop Counter"),
-        Input::KEY_SWITCH_QUICK_DROP,
+        InputAction::SWITCH_QUICK_DROP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Quick heal target or self"),
-        Input::KEY_MAGIC_INMA1,
+        InputAction::MAGIC_INMA1,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Use #itenplz spell"),
-        Input::KEY_MAGIC_ITENPLZ,
+        InputAction::MAGIC_ITENPLZ,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Use magic attack"),
-        Input::KEY_MAGIC_ATTACK,
+        InputAction::MAGIC_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch magic attack"),
-        Input::KEY_SWITCH_MAGIC_ATTACK,
+        InputAction::SWITCH_MAGIC_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Switch pvp attack"),
-        Input::KEY_SWITCH_PVP_ATTACK,
+        InputAction::SWITCH_PVP_ATTACK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change move type"),
-        Input::KEY_INVERT_DIRECTION,
+        InputAction::INVERT_DIRECTION,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Attack Weapon Type"),
-        Input::KEY_CHANGE_ATTACK_WEAPON_TYPE,
+        InputAction::CHANGE_ATTACK_WEAPON_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Attack Type"),
-        Input::KEY_CHANGE_ATTACK_TYPE,
+        InputAction::CHANGE_ATTACK_TYPE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Follow mode"),
-        Input::KEY_CHANGE_FOLLOW_MODE,
+        InputAction::CHANGE_FOLLOW_MODE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Change Imitation mode"),
-        Input::KEY_CHANGE_IMITATION_MODE,
+        InputAction::CHANGE_IMITATION_MODE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Disable / Enable Game modifier keys"),
-        Input::KEY_DISABLE_GAME_MODIFIERS,
+        InputAction::DISABLE_GAME_MODIFIERS,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("On / Off audio"),
-        Input::KEY_CHANGE_AUDIO,
+        InputAction::CHANGE_AUDIO,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Enable / Disable away mode"),
-        Input::KEY_AWAY,
+        InputAction::AWAY,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Emulate right click from keyboard"),
-        Input::KEY_RIGHT_CLICK,
+        InputAction::RIGHT_CLICK,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Toggle camera mode"),
-        Input::KEY_CAMERA,
+        InputAction::CAMERA,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Show onscreen keyboard"),
-        Input::KEY_SHOW_KEYBOARD,
+        InputAction::SHOW_KEYBOARD,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1493,336 +1494,336 @@ static SetupActionData setupActionData7[] =
     {
         // TRANSLATORS: input action name
         N_("Move Keys"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Up"),
-        Input::KEY_MOVE_UP,
+        InputAction::MOVE_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Down"),
-        Input::KEY_MOVE_DOWN,
+        InputAction::MOVE_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Left"),
-        Input::KEY_MOVE_LEFT,
+        InputAction::MOVE_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Right"),
-        Input::KEY_MOVE_RIGHT,
+        InputAction::MOVE_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Forward"),
-        Input::KEY_MOVE_FORWARD,
+        InputAction::MOVE_FORWARD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move to navigation point shortcuts"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 1),
-        Input::KEY_MOVE_TO_POINT_1,
+        InputAction::MOVE_TO_POINT_1,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 2),
-        Input::KEY_MOVE_TO_POINT_2,
+        InputAction::MOVE_TO_POINT_2,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 3),
-        Input::KEY_MOVE_TO_POINT_3,
+        InputAction::MOVE_TO_POINT_3,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 4),
-        Input::KEY_MOVE_TO_POINT_4,
+        InputAction::MOVE_TO_POINT_4,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 5),
-        Input::KEY_MOVE_TO_POINT_5,
+        InputAction::MOVE_TO_POINT_5,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 6),
-        Input::KEY_MOVE_TO_POINT_6,
+        InputAction::MOVE_TO_POINT_6,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 7),
-        Input::KEY_MOVE_TO_POINT_7,
+        InputAction::MOVE_TO_POINT_7,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 8),
-        Input::KEY_MOVE_TO_POINT_8,
+        InputAction::MOVE_TO_POINT_8,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 9),
-        Input::KEY_MOVE_TO_POINT_9,
+        InputAction::MOVE_TO_POINT_9,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 10),
-        Input::KEY_MOVE_TO_POINT_10,
+        InputAction::MOVE_TO_POINT_10,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 11),
-        Input::KEY_MOVE_TO_POINT_11,
+        InputAction::MOVE_TO_POINT_11,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 12),
-        Input::KEY_MOVE_TO_POINT_12,
+        InputAction::MOVE_TO_POINT_12,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 13),
-        Input::KEY_MOVE_TO_POINT_13,
+        InputAction::MOVE_TO_POINT_13,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 14),
-        Input::KEY_MOVE_TO_POINT_14,
+        InputAction::MOVE_TO_POINT_14,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 15),
-        Input::KEY_MOVE_TO_POINT_15,
+        InputAction::MOVE_TO_POINT_15,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 16),
-        Input::KEY_MOVE_TO_POINT_16,
+        InputAction::MOVE_TO_POINT_16,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 17),
-        Input::KEY_MOVE_TO_POINT_17,
+        InputAction::MOVE_TO_POINT_17,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 18),
-        Input::KEY_MOVE_TO_POINT_18,
+        InputAction::MOVE_TO_POINT_18,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 19),
-        Input::KEY_MOVE_TO_POINT_19,
+        InputAction::MOVE_TO_POINT_19,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 20),
-        Input::KEY_MOVE_TO_POINT_20,
+        InputAction::MOVE_TO_POINT_20,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 21),
-        Input::KEY_MOVE_TO_POINT_21,
+        InputAction::MOVE_TO_POINT_21,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 22),
-        Input::KEY_MOVE_TO_POINT_22,
+        InputAction::MOVE_TO_POINT_22,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 23),
-        Input::KEY_MOVE_TO_POINT_23,
+        InputAction::MOVE_TO_POINT_23,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 24),
-        Input::KEY_MOVE_TO_POINT_24,
+        InputAction::MOVE_TO_POINT_24,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 25),
-        Input::KEY_MOVE_TO_POINT_25,
+        InputAction::MOVE_TO_POINT_25,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 26),
-        Input::KEY_MOVE_TO_POINT_26,
+        InputAction::MOVE_TO_POINT_26,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 27),
-        Input::KEY_MOVE_TO_POINT_27,
+        InputAction::MOVE_TO_POINT_27,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 28),
-        Input::KEY_MOVE_TO_POINT_28,
+        InputAction::MOVE_TO_POINT_28,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 29),
-        Input::KEY_MOVE_TO_POINT_29,
+        InputAction::MOVE_TO_POINT_29,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 30),
-        Input::KEY_MOVE_TO_POINT_30,
+        InputAction::MOVE_TO_POINT_30,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 31),
-        Input::KEY_MOVE_TO_POINT_31,
+        InputAction::MOVE_TO_POINT_31,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 32),
-        Input::KEY_MOVE_TO_POINT_32,
+        InputAction::MOVE_TO_POINT_32,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 33),
-        Input::KEY_MOVE_TO_POINT_33,
+        InputAction::MOVE_TO_POINT_33,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 34),
-        Input::KEY_MOVE_TO_POINT_34,
+        InputAction::MOVE_TO_POINT_34,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 35),
-        Input::KEY_MOVE_TO_POINT_35,
+        InputAction::MOVE_TO_POINT_35,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 36),
-        Input::KEY_MOVE_TO_POINT_36,
+        InputAction::MOVE_TO_POINT_36,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 37),
-        Input::KEY_MOVE_TO_POINT_37,
+        InputAction::MOVE_TO_POINT_37,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 38),
-        Input::KEY_MOVE_TO_POINT_38,
+        InputAction::MOVE_TO_POINT_38,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 39),
-        Input::KEY_MOVE_TO_POINT_39,
+        InputAction::MOVE_TO_POINT_39,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 40),
-        Input::KEY_MOVE_TO_POINT_40,
+        InputAction::MOVE_TO_POINT_40,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 41),
-        Input::KEY_MOVE_TO_POINT_41,
+        InputAction::MOVE_TO_POINT_41,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 42),
-        Input::KEY_MOVE_TO_POINT_42,
+        InputAction::MOVE_TO_POINT_42,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 43),
-        Input::KEY_MOVE_TO_POINT_43,
+        InputAction::MOVE_TO_POINT_43,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 44),
-        Input::KEY_MOVE_TO_POINT_44,
+        InputAction::MOVE_TO_POINT_44,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 45),
-        Input::KEY_MOVE_TO_POINT_45,
+        InputAction::MOVE_TO_POINT_45,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 46),
-        Input::KEY_MOVE_TO_POINT_46,
+        InputAction::MOVE_TO_POINT_46,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 47),
-        Input::KEY_MOVE_TO_POINT_47,
+        InputAction::MOVE_TO_POINT_47,
         "",
     },
     {
         // TRANSLATORS: input action name
         strprintf(N_("Move to point Shortcut %d"), 48),
-        Input::KEY_MOVE_TO_POINT_48,
+        InputAction::MOVE_TO_POINT_48,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };
@@ -1832,170 +1833,170 @@ static SetupActionData setupActionData8[] =
     {
         // TRANSLATORS: input action name
         N_("Move & selection"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Up"),
-        Input::KEY_GUI_UP,
+        InputAction::GUI_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Down"),
-        Input::KEY_GUI_DOWN,
+        InputAction::GUI_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Left"),
-        Input::KEY_GUI_LEFT,
+        InputAction::GUI_LEFT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Right"),
-        Input::KEY_GUI_RIGHT,
+        InputAction::GUI_RIGHT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move Home"),
-        Input::KEY_GUI_HOME,
+        InputAction::GUI_HOME,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Move End"),
-        Input::KEY_GUI_END,
+        InputAction::GUI_END,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Page up"),
-        Input::KEY_GUI_PAGE_UP,
+        InputAction::GUI_PAGE_UP,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Page down"),
-        Input::KEY_GUI_PAGE_DOWN,
+        InputAction::GUI_PAGE_DOWN,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Other"),
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select"),
-        Input::KEY_GUI_SELECT,
+        InputAction::GUI_SELECT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Select2"),
-        Input::KEY_GUI_SELECT2,
+        InputAction::GUI_SELECT2,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Cancel"),
-        Input::KEY_GUI_CANCEL,
+        InputAction::GUI_CANCEL,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Delete"),
-        Input::KEY_GUI_DELETE,
+        InputAction::GUI_DELETE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Backspace"),
-        Input::KEY_GUI_BACKSPACE,
+        InputAction::GUI_BACKSPACE,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Insert"),
-        Input::KEY_GUI_INSERT,
+        InputAction::GUI_INSERT,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Tab"),
-        Input::KEY_GUI_TAB,
+        InputAction::GUI_TAB,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Mod"),
-        Input::KEY_GUI_MOD,
+        InputAction::GUI_MOD,
         "",
     },
     {
         // TRANSLATORS: input action name
         N_("Ctrl"),
-        Input::KEY_GUI_CTRL,
+        InputAction::GUI_CTRL,
         "",
     },
     {
         "B",
-        Input::KEY_GUI_B,
+        InputAction::GUI_B,
         "",
     },
     {
         "C",
-        Input::KEY_GUI_C,
+        InputAction::GUI_C,
         "",
     },
     {
         "D",
-        Input::KEY_GUI_D,
+        InputAction::GUI_D,
         "",
     },
     {
         "E",
-        Input::KEY_GUI_E,
+        InputAction::GUI_E,
         "",
     },
     {
         "F",
-        Input::KEY_GUI_F,
+        InputAction::GUI_F,
         "",
     },
     {
         "H",
-        Input::KEY_GUI_H,
+        InputAction::GUI_H,
         "",
     },
     {
         "K",
-        Input::KEY_GUI_K,
+        InputAction::GUI_K,
         "",
     },
     {
         "U",
-        Input::KEY_GUI_U,
+        InputAction::GUI_U,
         "",
     },
     {
         "V",
-        Input::KEY_GUI_V,
+        InputAction::GUI_V,
         "",
     },
     {
         "W",
-        Input::KEY_GUI_W,
+        InputAction::GUI_W,
         "",
     },
     {
         "",
-        Input::KEY_NO_VALUE,
+        InputAction::NO_VALUE,
         ""
     }
 };