diff options
author | Christian Soffke <christian.soffke@gmail.com> | 2024-07-28 15:32:43 +0200 |
---|---|---|
committer | Christian Soffke <christian.soffke@gmail.com> | 2024-07-28 15:33:11 +0200 |
commit | 6d19214eeb13835f3343675417651e2eb03e270f (patch) | |
tree | 1f656094d58166ba7e5de256d7310018594726a4 | |
parent | 68fc5b4a7afa937f095f0c8415c9ad52e9fa1b1f (diff) | |
download | rockbox-6d19214eeb13835f3343675417651e2eb03e270f.tar.gz rockbox-6d19214eeb13835f3343675417651e2eb03e270f.zip |
list: remove redundant setting of icon callback to NULL
gui_synclist_init already does this for us
Change-Id: I1288d389c6191416cbc3da37a333b1cad84ee779
-rw-r--r-- | apps/gui/option_select.c | 1 | ||||
-rw-r--r-- | apps/playlist_viewer.c | 1 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.c | 1 | ||||
-rw-r--r-- | apps/plugins/keybox.c | 1 | ||||
-rw-r--r-- | apps/plugins/open_plugins.c | 1 | ||||
-rw-r--r-- | apps/plugins/puzzles/rockbox.c | 3 | ||||
-rw-r--r-- | apps/plugins/random_folder_advance_config.c | 1 | ||||
-rw-r--r-- | apps/plugins/rb_info.c | 1 | ||||
-rw-r--r-- | apps/plugins/tagcache/tagcache.c | 1 | ||||
-rw-r--r-- | apps/plugins/text_editor.c | 1 | ||||
-rw-r--r-- | apps/radio/presets.c | 1 | ||||
-rw-r--r-- | apps/screens.c | 1 |
12 files changed, 0 insertions, 14 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 1ce7fd5026..6d1d2df370 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -504,7 +504,6 @@ bool option_screen(const struct settings_list *setting, | |||
504 | title = P2STR(option_title); | 504 | title = P2STR(option_title); |
505 | 505 | ||
506 | gui_synclist_set_title(&lists, title, Icon_Questionmark); | 506 | gui_synclist_set_title(&lists, title, Icon_Questionmark); |
507 | gui_synclist_set_icon_callback(&lists, NULL); | ||
508 | if(global_settings.talk_menu) | 507 | if(global_settings.talk_menu) |
509 | gui_synclist_set_voice_callback(&lists, option_talk); | 508 | gui_synclist_set_voice_callback(&lists, option_talk); |
510 | 509 | ||
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index b0435365e2..70072f59f5 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -1219,7 +1219,6 @@ bool search_playlist(void) | |||
1219 | gui_synclist_init(&playlist_lists, playlist_search_callback_name, | 1219 | gui_synclist_init(&playlist_lists, playlist_search_callback_name, |
1220 | &s_data, false, 1, NULL); | 1220 | &s_data, false, 1, NULL); |
1221 | gui_synclist_set_title(&playlist_lists, str(LANG_SEARCH_RESULTS), NOICON); | 1221 | gui_synclist_set_title(&playlist_lists, str(LANG_SEARCH_RESULTS), NOICON); |
1222 | gui_synclist_set_icon_callback(&playlist_lists, NULL); | ||
1223 | if(global_settings.talk_file) | 1222 | if(global_settings.talk_file) |
1224 | gui_synclist_set_voice_callback(&playlist_lists, | 1223 | gui_synclist_set_voice_callback(&playlist_lists, |
1225 | global_settings.talk_file? | 1224 | global_settings.talk_file? |
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index bb35bec726..d6da369b9e 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c | |||
@@ -674,7 +674,6 @@ struct pgn_game_node* pgn_show_game_list(struct pgn_game_node* first_game){ | |||
674 | 674 | ||
675 | rb->gui_synclist_init(&games_list, &get_game_text, first_game, false, 1, NULL); | 675 | rb->gui_synclist_init(&games_list, &get_game_text, first_game, false, 1, NULL); |
676 | rb->gui_synclist_set_title(&games_list, rb->str(LANG_CHESSBOX_GAMES), NOICON); | 676 | rb->gui_synclist_set_title(&games_list, rb->str(LANG_CHESSBOX_GAMES), NOICON); |
677 | rb->gui_synclist_set_icon_callback(&games_list, NULL); | ||
678 | if (rb->global_settings->talk_menu) | 677 | if (rb->global_settings->talk_menu) |
679 | rb->gui_synclist_set_voice_callback(&games_list, speak_game_selection); | 678 | rb->gui_synclist_set_voice_callback(&games_list, speak_game_selection); |
680 | rb->gui_synclist_set_nb_items(&games_list, i); | 679 | rb->gui_synclist_set_nb_items(&games_list, i); |
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index cb2e23a94a..749d76af74 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c | |||
@@ -657,7 +657,6 @@ enum plugin_status plugin_start(const void *parameter) | |||
657 | rb->gui_synclist_init(&kb_list, &kb_list_cb, NULL, false, 1, NULL); | 657 | rb->gui_synclist_init(&kb_list, &kb_list_cb, NULL, false, 1, NULL); |
658 | 658 | ||
659 | rb->gui_synclist_set_title(&kb_list, "Keybox", NOICON); | 659 | rb->gui_synclist_set_title(&kb_list, "Keybox", NOICON); |
660 | rb->gui_synclist_set_icon_callback(&kb_list, NULL); | ||
661 | rb->gui_synclist_set_nb_items(&kb_list, 0); | 660 | rb->gui_synclist_set_nb_items(&kb_list, 0); |
662 | rb->gui_synclist_select_item(&kb_list, 0); | 661 | rb->gui_synclist_select_item(&kb_list, 0); |
663 | 662 | ||
diff --git a/apps/plugins/open_plugins.c b/apps/plugins/open_plugins.c index 66200df8a5..7206fe2a49 100644 --- a/apps/plugins/open_plugins.c +++ b/apps/plugins/open_plugins.c | |||
@@ -643,7 +643,6 @@ static void synclist_set(char* menu_id, int selection, int items, int sel_size) | |||
643 | rb->gui_synclist_init(&lists,list_get_name_cb, | 643 | rb->gui_synclist_init(&lists,list_get_name_cb, |
644 | menu_id, false, sel_size, NULL); | 644 | menu_id, false, sel_size, NULL); |
645 | 645 | ||
646 | rb->gui_synclist_set_icon_callback(&lists,NULL); | ||
647 | rb->gui_synclist_set_voice_callback(&lists, list_voice_cb); | 646 | rb->gui_synclist_set_voice_callback(&lists, list_voice_cb); |
648 | rb->gui_synclist_set_nb_items(&lists,items); | 647 | rb->gui_synclist_set_nb_items(&lists,items); |
649 | rb->gui_synclist_select_item(&lists, selection); | 648 | rb->gui_synclist_select_item(&lists, selection); |
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c index a3fe1c6e96..60e6548826 100644 --- a/apps/plugins/puzzles/rockbox.c +++ b/apps/plugins/puzzles/rockbox.c | |||
@@ -2455,7 +2455,6 @@ static int list_choose(const char *list_str, const char *title, int sel) | |||
2455 | struct gui_synclist list; | 2455 | struct gui_synclist list; |
2456 | 2456 | ||
2457 | rb->gui_synclist_init(&list, &config_choices_formatter, (void*)list_str, false, 1, NULL); | 2457 | rb->gui_synclist_init(&list, &config_choices_formatter, (void*)list_str, false, 1, NULL); |
2458 | rb->gui_synclist_set_icon_callback(&list, NULL); | ||
2459 | rb->gui_synclist_set_nb_items(&list, n); | 2458 | rb->gui_synclist_set_nb_items(&list, n); |
2460 | 2459 | ||
2461 | rb->gui_synclist_select_item(&list, sel); | 2460 | rb->gui_synclist_select_item(&list, sel); |
@@ -2668,7 +2667,6 @@ static bool config_menu_core(int which) | |||
2668 | struct gui_synclist list; | 2667 | struct gui_synclist list; |
2669 | 2668 | ||
2670 | rb->gui_synclist_init(&list, &config_formatter, config, false, 1, NULL); | 2669 | rb->gui_synclist_init(&list, &config_formatter, config, false, 1, NULL); |
2671 | rb->gui_synclist_set_icon_callback(&list, NULL); | ||
2672 | rb->gui_synclist_set_nb_items(&list, n); | 2670 | rb->gui_synclist_set_nb_items(&list, n); |
2673 | 2671 | ||
2674 | rb->gui_synclist_select_item(&list, 0); | 2672 | rb->gui_synclist_select_item(&list, 0); |
@@ -2763,7 +2761,6 @@ static int do_preset_menu(struct preset_menu *menu, char *title, int selected) | |||
2763 | struct gui_synclist list; | 2761 | struct gui_synclist list; |
2764 | 2762 | ||
2765 | rb->gui_synclist_init(&list, &preset_formatter, menu, false, 1, NULL); | 2763 | rb->gui_synclist_init(&list, &preset_formatter, menu, false, 1, NULL); |
2766 | rb->gui_synclist_set_icon_callback(&list, NULL); | ||
2767 | rb->gui_synclist_set_nb_items(&list, menu->n_entries); | 2764 | rb->gui_synclist_set_nb_items(&list, menu->n_entries); |
2768 | 2765 | ||
2769 | rb->gui_synclist_select_item(&list, selected); | 2766 | rb->gui_synclist_select_item(&list, selected); |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index 5688ff93d3..3d762c6db7 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -309,7 +309,6 @@ static int edit_list(void) | |||
309 | dirs_count = list->count; | 309 | dirs_count = list->count; |
310 | 310 | ||
311 | rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL); | 311 | rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL); |
312 | rb->gui_synclist_set_icon_callback(&lists,NULL); | ||
313 | rb->gui_synclist_set_nb_items(&lists,list->count); | 312 | rb->gui_synclist_set_nb_items(&lists,list->count); |
314 | rb->gui_synclist_select_item(&lists, 0); | 313 | rb->gui_synclist_select_item(&lists, 0); |
315 | 314 | ||
diff --git a/apps/plugins/rb_info.c b/apps/plugins/rb_info.c index a89cc658cc..31b06d6f75 100644 --- a/apps/plugins/rb_info.c +++ b/apps/plugins/rb_info.c | |||
@@ -518,7 +518,6 @@ static void synclist_set(char* menu_id, int selected_item, int items, int sel_si | |||
518 | { | 518 | { |
519 | rb->gui_synclist_set_title(&lists, NULL,-1); | 519 | rb->gui_synclist_set_title(&lists, NULL,-1); |
520 | } | 520 | } |
521 | rb->gui_synclist_set_icon_callback(&lists,NULL); | ||
522 | rb->gui_synclist_set_voice_callback(&lists, list_voice_cb); | 521 | rb->gui_synclist_set_voice_callback(&lists, list_voice_cb); |
523 | rb->gui_synclist_set_nb_items(&lists,items); | 522 | rb->gui_synclist_set_nb_items(&lists,items); |
524 | rb->gui_synclist_select_item(&lists, selected_item); | 523 | rb->gui_synclist_select_item(&lists, selected_item); |
diff --git a/apps/plugins/tagcache/tagcache.c b/apps/plugins/tagcache/tagcache.c index cce9efbed9..23651a4471 100644 --- a/apps/plugins/tagcache/tagcache.c +++ b/apps/plugins/tagcache/tagcache.c | |||
@@ -761,7 +761,6 @@ static int commit_menu(void) | |||
761 | int selection, ret = 0; | 761 | int selection, ret = 0; |
762 | 762 | ||
763 | rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL); | 763 | rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL); |
764 | rb->gui_synclist_set_icon_callback(&lists, NULL); | ||
765 | rb->gui_synclist_set_nb_items(&lists, 9); | 764 | rb->gui_synclist_set_nb_items(&lists, 9); |
766 | rb->gui_synclist_select_item(&lists, 0); | 765 | rb->gui_synclist_select_item(&lists, 0); |
767 | 766 | ||
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index 8740606c58..f7d62ca07a 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c | |||
@@ -212,7 +212,6 @@ static bool save_changes(int overwrite) | |||
212 | static void setup_lists(struct gui_synclist *lists, int sel) | 212 | static void setup_lists(struct gui_synclist *lists, int sel) |
213 | { | 213 | { |
214 | rb->gui_synclist_init(lists,list_get_name_cb,0, false, 1, NULL); | 214 | rb->gui_synclist_init(lists,list_get_name_cb,0, false, 1, NULL); |
215 | rb->gui_synclist_set_icon_callback(lists,NULL); | ||
216 | rb->gui_synclist_set_nb_items(lists,line_count); | 215 | rb->gui_synclist_set_nb_items(lists,line_count); |
217 | rb->gui_synclist_select_item(lists, sel); | 216 | rb->gui_synclist_select_item(lists, sel); |
218 | rb->gui_synclist_draw(lists); | 217 | rb->gui_synclist_draw(lists); |
diff --git a/apps/radio/presets.c b/apps/radio/presets.c index 046525c3b6..b87d2dd285 100644 --- a/apps/radio/presets.c +++ b/apps/radio/presets.c | |||
@@ -485,7 +485,6 @@ int handle_radio_presets(void) | |||
485 | 485 | ||
486 | gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL); | 486 | gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL); |
487 | gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON); | 487 | gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON); |
488 | gui_synclist_set_icon_callback(&lists, NULL); | ||
489 | if(global_settings.talk_file) | 488 | if(global_settings.talk_file) |
490 | gui_synclist_set_voice_callback(&lists, presets_speak_name); | 489 | gui_synclist_set_voice_callback(&lists, presets_speak_name); |
491 | gui_synclist_set_nb_items(&lists, num_presets); | 490 | gui_synclist_set_nb_items(&lists, num_presets); |
diff --git a/apps/screens.c b/apps/screens.c index d6f3ea6304..e3a73f3de2 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -900,7 +900,6 @@ int view_runtime(void) | |||
900 | gui_synclist_set_title(&lists, str(LANG_RUNNING_TIME), NOICON); | 900 | gui_synclist_set_title(&lists, str(LANG_RUNNING_TIME), NOICON); |
901 | if(global_settings.talk_menu) | 901 | if(global_settings.talk_menu) |
902 | gui_synclist_set_voice_callback(&lists, runtime_speak_data); | 902 | gui_synclist_set_voice_callback(&lists, runtime_speak_data); |
903 | gui_synclist_set_icon_callback(&lists, NULL); | ||
904 | gui_synclist_set_nb_items(&lists, 4); | 903 | gui_synclist_set_nb_items(&lists, 4); |
905 | 904 | ||
906 | while(1) | 905 | while(1) |