Const police raid, making a lot of pointers to lang strings const and removing some ugly casting

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17251 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 7 deletions

diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 8e4ee61aee..57db13f52c 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -55,15 +55,18 @@ static const struct browse_folder_info config = {ROCKBOX_DIR, SHOW_CFG};
 
 static int reset_settings(void)
 {
-    const unsigned char *lines[]={ID2P(LANG_RESET_ASK)};
-    const unsigned char *yes_lines[]={
-        str(LANG_SETTINGS),
+    static const char *lines[]={ID2P(LANG_RESET_ASK)};
+    static const char *yes_lines[]={
+        ID2P(LANG_SETTINGS),
         ID2P(LANG_RESET_DONE_CLEAR)
     };
-    const unsigned char *no_lines[]={yes_lines[0], ID2P(LANG_CANCEL)};
-    struct text_message message={(char **)lines, 1};
-    struct text_message yes_message={(char **)yes_lines, 2};
-    struct text_message no_message={(char **)no_lines, 2};
+    static const char *no_lines[]={
+        ID2P(LANG_SETTINGS),
+        ID2P(LANG_CANCEL)
+    };
+    static const struct text_message message={lines, 1};
+    static const struct text_message yes_message={yes_lines, 2};
+    static const struct text_message no_message={no_lines, 2};
 
     switch(gui_syncyesno_run(&message, &yes_message, &no_message))
     {