From ddcdc184c2d9828e647a0734615e6e217332ad5e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 22 Aug 2014 19:21:24 +0300
Subject: Rename setupactiondata array names.

---
 src/gui/setupinputpages.cpp          | 18 +++++++++---------
 src/gui/touchactiondata.cpp          |  8 ++++----
 src/gui/widgets/tabs/setup_input.cpp |  9 +++++----
 3 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/gui')

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");
-- 
cgit v1.2.3-70-g09d2