diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/setupinputpages.cpp | 18 | ||||
| -rw-r--r-- | src/gui/touchactiondata.cpp | 8 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_input.cpp | 9 | ||||
| -rw-r--r-- | src/input/pages/pages.cpp | 18 | ||||
| -rw-r--r-- | src/input/pages/pages.h | 18 |
5 files changed, 36 insertions, 35 deletions
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp index 67615aa1a..0ae53a783 100644 --- a/src/gui/setupinputpages.cpp +++ b/src/gui/setupinputpages.cpp @@ -56,13 +56,13 @@ const char *const pages[] = SetupActionData *const setupActionData[] = { - setupActionData0, - setupActionData7, - setupActionData1, - setupActionData2, - setupActionData3, - setupActionData4, - setupActionData5, - setupActionData6, - setupActionData8 + setupActionDataBasic, + setupActionDataMove, + setupActionDataShortcuts, + setupActionDataWindows, + setupActionDataEmotes, + setupActionDataOutfits, + setupActionDataChat, + setupActionDataOther, + setupActionDataGui }; diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp index 6d6be78a6..3d64fdf25 100644 --- a/src/gui/touchactiondata.cpp +++ b/src/gui/touchactiondata.cpp @@ -28,8 +28,8 @@ SetupActionData *const touchActionData[] = { - setupActionData0, - setupActionData2, - setupActionData5, - setupActionData6 + setupActionDataBasic, + setupActionDataWindows, + setupActionDataChat, + setupActionDataOther }; diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 39d944a87..7c4a548c9 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -363,16 +363,17 @@ void Setup_Input::fixTranslation(SetupActionData *const actionDatas, void Setup_Input::fixTranslations() { - fixTranslation(setupActionData1, static_cast<int>(InputAction::SHORTCUT_1), + fixTranslation(setupActionDataShortcuts, + static_cast<int>(InputAction::SHORTCUT_1), static_cast<int>(InputAction::SHORTCUT_20), "Item Shortcut %d"); - fixTranslation(setupActionData3, static_cast<int>(InputAction::EMOTE_1), + fixTranslation(setupActionDataEmotes, static_cast<int>(InputAction::EMOTE_1), static_cast<int>(InputAction::EMOTE_48), "Emote Shortcut %d"); - fixTranslation(setupActionData4, static_cast<int>(InputAction::OUTFIT_1), + fixTranslation(setupActionDataOutfits, static_cast<int>(InputAction::OUTFIT_1), static_cast<int>(InputAction::OUTFIT_48), "Outfit Shortcut %d"); - fixTranslation(setupActionData7, static_cast<int>( + fixTranslation(setupActionDataMove, static_cast<int>( InputAction::MOVE_TO_POINT_1), static_cast<int>(InputAction::MOVE_TO_POINT_48), "Move to point Shortcut %d"); diff --git a/src/input/pages/pages.cpp b/src/input/pages/pages.cpp index 0cf9da6a0..8894c7791 100644 --- a/src/input/pages/pages.cpp +++ b/src/input/pages/pages.cpp @@ -31,7 +31,7 @@ #include "debug.h" -SetupActionData setupActionData0[] = +SetupActionData setupActionDataBasic[] = { { // TRANSLATORS: input action name @@ -202,7 +202,7 @@ SetupActionData setupActionData0[] = } }; -SetupActionData setupActionData1[] = +SetupActionData setupActionDataShortcuts[] = { { // TRANSLATORS: input action name @@ -349,7 +349,7 @@ SetupActionData setupActionData1[] = } }; -SetupActionData setupActionData2[] = +SetupActionData setupActionDataWindows[] = { { // TRANSLATORS: input action name @@ -544,7 +544,7 @@ SetupActionData setupActionData2[] = } }; -SetupActionData setupActionData3[] = +SetupActionData setupActionDataEmotes[] = { { // TRANSLATORS: input action name @@ -859,7 +859,7 @@ SetupActionData setupActionData3[] = } }; -SetupActionData setupActionData4[] = +SetupActionData setupActionDataOutfits[] = { { // TRANSLATORS: input action name @@ -1186,7 +1186,7 @@ SetupActionData setupActionData4[] = } }; -SetupActionData setupActionData5[] = +SetupActionData setupActionDataChat[] = { { // TRANSLATORS: input action name @@ -1310,7 +1310,7 @@ SetupActionData setupActionData5[] = } }; -SetupActionData setupActionData6[] = +SetupActionData setupActionDataOther[] = { { // TRANSLATORS: input action name @@ -1481,7 +1481,7 @@ SetupActionData setupActionData6[] = } }; -SetupActionData setupActionData7[] = +SetupActionData setupActionDataMove[] = { { // TRANSLATORS: input action name @@ -1820,7 +1820,7 @@ SetupActionData setupActionData7[] = } }; -SetupActionData setupActionData8[] = +SetupActionData setupActionDataGui[] = { { // TRANSLATORS: input action name diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h index 626df6d54..0d312f55c 100644 --- a/src/input/pages/pages.h +++ b/src/input/pages/pages.h @@ -26,14 +26,14 @@ #include "gui/setupactiondata.h" -extern SetupActionData setupActionData0[]; -extern SetupActionData setupActionData1[]; -extern SetupActionData setupActionData2[]; -extern SetupActionData setupActionData3[]; -extern SetupActionData setupActionData4[]; -extern SetupActionData setupActionData5[]; -extern SetupActionData setupActionData6[]; -extern SetupActionData setupActionData7[]; -extern SetupActionData setupActionData8[]; +extern SetupActionData setupActionDataBasic[]; +extern SetupActionData setupActionDataShortcuts[]; +extern SetupActionData setupActionDataWindows[]; +extern SetupActionData setupActionDataEmotes[]; +extern SetupActionData setupActionDataOutfits[]; +extern SetupActionData setupActionDataChat[]; +extern SetupActionData setupActionDataOther[]; +extern SetupActionData setupActionDataMove[]; +extern SetupActionData setupActionDataGui[]; #endif // INPUT_PAGES_PAGES_H |