From 884b697393b676a52fe6f801fd50b4153c14cf10 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 15 Nov 2015 23:08:52 +0100
Subject: [PATCH] Get rid of hardcoded strings in menu_setting.c

---
 menu/intl/menu_hash_us.c | 10 ++++++++++
 menu/menu_hash.h         |  9 +++++++++
 menu/menu_setting.c      | 28 +++-------------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index 8dfe2b7ce3..8e5aef6374 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -26,6 +26,10 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
 {
    switch (hash)
    {
+      case MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL:
+         return "cheevos_test_unofficial";
+      case MENU_LABEL_CHEEVOS_ENABLE:
+         return "cheevos_enable";
       case MENU_LABEL_INPUT_ICADE_ENABLE:
          return "input_icade_enable";
       case MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
@@ -694,6 +698,10 @@ const char *menu_hash_to_str_us(uint32_t hash)
 
    switch (hash)
    {
+      case MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
+         return "Test unofficial";
+      case MENU_LABEL_VALUE_CHEEVOS_SETTINGS:
+         return "Retro Achievements";
       case MENU_LABEL_VALUE_INPUT_ICADE_ENABLE:
          return "Keyboard Gamepad Mapping Enable";
       case MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
@@ -1600,6 +1608,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
          return "Search:";
       case MENU_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
          return "Use Builtin Image Viewer";
+      case MENU_LABEL_VALUE_ENABLE:
+         return "Enable";
       default:
          break;
    }
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 8e9659ff03..463a668f7f 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -22,6 +22,15 @@
 extern "C" {
 #endif
 
+#define MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL                                     0xa1ae28f0U
+#define MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL                               0x0698e665U
+
+#define MENU_LABEL_VALUE_ENABLE                                                0xb0d05f8cU
+
+#define MENU_LABEL_VALUE_CHEEVOS_SETTINGS                                      0x1fe3be93U
+
+#define MENU_LABEL_CHEEVOS_ENABLE                                              0x2748f998U
+
 #define MENU_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE                   0x507c52f3U
 #define MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE                         0x3665cbb0U
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index a6766f1d06..c399bbbb5d 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -5731,23 +5731,14 @@ static bool setting_append_list_cheevos_options(
    settings_t *settings = config_get_ptr();
 
    START_GROUP(group_info,
-#if 0
          menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_SETTINGS),
-#else
-         "Retro Achievements",
-#endif
          parent_group);
    START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group);
 
    CONFIG_BOOL(
          settings->cheevos.enable,
-#if 0
          menu_hash_to_str(MENU_LABEL_CHEEVOS_ENABLE),
-         menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_ENABLE),
-#else
-         "cheevos_enable",
-         "Enable",
-#endif
+         menu_hash_to_str(MENU_LABEL_VALUE_ENABLE),
          false,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),
@@ -5759,13 +5750,8 @@ static bool setting_append_list_cheevos_options(
 
    CONFIG_BOOL(
          settings->cheevos.test_unofficial,
-#if 0
          menu_hash_to_str(MENU_LABEL_CHEEVOS_TEST_UNOFFICIAL),
          menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL),
-#else
-         "cheevos_test_unofficial",
-         "Test unofficial",
-#endif
          true,
          menu_hash_to_str(MENU_VALUE_OFF),
          menu_hash_to_str(MENU_VALUE_ON),
@@ -6112,11 +6098,7 @@ static bool setting_append_list_accounts_cheevos_options(
    CONFIG_STRING(
          settings->cheevos.username,
          menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME),
-#if 0
-         menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME),
-#else
-         "Username",
-#endif
+         menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME),
          "",
          group_info.name,
          subgroup_info.name,
@@ -6128,11 +6110,7 @@ static bool setting_append_list_accounts_cheevos_options(
    CONFIG_STRING(
          settings->cheevos.password,
          menu_hash_to_str(MENU_LABEL_CHEEVOS_PASSWORD),
-#if 0
-         menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_PASSWORD),
-#else
-         "Password",
-#endif
+         menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD),
          "",
          group_info.name,
          subgroup_info.name,