From c9a84749b3b71d4df6cc3b9b488d60dc4a013a20 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 17:58:44 +0300 Subject: Move inputaction into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/defaults.cpp | 6 +- src/enums/input/inputaction.h | 607 ++++++++++++++++++++++++++++++ src/gui/popups/statuspopup.h | 2 +- src/gui/widgets/button.cpp | 2 +- src/gui/widgets/checkbox.cpp | 2 +- src/gui/widgets/dropdown.cpp | 2 +- src/gui/widgets/guitable.cpp | 4 +- src/gui/widgets/inttextfield.cpp | 2 +- src/gui/widgets/listbox.cpp | 2 +- src/gui/widgets/radiobutton.cpp | 2 +- src/gui/widgets/slider.cpp | 2 +- src/gui/widgets/tabbedarea.cpp | 2 +- src/gui/widgets/textbox.cpp | 2 +- src/gui/windows/charcreatedialog.cpp | 4 +- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/editserverdialog.cpp | 4 +- src/gui/windows/logindialog.cpp | 2 +- src/gui/windows/quitdialog.cpp | 2 +- src/gui/windows/registerdialog.cpp | 8 +- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/updaterwindow.cpp | 4 +- src/gui/windows/worldselectdialog.cpp | 2 +- src/input/inputaction.h | 607 ------------------------------ src/input/inputmanager.h | 3 +- src/input/pages/basic.cpp | 2 +- src/input/pages/chat.cpp | 2 +- src/input/pages/emotes.cpp | 2 +- src/input/pages/gui.cpp | 2 +- src/input/pages/move.cpp | 2 +- src/input/pages/other.cpp | 2 +- src/input/pages/outfits.cpp | 2 +- src/input/pages/shortcuts.cpp | 2 +- src/input/pages/windows.cpp | 2 +- src/listeners/inputactionreplaylistener.h | 4 +- src/touchmanager.h | 2 +- 37 files changed, 653 insertions(+), 652 deletions(-) create mode 100644 src/enums/input/inputaction.h delete mode 100644 src/input/inputaction.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 805327f26..55cea4c33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -902,7 +902,7 @@ SET(SRCS spellshortcut.h textcommand.cpp textcommand.h - input/inputaction.h + enums/input/inputaction.h input/inputactiondata.h input/inputactionmap.h input/inputactionsortfunctor.h diff --git a/src/Makefile.am b/src/Makefile.am index f8e45e440..38a4bb42b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1038,7 +1038,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ textcommand.cpp \ textcommand.h \ events/inputevent.h \ - input/inputaction.h \ + enums/input/inputaction.h \ input/inputactiondata.h \ input/inputactionmap.h \ input/inputactionsortfunctor.h \ diff --git a/src/defaults.cpp b/src/defaults.cpp index befba7ffe..c8ca23f54 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -24,11 +24,11 @@ #include "graphicsmanager.h" #include "variabledata.h" -#include "enums/screendensity.h" - #include "being/beingspeech.h" -#include "input/inputaction.h" +#include "enums/screendensity.h" + +#include "enums/input/inputaction.h" #include "render/graphics.h" diff --git a/src/enums/input/inputaction.h b/src/enums/input/inputaction.h new file mode 100644 index 000000000..f398029e7 --- /dev/null +++ b/src/enums/input/inputaction.h @@ -0,0 +1,607 @@ +/* + * The ManaPlus Client + * Copyright (C) 2007 Joshua Langley + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2015 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef INPUT_INPUTACTION_H +#define INPUT_INPUTACTION_H + +#ifdef WIN32 +#undef ERROR +#undef IGNORE +#endif +namespace InputAction +{ + /** + * All the key functions. + * KEY_NO_VALUE is used in initialization, and should be unchanged. + * KEY_TOTAL should always be last (used as a conditional in loops). + * The key assignment view gets arranged according to the order of + * these values. + */ + enum Type + { + NO_VALUE = -1, + MOVE_UP, + MOVE_DOWN, + MOVE_LEFT, + MOVE_RIGHT, + ATTACK, + TARGET_ATTACK, + MOVE_TO_TARGET, + CHANGE_MOVE_TO_TARGET, + MOVE_TO_HOME, + SET_HOME, + MOVE_TO_POINT, + TALK, + STOP_ATTACK, + UNTARGET, + TARGET_MONSTER, + TARGET_NPC, + TARGET_PLAYER, + PICKUP, + CHANGE_PICKUP_TYPE, + HIDE_WINDOWS, + SIT, + SCREENSHOT, + CHANGE_TRADE, + PATHFIND, + OK, + QUIT, + SHORTCUTS_KEY, + SHORTCUT_1, + SHORTCUT_2, + SHORTCUT_3, + SHORTCUT_4, + SHORTCUT_5, + SHORTCUT_6, + SHORTCUT_7, + SHORTCUT_8, + SHORTCUT_9, + SHORTCUT_10, + SHORTCUT_11, + SHORTCUT_12, + SHORTCUT_13, + SHORTCUT_14, + SHORTCUT_15, + SHORTCUT_16, + SHORTCUT_17, + SHORTCUT_18, + SHORTCUT_19, + SHORTCUT_20, + WINDOW_HELP, + WINDOW_STATUS, + WINDOW_INVENTORY, + WINDOW_EQUIPMENT, + WINDOW_SKILL, + WINDOW_MINIMAP, + WINDOW_CHAT, + WINDOW_SHORTCUT, + WINDOW_SETUP, + WINDOW_DEBUG, + WINDOW_SOCIAL, + WINDOW_EMOTE_SHORTCUT, + WINDOW_OUTFIT, + WINDOW_SHOP, + WINDOW_DROP, + WINDOW_KILLS, + WINDOW_SPELLS, + UNUSED1, + WINDOW_ONLINE, + WINDOW_DIDYOUKNOW, + WINDOW_QUESTS, + PREV_SOCIAL_TAB, + NEXT_SOCIAL_TAB, + EMOTE, + EMOTE_1, + EMOTE_2, + EMOTE_3, + EMOTE_4, + EMOTE_5, + EMOTE_6, + EMOTE_7, + EMOTE_8, + EMOTE_9, + EMOTE_10, + EMOTE_11, + EMOTE_12, + EMOTE_13, + EMOTE_14, + EMOTE_15, + EMOTE_16, + EMOTE_17, + EMOTE_18, + EMOTE_19, + EMOTE_20, + EMOTE_21, + EMOTE_22, + EMOTE_23, + EMOTE_24, + EMOTE_25, + EMOTE_26, + EMOTE_27, + EMOTE_28, + EMOTE_29, + EMOTE_30, + EMOTE_31, + EMOTE_32, + EMOTE_33, + EMOTE_34, + EMOTE_35, + EMOTE_36, + EMOTE_37, + EMOTE_38, + EMOTE_39, + EMOTE_40, + EMOTE_41, + EMOTE_42, + EMOTE_43, + EMOTE_44, + EMOTE_45, + EMOTE_46, + EMOTE_47, + EMOTE_48, + WEAR_OUTFIT, + COPY_OUTFIT, + COPY_EQUIPED_OUTFIT, + OUTFIT_1, + OUTFIT_2, + OUTFIT_3, + OUTFIT_4, + OUTFIT_5, + OUTFIT_6, + OUTFIT_7, + OUTFIT_8, + OUTFIT_9, + OUTFIT_10, + OUTFIT_11, + OUTFIT_12, + OUTFIT_13, + OUTFIT_14, + OUTFIT_15, + OUTFIT_16, + OUTFIT_17, + OUTFIT_18, + OUTFIT_19, + OUTFIT_20, + OUTFIT_21, + OUTFIT_22, + OUTFIT_23, + OUTFIT_24, + OUTFIT_25, + OUTFIT_26, + OUTFIT_27, + OUTFIT_28, + OUTFIT_29, + OUTFIT_30, + OUTFIT_31, + OUTFIT_32, + OUTFIT_33, + OUTFIT_34, + OUTFIT_35, + OUTFIT_36, + OUTFIT_37, + OUTFIT_38, + OUTFIT_39, + OUTFIT_40, + OUTFIT_41, + OUTFIT_42, + OUTFIT_43, + OUTFIT_44, + OUTFIT_45, + OUTFIT_46, + OUTFIT_47, + OUTFIT_48, + MOVE_TO_POINT_1, + MOVE_TO_POINT_2, + MOVE_TO_POINT_3, + MOVE_TO_POINT_4, + MOVE_TO_POINT_5, + MOVE_TO_POINT_6, + MOVE_TO_POINT_7, + MOVE_TO_POINT_8, + MOVE_TO_POINT_9, + MOVE_TO_POINT_10, + MOVE_TO_POINT_11, + MOVE_TO_POINT_12, + MOVE_TO_POINT_13, + MOVE_TO_POINT_14, + MOVE_TO_POINT_15, + MOVE_TO_POINT_16, + MOVE_TO_POINT_17, + MOVE_TO_POINT_18, + MOVE_TO_POINT_19, + MOVE_TO_POINT_20, + MOVE_TO_POINT_21, + MOVE_TO_POINT_22, + MOVE_TO_POINT_23, + MOVE_TO_POINT_24, + MOVE_TO_POINT_25, + MOVE_TO_POINT_26, + MOVE_TO_POINT_27, + MOVE_TO_POINT_28, + MOVE_TO_POINT_29, + MOVE_TO_POINT_30, + MOVE_TO_POINT_31, + MOVE_TO_POINT_32, + MOVE_TO_POINT_33, + MOVE_TO_POINT_34, + MOVE_TO_POINT_35, + MOVE_TO_POINT_36, + MOVE_TO_POINT_37, + MOVE_TO_POINT_38, + MOVE_TO_POINT_39, + MOVE_TO_POINT_40, + MOVE_TO_POINT_41, + MOVE_TO_POINT_42, + MOVE_TO_POINT_43, + MOVE_TO_POINT_44, + MOVE_TO_POINT_45, + MOVE_TO_POINT_46, + MOVE_TO_POINT_47, + MOVE_TO_POINT_48, + TOGGLE_CHAT, + SCROLL_CHAT_UP, + SCROLL_CHAT_DOWN, + PREV_CHAT_TAB, + NEXT_CHAT_TAB, + CLOSE_CHAT_TAB, + CHAT_PREV_HISTORY, + CHAT_NEXT_HISTORY, + IGNORE_INPUT_1, + IGNORE_INPUT_2, + DIRECT_UP, + DIRECT_DOWN, + DIRECT_LEFT, + DIRECT_RIGHT, + CRAZY_MOVES, + CHANGE_CRAZY_MOVES_TYPE, + QUICK_DROP, + QUICK_DROPN, + SWITCH_QUICK_DROP, + MAGIC_INMA1, + MAGIC_ITENPLZ, + MAGIC_ATTACK, + SWITCH_MAGIC_ATTACK, + SWITCH_PVP_ATTACK, + INVERT_DIRECTION, + CHANGE_ATTACK_WEAPON_TYPE, + CHANGE_ATTACK_TYPE, + CHANGE_FOLLOW_MODE, + CHANGE_IMITATION_MODE, + DISABLE_GAME_MODIFIERS, + CHANGE_AUDIO, + AWAY, + RIGHT_CLICK, + CAMERA, + RESERVED1, + GUI_UP, + GUI_DOWN, + GUI_LEFT, + GUI_RIGHT, + GUI_SELECT, + GUI_SELECT2, + GUI_CANCEL, + GUI_HOME, + GUI_END, + GUI_DELETE, + GUI_BACKSPACE, + GUI_TAB, + GUI_PAGE_UP, + GUI_PAGE_DOWN, + GUI_INSERT, + GUI_MOD, + SAFE_VIDEO, + STOP_SIT, + SHOW_KEYBOARD, + SHOW_WINDOWS, + CHAT_MOD, + MOVE_FORWARD, + GUI_CTRL, + GUI_B, + GUI_C, + GUI_D, + GUI_E, + GUI_F, + GUI_H, + GUI_K, + GUI_U, + GUI_V, + GUI_W, + PREV_SHORTCUTS_TAB, + NEXT_SHORTCUTS_TAB, + PREV_COMMANDS_TAB, + NEXT_COMMANDS_TAB, + OPEN_TRADE, + GUI_F1, + GUI_F2, + GUI_F3, + GUI_F4, + GUI_F5, + GUI_F6, + GUI_F7, + GUI_F8, + GUI_F9, + GUI_F10, + GUI_F11, + GUI_F12, + WINDOW_ABOUT, + WINDOW_UPDATER, + TARGET_CLOSEST_MONSTER, + CLOSE_ALL_CHAT_TABS, + IGNORE_ALL_WHISPERS, + CHAT_ANNOUNCE, + IPC_TOGGLE, + WHERE, + WHO, + WHISPER, + QUERY, + CLEAR_CHAT_TAB, + IGNORE, + UNIGNORE, + FRIEND, + DISREGARD, + NEUTRAL, + BLACKLIST, + ENEMY, + ERASE, + CLEAN_GRAPHICS, + CLEAN_FONTS, + CREATE_PARTY, + CREATE_GUILD, + PARTY, + ME, + TOGGLE, + PRESENT, + PRINT_ALL, + MOVE, + TARGET, + ATTACK_HUMAN, + COMMAMD_OUTFIT, + COMMAMD_EMOTE, + COMMAND_EMOTE_PET, + AWAY_MESSAGE, + PSEUDO_AWAY, + FOLLOW, + NAVIGATE, + IMITATION, + SEND_MAIL, + TRADE, + PRICE_LOAD, + PRICE_SAVE, + CACHE_INFO, + DISCONNECT, + UNDRESS, + DIRS, + INFO, + WAIT, + UPTIME, + ADD_PRIORITY_ATTACK, + ADD_ATTACK, + REMOVE_ATTACK, + ADD_IGNORE_ATTACK, + DUMP, + SERVER_IGNORE_ALL, + SERVER_UNIGNORE_ALL, + SET_DROP, + ERROR, + DUMP_GRAPHICS, + DUMP_ENVIRONMENT, + DUMP_TESTS, + DUMP_OGL, + DUMP_GL, + DUMP_MODS, + URL, + OPEN_URL, + EXECUTE, + TEST_SDL_FONT, + ENABLE_HIGHLIGHT, + DISABLE_HIGHLIGHT, + DONT_REMOVE_NAME, + REMOVE_NAME, + DISABLE_AWAY, + ENABLE_AWAY, + TEST_PARTICLE, + CREATE_ITEMS, + TALK_RAW, + TALK_PET, + UPLOAD_CONFIG, + UPLOAD_SERVER_CONFIG, + UPLOAD_LOG, + GM, + HACK, + DEBUG_SPAWN, + PET_EMOTE, + PET_EMOTE_1, + PET_EMOTE_2, + PET_EMOTE_3, + PET_EMOTE_4, + PET_EMOTE_5, + PET_EMOTE_6, + PET_EMOTE_7, + PET_EMOTE_8, + PET_EMOTE_9, + PET_EMOTE_10, + PET_EMOTE_11, + PET_EMOTE_12, + PET_EMOTE_13, + PET_EMOTE_14, + PET_EMOTE_15, + PET_EMOTE_16, + PET_EMOTE_17, + PET_EMOTE_18, + PET_EMOTE_19, + PET_EMOTE_20, + PET_EMOTE_21, + PET_EMOTE_22, + PET_EMOTE_23, + PET_EMOTE_24, + PET_EMOTE_25, + PET_EMOTE_26, + PET_EMOTE_27, + PET_EMOTE_28, + PET_EMOTE_29, + PET_EMOTE_30, + PET_EMOTE_31, + PET_EMOTE_32, + PET_EMOTE_33, + PET_EMOTE_34, + PET_EMOTE_35, + PET_EMOTE_36, + PET_EMOTE_37, + PET_EMOTE_38, + PET_EMOTE_39, + PET_EMOTE_40, + PET_EMOTE_41, + PET_EMOTE_42, + PET_EMOTE_43, + PET_EMOTE_44, + PET_EMOTE_45, + PET_EMOTE_46, + PET_EMOTE_47, + PET_EMOTE_48, + CATCH_PET, + IGNORE_WHISPER, + UNIGNORE_WHISPER, + MERCENARY_FIRE, + TARGET_MERCENARY, + TARGET_PET, + PET_SET_NAME, + HOMUNCULUS_SET_NAME, + HOMUNCULUS_FIRE, + WINDOW_BANK, + PREV_INV_TAB, + NEXT_INV_TAB, + CONTEXT_MENU, + BUY, + SELL, + WHISPER2, + GUILD, + NUKE, + USE, + CHAT_ADD, + WHISPER_TEXT, + NAVIGATE_TO, + CAMERA_MOVE, + DROP_ITEM, + DROP_ITEM_ALL, + DROP_INV, + DROP_INV_ALL, + USE_INV, + INV_TO_STORAGE, + TRADE_ADD, + STORAGE_TO_INV, + ITEM_PROTECT, + ITEM_UNPROTECT, + KICK_PARTY, + ADD_TEXT, + KICK, + LEAVE_PARTY, + WARP, + CLEAR_CHAT, + PET_MOVE_UP, + PET_MOVE_DOWN, + PET_MOVE_LEFT, + PET_MOVE_RIGHT, + PET_DIRECT_UP, + PET_DIRECT_DOWN, + PET_DIRECT_LEFT, + PET_DIRECT_RIGHT, + PET_AI_START, + PET_AI_STOP, + CHAT_GENERAL_TAB, + CHAT_DEBUG_TAB, + CHAT_BATTLE_TAB, + CHAT_TRADE_TAB, + CHAT_LANG_TAB, + CHAT_GM_TAB, + CHAT_PARTY_TAB, + CHAT_GUILD_TAB, + DROP_CLEAR, + WINDOW_CART, + HEAL_MOST_DAMAGED, + PET_MOVE, + HOMUN_TALK, + HOMUN_SMILE, + HOMUN_EMOTE, + HOMUN_EMOTE_1, + HOMUN_EMOTE_2, + HOMUN_EMOTE_3, + HOMUN_EMOTE_4, + HOMUN_EMOTE_5, + HOMUN_EMOTE_6, + HOMUN_EMOTE_7, + HOMUN_EMOTE_8, + HOMUN_EMOTE_9, + HOMUN_EMOTE_10, + HOMUN_EMOTE_11, + HOMUN_EMOTE_12, + HOMUN_EMOTE_13, + HOMUN_EMOTE_14, + HOMUN_EMOTE_15, + HOMUN_EMOTE_16, + HOMUN_EMOTE_17, + HOMUN_EMOTE_18, + HOMUN_EMOTE_19, + HOMUN_EMOTE_20, + HOMUN_EMOTE_21, + HOMUN_EMOTE_22, + HOMUN_EMOTE_23, + HOMUN_EMOTE_24, + HOMUN_EMOTE_25, + HOMUN_EMOTE_26, + HOMUN_EMOTE_27, + HOMUN_EMOTE_28, + HOMUN_EMOTE_29, + HOMUN_EMOTE_30, + HOMUN_EMOTE_31, + HOMUN_EMOTE_32, + HOMUN_EMOTE_33, + HOMUN_EMOTE_34, + HOMUN_EMOTE_35, + HOMUN_EMOTE_36, + HOMUN_EMOTE_37, + HOMUN_EMOTE_38, + HOMUN_EMOTE_39, + HOMUN_EMOTE_40, + HOMUN_EMOTE_41, + HOMUN_EMOTE_42, + HOMUN_EMOTE_43, + HOMUN_EMOTE_44, + HOMUN_EMOTE_45, + HOMUN_EMOTE_46, + HOMUN_EMOTE_47, + HOMUN_EMOTE_48, + KICK_GUILD, + HAT, + CREATE_PUBLIC_ROOM, + JOIN_ROOM, + LEAVE_ROOM, + WINDOW_QUICK_SETTINGS, + WINDOW_MAIL, + CONF_SET, + SERVER_CONF_SET, + CONG_GET, + SERVER_CONG_GET, + TOTAL + }; +} // namespace InputAction + +#endif // INPUT_INPUTACTION_H diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index 2226d1ba2..cdfbde656 100644 --- a/src/gui/popups/statuspopup.h +++ b/src/gui/popups/statuspopup.h @@ -24,7 +24,7 @@ #ifndef GUI_POPUPS_STATUSPOPUP_H #define GUI_POPUPS_STATUSPOPUP_H -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/widgets/popup.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 0d7bafd74..9a6d43518 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -68,7 +68,7 @@ #include "graphicsvertexes.h" #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "resources/image.h" #include "resources/imageset.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 69479aba0..6459c5f1c 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -67,7 +67,7 @@ #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "resources/image.h" #include "resources/imagerect.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index d6ff28e43..0d08dac60 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -24,7 +24,7 @@ #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/gui.h" #include "gui/skin.h" diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 2927b1284..ba29033a9 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -24,12 +24,12 @@ #include "settings.h" +#include "enums/input/inputaction.h" + #include "gui/gui.h" #include "gui/models/tablemodel.h" -#include "input/inputaction.h" - #include "listeners/guitableactionlistener.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index 094f2e50c..1ba53b1af 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -26,7 +26,7 @@ #include "gui/sdlinput.h" #endif -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 0a38d6133..5ab8945a9 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -67,7 +67,7 @@ #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "listeners/selectionlistener.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index c7089a8ad..9fd9d81aa 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -67,7 +67,7 @@ #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "resources/image.h" #include "resources/imagerect.h" diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 8c17c03fa..c11dc2627 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -68,7 +68,7 @@ #include "graphicsvertexes.h" #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/gui.h" diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index e00123af6..79205617f 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -65,7 +65,7 @@ #include "gui/widgets/tabbedarea.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/gui.h" diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index e235fd04e..0919656ad 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -65,7 +65,7 @@ #include "gui/widgets/textbox.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/gui.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 49b1e1c59..87dc25115 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -24,12 +24,12 @@ #include "configuration.h" -#include "input/inputaction.h" - #include "enums/being/beingdirection.h" #include "enums/gui/dialogtype.h" +#include "enums/input/inputaction.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index bb4eae95e..dd82091b0 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -28,7 +28,7 @@ #include "enums/being/attributes.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "listeners/charrenamelistener.h" #ifdef EATHENA_SUPPORT diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 0d1ed392f..e6fd2e16c 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -21,10 +21,10 @@ #include "gui/windows/editserverdialog.h" -#include "input/inputaction.h" - #include "enums/gui/dialogtype.h" +#include "enums/input/inputaction.h" + #include "gui/models/typelistmodel.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 644c9f2ad..f2b41c7b5 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -25,7 +25,7 @@ #include "client.h" #include "configuration.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "listeners/openurllistener.h" diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index c605b7796..bd710670c 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -27,7 +27,7 @@ #include "soundconsts.h" #include "soundmanager.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/dialogsmanager.h" #include "gui/viewport.h" diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 14a7d61f5..85ad80988 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -24,12 +24,10 @@ #include "client.h" -#include "input/inputaction.h" - -#include "listeners/wrongdatanoticelistener.h" - #include "enums/gui/dialogtype.h" +#include "enums/input/inputaction.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" @@ -39,6 +37,8 @@ #include "gui/widgets/passwordfield.h" #include "gui/widgets/radiobutton.h" +#include "listeners/wrongdatanoticelistener.h" + #include "net/logindata.h" #include "net/loginhandler.h" #include "net/registrationoptions.h" diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 4dc0d5fc0..26b12b0d1 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -27,7 +27,7 @@ #include "configuration.h" #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "net/download.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 4f8b4dc48..ca094f1b6 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -28,9 +28,9 @@ #include "enums/gui/progresscolorid.h" -#include "enums/net/updatetype.h" +#include "enums/input/inputaction.h" -#include "input/inputaction.h" +#include "enums/net/updatetype.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 73c1a4f4e..ee5af8123 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -25,7 +25,7 @@ #include "client.h" #include "settings.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/widgets/button.h" #include "gui/widgets/layout.h" diff --git a/src/input/inputaction.h b/src/input/inputaction.h deleted file mode 100644 index f398029e7..000000000 --- a/src/input/inputaction.h +++ /dev/null @@ -1,607 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2007 Joshua Langley - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2015 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef INPUT_INPUTACTION_H -#define INPUT_INPUTACTION_H - -#ifdef WIN32 -#undef ERROR -#undef IGNORE -#endif -namespace InputAction -{ - /** - * All the key functions. - * KEY_NO_VALUE is used in initialization, and should be unchanged. - * KEY_TOTAL should always be last (used as a conditional in loops). - * The key assignment view gets arranged according to the order of - * these values. - */ - enum Type - { - NO_VALUE = -1, - MOVE_UP, - MOVE_DOWN, - MOVE_LEFT, - MOVE_RIGHT, - ATTACK, - TARGET_ATTACK, - MOVE_TO_TARGET, - CHANGE_MOVE_TO_TARGET, - MOVE_TO_HOME, - SET_HOME, - MOVE_TO_POINT, - TALK, - STOP_ATTACK, - UNTARGET, - TARGET_MONSTER, - TARGET_NPC, - TARGET_PLAYER, - PICKUP, - CHANGE_PICKUP_TYPE, - HIDE_WINDOWS, - SIT, - SCREENSHOT, - CHANGE_TRADE, - PATHFIND, - OK, - QUIT, - SHORTCUTS_KEY, - SHORTCUT_1, - SHORTCUT_2, - SHORTCUT_3, - SHORTCUT_4, - SHORTCUT_5, - SHORTCUT_6, - SHORTCUT_7, - SHORTCUT_8, - SHORTCUT_9, - SHORTCUT_10, - SHORTCUT_11, - SHORTCUT_12, - SHORTCUT_13, - SHORTCUT_14, - SHORTCUT_15, - SHORTCUT_16, - SHORTCUT_17, - SHORTCUT_18, - SHORTCUT_19, - SHORTCUT_20, - WINDOW_HELP, - WINDOW_STATUS, - WINDOW_INVENTORY, - WINDOW_EQUIPMENT, - WINDOW_SKILL, - WINDOW_MINIMAP, - WINDOW_CHAT, - WINDOW_SHORTCUT, - WINDOW_SETUP, - WINDOW_DEBUG, - WINDOW_SOCIAL, - WINDOW_EMOTE_SHORTCUT, - WINDOW_OUTFIT, - WINDOW_SHOP, - WINDOW_DROP, - WINDOW_KILLS, - WINDOW_SPELLS, - UNUSED1, - WINDOW_ONLINE, - WINDOW_DIDYOUKNOW, - WINDOW_QUESTS, - PREV_SOCIAL_TAB, - NEXT_SOCIAL_TAB, - EMOTE, - EMOTE_1, - EMOTE_2, - EMOTE_3, - EMOTE_4, - EMOTE_5, - EMOTE_6, - EMOTE_7, - EMOTE_8, - EMOTE_9, - EMOTE_10, - EMOTE_11, - EMOTE_12, - EMOTE_13, - EMOTE_14, - EMOTE_15, - EMOTE_16, - EMOTE_17, - EMOTE_18, - EMOTE_19, - EMOTE_20, - EMOTE_21, - EMOTE_22, - EMOTE_23, - EMOTE_24, - EMOTE_25, - EMOTE_26, - EMOTE_27, - EMOTE_28, - EMOTE_29, - EMOTE_30, - EMOTE_31, - EMOTE_32, - EMOTE_33, - EMOTE_34, - EMOTE_35, - EMOTE_36, - EMOTE_37, - EMOTE_38, - EMOTE_39, - EMOTE_40, - EMOTE_41, - EMOTE_42, - EMOTE_43, - EMOTE_44, - EMOTE_45, - EMOTE_46, - EMOTE_47, - EMOTE_48, - WEAR_OUTFIT, - COPY_OUTFIT, - COPY_EQUIPED_OUTFIT, - OUTFIT_1, - OUTFIT_2, - OUTFIT_3, - OUTFIT_4, - OUTFIT_5, - OUTFIT_6, - OUTFIT_7, - OUTFIT_8, - OUTFIT_9, - OUTFIT_10, - OUTFIT_11, - OUTFIT_12, - OUTFIT_13, - OUTFIT_14, - OUTFIT_15, - OUTFIT_16, - OUTFIT_17, - OUTFIT_18, - OUTFIT_19, - OUTFIT_20, - OUTFIT_21, - OUTFIT_22, - OUTFIT_23, - OUTFIT_24, - OUTFIT_25, - OUTFIT_26, - OUTFIT_27, - OUTFIT_28, - OUTFIT_29, - OUTFIT_30, - OUTFIT_31, - OUTFIT_32, - OUTFIT_33, - OUTFIT_34, - OUTFIT_35, - OUTFIT_36, - OUTFIT_37, - OUTFIT_38, - OUTFIT_39, - OUTFIT_40, - OUTFIT_41, - OUTFIT_42, - OUTFIT_43, - OUTFIT_44, - OUTFIT_45, - OUTFIT_46, - OUTFIT_47, - OUTFIT_48, - MOVE_TO_POINT_1, - MOVE_TO_POINT_2, - MOVE_TO_POINT_3, - MOVE_TO_POINT_4, - MOVE_TO_POINT_5, - MOVE_TO_POINT_6, - MOVE_TO_POINT_7, - MOVE_TO_POINT_8, - MOVE_TO_POINT_9, - MOVE_TO_POINT_10, - MOVE_TO_POINT_11, - MOVE_TO_POINT_12, - MOVE_TO_POINT_13, - MOVE_TO_POINT_14, - MOVE_TO_POINT_15, - MOVE_TO_POINT_16, - MOVE_TO_POINT_17, - MOVE_TO_POINT_18, - MOVE_TO_POINT_19, - MOVE_TO_POINT_20, - MOVE_TO_POINT_21, - MOVE_TO_POINT_22, - MOVE_TO_POINT_23, - MOVE_TO_POINT_24, - MOVE_TO_POINT_25, - MOVE_TO_POINT_26, - MOVE_TO_POINT_27, - MOVE_TO_POINT_28, - MOVE_TO_POINT_29, - MOVE_TO_POINT_30, - MOVE_TO_POINT_31, - MOVE_TO_POINT_32, - MOVE_TO_POINT_33, - MOVE_TO_POINT_34, - MOVE_TO_POINT_35, - MOVE_TO_POINT_36, - MOVE_TO_POINT_37, - MOVE_TO_POINT_38, - MOVE_TO_POINT_39, - MOVE_TO_POINT_40, - MOVE_TO_POINT_41, - MOVE_TO_POINT_42, - MOVE_TO_POINT_43, - MOVE_TO_POINT_44, - MOVE_TO_POINT_45, - MOVE_TO_POINT_46, - MOVE_TO_POINT_47, - MOVE_TO_POINT_48, - TOGGLE_CHAT, - SCROLL_CHAT_UP, - SCROLL_CHAT_DOWN, - PREV_CHAT_TAB, - NEXT_CHAT_TAB, - CLOSE_CHAT_TAB, - CHAT_PREV_HISTORY, - CHAT_NEXT_HISTORY, - IGNORE_INPUT_1, - IGNORE_INPUT_2, - DIRECT_UP, - DIRECT_DOWN, - DIRECT_LEFT, - DIRECT_RIGHT, - CRAZY_MOVES, - CHANGE_CRAZY_MOVES_TYPE, - QUICK_DROP, - QUICK_DROPN, - SWITCH_QUICK_DROP, - MAGIC_INMA1, - MAGIC_ITENPLZ, - MAGIC_ATTACK, - SWITCH_MAGIC_ATTACK, - SWITCH_PVP_ATTACK, - INVERT_DIRECTION, - CHANGE_ATTACK_WEAPON_TYPE, - CHANGE_ATTACK_TYPE, - CHANGE_FOLLOW_MODE, - CHANGE_IMITATION_MODE, - DISABLE_GAME_MODIFIERS, - CHANGE_AUDIO, - AWAY, - RIGHT_CLICK, - CAMERA, - RESERVED1, - GUI_UP, - GUI_DOWN, - GUI_LEFT, - GUI_RIGHT, - GUI_SELECT, - GUI_SELECT2, - GUI_CANCEL, - GUI_HOME, - GUI_END, - GUI_DELETE, - GUI_BACKSPACE, - GUI_TAB, - GUI_PAGE_UP, - GUI_PAGE_DOWN, - GUI_INSERT, - GUI_MOD, - SAFE_VIDEO, - STOP_SIT, - SHOW_KEYBOARD, - SHOW_WINDOWS, - CHAT_MOD, - MOVE_FORWARD, - GUI_CTRL, - GUI_B, - GUI_C, - GUI_D, - GUI_E, - GUI_F, - GUI_H, - GUI_K, - GUI_U, - GUI_V, - GUI_W, - PREV_SHORTCUTS_TAB, - NEXT_SHORTCUTS_TAB, - PREV_COMMANDS_TAB, - NEXT_COMMANDS_TAB, - OPEN_TRADE, - GUI_F1, - GUI_F2, - GUI_F3, - GUI_F4, - GUI_F5, - GUI_F6, - GUI_F7, - GUI_F8, - GUI_F9, - GUI_F10, - GUI_F11, - GUI_F12, - WINDOW_ABOUT, - WINDOW_UPDATER, - TARGET_CLOSEST_MONSTER, - CLOSE_ALL_CHAT_TABS, - IGNORE_ALL_WHISPERS, - CHAT_ANNOUNCE, - IPC_TOGGLE, - WHERE, - WHO, - WHISPER, - QUERY, - CLEAR_CHAT_TAB, - IGNORE, - UNIGNORE, - FRIEND, - DISREGARD, - NEUTRAL, - BLACKLIST, - ENEMY, - ERASE, - CLEAN_GRAPHICS, - CLEAN_FONTS, - CREATE_PARTY, - CREATE_GUILD, - PARTY, - ME, - TOGGLE, - PRESENT, - PRINT_ALL, - MOVE, - TARGET, - ATTACK_HUMAN, - COMMAMD_OUTFIT, - COMMAMD_EMOTE, - COMMAND_EMOTE_PET, - AWAY_MESSAGE, - PSEUDO_AWAY, - FOLLOW, - NAVIGATE, - IMITATION, - SEND_MAIL, - TRADE, - PRICE_LOAD, - PRICE_SAVE, - CACHE_INFO, - DISCONNECT, - UNDRESS, - DIRS, - INFO, - WAIT, - UPTIME, - ADD_PRIORITY_ATTACK, - ADD_ATTACK, - REMOVE_ATTACK, - ADD_IGNORE_ATTACK, - DUMP, - SERVER_IGNORE_ALL, - SERVER_UNIGNORE_ALL, - SET_DROP, - ERROR, - DUMP_GRAPHICS, - DUMP_ENVIRONMENT, - DUMP_TESTS, - DUMP_OGL, - DUMP_GL, - DUMP_MODS, - URL, - OPEN_URL, - EXECUTE, - TEST_SDL_FONT, - ENABLE_HIGHLIGHT, - DISABLE_HIGHLIGHT, - DONT_REMOVE_NAME, - REMOVE_NAME, - DISABLE_AWAY, - ENABLE_AWAY, - TEST_PARTICLE, - CREATE_ITEMS, - TALK_RAW, - TALK_PET, - UPLOAD_CONFIG, - UPLOAD_SERVER_CONFIG, - UPLOAD_LOG, - GM, - HACK, - DEBUG_SPAWN, - PET_EMOTE, - PET_EMOTE_1, - PET_EMOTE_2, - PET_EMOTE_3, - PET_EMOTE_4, - PET_EMOTE_5, - PET_EMOTE_6, - PET_EMOTE_7, - PET_EMOTE_8, - PET_EMOTE_9, - PET_EMOTE_10, - PET_EMOTE_11, - PET_EMOTE_12, - PET_EMOTE_13, - PET_EMOTE_14, - PET_EMOTE_15, - PET_EMOTE_16, - PET_EMOTE_17, - PET_EMOTE_18, - PET_EMOTE_19, - PET_EMOTE_20, - PET_EMOTE_21, - PET_EMOTE_22, - PET_EMOTE_23, - PET_EMOTE_24, - PET_EMOTE_25, - PET_EMOTE_26, - PET_EMOTE_27, - PET_EMOTE_28, - PET_EMOTE_29, - PET_EMOTE_30, - PET_EMOTE_31, - PET_EMOTE_32, - PET_EMOTE_33, - PET_EMOTE_34, - PET_EMOTE_35, - PET_EMOTE_36, - PET_EMOTE_37, - PET_EMOTE_38, - PET_EMOTE_39, - PET_EMOTE_40, - PET_EMOTE_41, - PET_EMOTE_42, - PET_EMOTE_43, - PET_EMOTE_44, - PET_EMOTE_45, - PET_EMOTE_46, - PET_EMOTE_47, - PET_EMOTE_48, - CATCH_PET, - IGNORE_WHISPER, - UNIGNORE_WHISPER, - MERCENARY_FIRE, - TARGET_MERCENARY, - TARGET_PET, - PET_SET_NAME, - HOMUNCULUS_SET_NAME, - HOMUNCULUS_FIRE, - WINDOW_BANK, - PREV_INV_TAB, - NEXT_INV_TAB, - CONTEXT_MENU, - BUY, - SELL, - WHISPER2, - GUILD, - NUKE, - USE, - CHAT_ADD, - WHISPER_TEXT, - NAVIGATE_TO, - CAMERA_MOVE, - DROP_ITEM, - DROP_ITEM_ALL, - DROP_INV, - DROP_INV_ALL, - USE_INV, - INV_TO_STORAGE, - TRADE_ADD, - STORAGE_TO_INV, - ITEM_PROTECT, - ITEM_UNPROTECT, - KICK_PARTY, - ADD_TEXT, - KICK, - LEAVE_PARTY, - WARP, - CLEAR_CHAT, - PET_MOVE_UP, - PET_MOVE_DOWN, - PET_MOVE_LEFT, - PET_MOVE_RIGHT, - PET_DIRECT_UP, - PET_DIRECT_DOWN, - PET_DIRECT_LEFT, - PET_DIRECT_RIGHT, - PET_AI_START, - PET_AI_STOP, - CHAT_GENERAL_TAB, - CHAT_DEBUG_TAB, - CHAT_BATTLE_TAB, - CHAT_TRADE_TAB, - CHAT_LANG_TAB, - CHAT_GM_TAB, - CHAT_PARTY_TAB, - CHAT_GUILD_TAB, - DROP_CLEAR, - WINDOW_CART, - HEAL_MOST_DAMAGED, - PET_MOVE, - HOMUN_TALK, - HOMUN_SMILE, - HOMUN_EMOTE, - HOMUN_EMOTE_1, - HOMUN_EMOTE_2, - HOMUN_EMOTE_3, - HOMUN_EMOTE_4, - HOMUN_EMOTE_5, - HOMUN_EMOTE_6, - HOMUN_EMOTE_7, - HOMUN_EMOTE_8, - HOMUN_EMOTE_9, - HOMUN_EMOTE_10, - HOMUN_EMOTE_11, - HOMUN_EMOTE_12, - HOMUN_EMOTE_13, - HOMUN_EMOTE_14, - HOMUN_EMOTE_15, - HOMUN_EMOTE_16, - HOMUN_EMOTE_17, - HOMUN_EMOTE_18, - HOMUN_EMOTE_19, - HOMUN_EMOTE_20, - HOMUN_EMOTE_21, - HOMUN_EMOTE_22, - HOMUN_EMOTE_23, - HOMUN_EMOTE_24, - HOMUN_EMOTE_25, - HOMUN_EMOTE_26, - HOMUN_EMOTE_27, - HOMUN_EMOTE_28, - HOMUN_EMOTE_29, - HOMUN_EMOTE_30, - HOMUN_EMOTE_31, - HOMUN_EMOTE_32, - HOMUN_EMOTE_33, - HOMUN_EMOTE_34, - HOMUN_EMOTE_35, - HOMUN_EMOTE_36, - HOMUN_EMOTE_37, - HOMUN_EMOTE_38, - HOMUN_EMOTE_39, - HOMUN_EMOTE_40, - HOMUN_EMOTE_41, - HOMUN_EMOTE_42, - HOMUN_EMOTE_43, - HOMUN_EMOTE_44, - HOMUN_EMOTE_45, - HOMUN_EMOTE_46, - HOMUN_EMOTE_47, - HOMUN_EMOTE_48, - KICK_GUILD, - HAT, - CREATE_PUBLIC_ROOM, - JOIN_ROOM, - LEAVE_ROOM, - WINDOW_QUICK_SETTINGS, - WINDOW_MAIL, - CONF_SET, - SERVER_CONF_SET, - CONG_GET, - SERVER_CONG_GET, - TOTAL - }; -} // namespace InputAction - -#endif // INPUT_INPUTACTION_H diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h index 11757b630..9526e8cdd 100644 --- a/src/input/inputmanager.h +++ b/src/input/inputmanager.h @@ -21,7 +21,8 @@ #ifndef INPUT_INPUTMANAGER_H #define INPUT_INPUTMANAGER_H -#include "input/inputaction.h" +#include "enums/input/inputaction.h" + #include "input/inputfunction.h" #include "events/inputevent.h" diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp index 4cfc1c614..bb8c8b5c2 100644 --- a/src/input/pages/basic.cpp +++ b/src/input/pages/basic.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp index 5764d9e3c..33ba3929c 100644 --- a/src/input/pages/chat.cpp +++ b/src/input/pages/chat.cpp @@ -20,7 +20,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" diff --git a/src/input/pages/emotes.cpp b/src/input/pages/emotes.cpp index 194a4ed44..ddb80e7b9 100644 --- a/src/input/pages/emotes.cpp +++ b/src/input/pages/emotes.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/gui.cpp b/src/input/pages/gui.cpp index c9f3c2926..da9ce4f91 100644 --- a/src/input/pages/gui.cpp +++ b/src/input/pages/gui.cpp @@ -20,7 +20,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp index f8feb14dd..2156b9d27 100644 --- a/src/input/pages/move.cpp +++ b/src/input/pages/move.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 98714bd9a..433907347 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp index 20715a287..708587cbe 100644 --- a/src/input/pages/outfits.cpp +++ b/src/input/pages/outfits.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/shortcuts.cpp b/src/input/pages/shortcuts.cpp index f6745ca36..075532ced 100644 --- a/src/input/pages/shortcuts.cpp +++ b/src/input/pages/shortcuts.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp index 3f3f14462..49efc9794 100644 --- a/src/input/pages/windows.cpp +++ b/src/input/pages/windows.cpp @@ -23,7 +23,7 @@ #include "gui/setupactiondata.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "utils/gettext.h" diff --git a/src/listeners/inputactionreplaylistener.h b/src/listeners/inputactionreplaylistener.h index 97447a4e5..d1d762639 100644 --- a/src/listeners/inputactionreplaylistener.h +++ b/src/listeners/inputactionreplaylistener.h @@ -21,9 +21,9 @@ #ifndef LISTENERS_INPUTACTIONREPLAYLISTENER_H #define LISTENERS_INPUTACTIONREPLAYLISTENER_H -#include "listeners/actionlistener.h" +#include "enums/input/inputaction.h" -#include "input/inputaction.h" +#include "listeners/actionlistener.h" #include "localconsts.h" diff --git a/src/touchmanager.h b/src/touchmanager.h index 63a84ba5f..a8c83b8d7 100644 --- a/src/touchmanager.h +++ b/src/touchmanager.h @@ -23,7 +23,7 @@ #include "listeners/configlistener.h" -#include "input/inputaction.h" +#include "enums/input/inputaction.h" #include "gui/rect.h" -- cgit v1.2.3-70-g09d2