diff options
author | Björn Stenberg <bjorn@haxx.se> | 2011-10-15 19:35:02 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2011-10-15 19:35:02 +0000 |
commit | 0942e2a0f71d809c1d7f2606cbddfa1d4beacb87 (patch) | |
tree | ce2fbdea468cb8223598c546fee765a10660a0b0 /apps/gui | |
parent | f301ac05f9dd6ace2355fa822bd61d454c2c4f28 (diff) | |
download | rockbox-0942e2a0f71d809c1d7f2606cbddfa1d4beacb87.tar.gz rockbox-0942e2a0f71d809c1d7f2606cbddfa1d4beacb87.zip |
Changed the FOR_NB_SCREENS macro to always be a for loop that declares its own loop variable. This removes the need to declare this variable in the outer scope.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30756 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/bitmap/list.c | 1 | ||||
-rw-r--r-- | apps/gui/charcell/list.c | 1 | ||||
-rw-r--r-- | apps/gui/color_picker.c | 1 | ||||
-rw-r--r-- | apps/gui/list.c | 18 | ||||
-rw-r--r-- | apps/gui/pitchscreen.c | 2 | ||||
-rw-r--r-- | apps/gui/quickscreen.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_backdrops.c | 7 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 7 | ||||
-rw-r--r-- | apps/gui/splash.c | 1 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.c | 1 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 | ||||
-rw-r--r-- | apps/gui/usb_screen.c | 2 | ||||
-rw-r--r-- | apps/gui/viewport.c | 4 | ||||
-rw-r--r-- | apps/gui/wps.c | 6 | ||||
-rw-r--r-- | apps/gui/yesno.c | 2 |
16 files changed, 12 insertions, 48 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index b4ecd79c40..69cda9fa85 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -68,7 +68,6 @@ bool list_display_title(struct gui_synclist *list, enum screen_type screen); | |||
68 | 68 | ||
69 | void gui_synclist_scroll_stop(struct gui_synclist *lists) | 69 | void gui_synclist_scroll_stop(struct gui_synclist *lists) |
70 | { | 70 | { |
71 | int i; | ||
72 | FOR_NB_SCREENS(i) | 71 | FOR_NB_SCREENS(i) |
73 | { | 72 | { |
74 | screens[i].scroll_stop(&list_text[i]); | 73 | screens[i].scroll_stop(&list_text[i]); |
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c index 15112adb51..3d7f876adc 100644 --- a/apps/gui/charcell/list.c +++ b/apps/gui/charcell/list.c | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | void gui_synclist_scroll_stop(struct gui_synclist *lists) | 41 | void gui_synclist_scroll_stop(struct gui_synclist *lists) |
42 | { | 42 | { |
43 | int i; | ||
44 | (void)lists; | 43 | (void)lists; |
45 | FOR_NB_SCREENS(i) | 44 | FOR_NB_SCREENS(i) |
46 | { | 45 | { |
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 044edd7789..907b1744c5 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -420,7 +420,6 @@ bool set_color(struct screen *display, char *title, | |||
420 | } | 420 | } |
421 | else | 421 | else |
422 | { | 422 | { |
423 | int i; | ||
424 | FOR_NB_SCREENS(i) | 423 | FOR_NB_SCREENS(i) |
425 | draw_screen(&screens[i], title, &rgb, slider); | 424 | draw_screen(&screens[i], title, &rgb, slider); |
426 | } | 425 | } |
diff --git a/apps/gui/list.c b/apps/gui/list.c index e42cbb8e64..1a90ff9e40 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -80,7 +80,7 @@ void list_init(void) | |||
80 | 80 | ||
81 | static void list_init_viewports(struct gui_synclist *list) | 81 | static void list_init_viewports(struct gui_synclist *list) |
82 | { | 82 | { |
83 | int i, parent_used; | 83 | int parent_used; |
84 | 84 | ||
85 | parent_used = (*list->parent != &parent[SCREEN_MAIN]); | 85 | parent_used = (*list->parent != &parent[SCREEN_MAIN]); |
86 | 86 | ||
@@ -156,7 +156,6 @@ void gui_synclist_init(struct gui_synclist * gui_list, | |||
156 | int selected_size, struct viewport list_parent[NB_SCREENS] | 156 | int selected_size, struct viewport list_parent[NB_SCREENS] |
157 | ) | 157 | ) |
158 | { | 158 | { |
159 | int i; | ||
160 | gui_list->callback_get_item_icon = NULL; | 159 | gui_list->callback_get_item_icon = NULL; |
161 | gui_list->callback_get_item_name = callback_get_item_name; | 160 | gui_list->callback_get_item_name = callback_get_item_name; |
162 | gui_list->callback_speak_item = NULL; | 161 | gui_list->callback_speak_item = NULL; |
@@ -237,7 +236,6 @@ int gui_list_get_item_offset(struct gui_synclist * gui_list, | |||
237 | */ | 236 | */ |
238 | void gui_synclist_draw(struct gui_synclist *gui_list) | 237 | void gui_synclist_draw(struct gui_synclist *gui_list) |
239 | { | 238 | { |
240 | int i; | ||
241 | if (list_is_dirty(gui_list)) | 239 | if (list_is_dirty(gui_list)) |
242 | { | 240 | { |
243 | list_init_viewports(gui_list); | 241 | list_init_viewports(gui_list); |
@@ -345,7 +343,6 @@ void gui_synclist_speak_item(struct gui_synclist *lists) | |||
345 | */ | 343 | */ |
346 | void gui_synclist_select_item(struct gui_synclist * gui_list, int item_number) | 344 | void gui_synclist_select_item(struct gui_synclist * gui_list, int item_number) |
347 | { | 345 | { |
348 | int i; | ||
349 | if (item_number >= gui_list->nb_items || item_number < 0) | 346 | if (item_number >= gui_list->nb_items || item_number < 0) |
350 | return; | 347 | return; |
351 | if (item_number != gui_list->selected_item) | 348 | if (item_number != gui_list->selected_item) |
@@ -380,13 +377,12 @@ static void gui_list_select_at_offset(struct gui_synclist * gui_list, | |||
380 | } | 377 | } |
381 | else if (gui_list->show_selection_marker == false) | 378 | else if (gui_list->show_selection_marker == false) |
382 | { | 379 | { |
383 | int i, nb_lines, screen_top; | ||
384 | FOR_NB_SCREENS(i) | 380 | FOR_NB_SCREENS(i) |
385 | { | 381 | { |
386 | nb_lines = list_get_nb_lines(gui_list, i); | 382 | int nb_lines = list_get_nb_lines(gui_list, i); |
387 | if (offset > 0) | 383 | if (offset > 0) |
388 | { | 384 | { |
389 | screen_top = MAX(0, gui_list->nb_items - nb_lines); | 385 | int screen_top = MAX(0, gui_list->nb_items - nb_lines); |
390 | gui_list->start_item[i] = MIN(screen_top, gui_list->start_item[i] + | 386 | gui_list->start_item[i] = MIN(screen_top, gui_list->start_item[i] + |
391 | gui_list->selected_size); | 387 | gui_list->selected_size); |
392 | gui_list->selected_item = gui_list->start_item[i]; | 388 | gui_list->selected_item = gui_list->start_item[i]; |
@@ -452,7 +448,6 @@ void gui_synclist_set_title(struct gui_synclist * gui_list, | |||
452 | gui_list->title = title; | 448 | gui_list->title = title; |
453 | gui_list->title_icon = icon; | 449 | gui_list->title_icon = icon; |
454 | #ifdef HAVE_LCD_BITMAP | 450 | #ifdef HAVE_LCD_BITMAP |
455 | int i; | ||
456 | FOR_NB_SCREENS(i) | 451 | FOR_NB_SCREENS(i) |
457 | sb_set_title_text(title, icon, i); | 452 | sb_set_title_text(title, icon, i); |
458 | #endif | 453 | #endif |
@@ -461,9 +456,6 @@ void gui_synclist_set_title(struct gui_synclist * gui_list, | |||
461 | 456 | ||
462 | void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items) | 457 | void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items) |
463 | { | 458 | { |
464 | #ifdef HAVE_LCD_BITMAP | ||
465 | int i; | ||
466 | #endif | ||
467 | lists->nb_items = nb_items; | 459 | lists->nb_items = nb_items; |
468 | #ifdef HAVE_LCD_BITMAP | 460 | #ifdef HAVE_LCD_BITMAP |
469 | FOR_NB_SCREENS(i) | 461 | FOR_NB_SCREENS(i) |
@@ -531,7 +523,6 @@ void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll) | |||
531 | */ | 523 | */ |
532 | static void gui_synclist_scroll_right(struct gui_synclist * lists) | 524 | static void gui_synclist_scroll_right(struct gui_synclist * lists) |
533 | { | 525 | { |
534 | int i; | ||
535 | FOR_NB_SCREENS(i) | 526 | FOR_NB_SCREENS(i) |
536 | { | 527 | { |
537 | /* FIXME: This is a fake right boundry limiter. there should be some | 528 | /* FIXME: This is a fake right boundry limiter. there should be some |
@@ -549,7 +540,6 @@ static void gui_synclist_scroll_right(struct gui_synclist * lists) | |||
549 | */ | 540 | */ |
550 | static void gui_synclist_scroll_left(struct gui_synclist * lists) | 541 | static void gui_synclist_scroll_left(struct gui_synclist * lists) |
551 | { | 542 | { |
552 | int i; | ||
553 | FOR_NB_SCREENS(i) | 543 | FOR_NB_SCREENS(i) |
554 | { | 544 | { |
555 | lists->offset_position[i] -= offset_step; | 545 | lists->offset_position[i] -= offset_step; |
@@ -817,7 +807,7 @@ static const char* simplelist_static_getname(int item, | |||
817 | bool simplelist_show_list(struct simplelist_info *info) | 807 | bool simplelist_show_list(struct simplelist_info *info) |
818 | { | 808 | { |
819 | struct gui_synclist lists; | 809 | struct gui_synclist lists; |
820 | int action, old_line_count = simplelist_line_count, i; | 810 | int action, old_line_count = simplelist_line_count; |
821 | list_get_name *getname; | 811 | list_get_name *getname; |
822 | int wrap = LIST_WRAP_UNLESS_HELD; | 812 | int wrap = LIST_WRAP_UNLESS_HELD; |
823 | if (info->get_name) | 813 | if (info->get_name) |
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c index 421ec04676..13da415505 100644 --- a/apps/gui/pitchscreen.c +++ b/apps/gui/pitchscreen.c | |||
@@ -733,7 +733,7 @@ static int pitchscreen_do_touchscreen(struct viewport vps[]) | |||
733 | 733 | ||
734 | int gui_syncpitchscreen_run(void) | 734 | int gui_syncpitchscreen_run(void) |
735 | { | 735 | { |
736 | int button, i; | 736 | int button; |
737 | int32_t pitch = sound_get_pitch(); | 737 | int32_t pitch = sound_get_pitch(); |
738 | int32_t semitone; | 738 | int32_t semitone; |
739 | 739 | ||
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index e97d82196d..acef2c32a0 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -307,7 +307,7 @@ static int quickscreen_touchscreen_button(const struct viewport | |||
307 | 307 | ||
308 | static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter) | 308 | static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter) |
309 | { | 309 | { |
310 | int button, i, j; | 310 | int button; |
311 | struct viewport parent[NB_SCREENS]; | 311 | struct viewport parent[NB_SCREENS]; |
312 | struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT]; | 312 | struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT]; |
313 | struct viewport vp_icons[NB_SCREENS]; | 313 | struct viewport vp_icons[NB_SCREENS]; |
@@ -367,7 +367,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
367 | cond_talk_ids_fq(VOICE_OK); | 367 | cond_talk_ids_fq(VOICE_OK); |
368 | FOR_NB_SCREENS(i) | 368 | FOR_NB_SCREENS(i) |
369 | { /* stop scrolling before exiting */ | 369 | { /* stop scrolling before exiting */ |
370 | for (j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) | 370 | for (int j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) |
371 | screens[i].scroll_stop(&vps[i][j]); | 371 | screens[i].scroll_stop(&vps[i][j]); |
372 | viewportmanager_theme_undo(i, true); | 372 | viewportmanager_theme_undo(i, true); |
373 | } | 373 | } |
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index 4701f51b19..5d98e29128 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c | |||
@@ -46,10 +46,9 @@ static int current_lcd_backdrop[NB_SCREENS]; | |||
46 | 46 | ||
47 | static int buflib_move_callback(int handle, void* current, void* new) | 47 | static int buflib_move_callback(int handle, void* current, void* new) |
48 | { | 48 | { |
49 | int i; | ||
50 | if (handle == handle_being_loaded) | 49 | if (handle == handle_being_loaded) |
51 | return BUFLIB_CB_CANNOT_MOVE; | 50 | return BUFLIB_CB_CANNOT_MOVE; |
52 | for (i=0; i<NB_BDROPS; i++) | 51 | for (int i=0; i<NB_BDROPS; i++) |
53 | { | 52 | { |
54 | if (backdrops[i].buffer == current) | 53 | if (backdrops[i].buffer == current) |
55 | { | 54 | { |
@@ -65,9 +64,7 @@ static struct buflib_callbacks buflib_ops = {buflib_move_callback, NULL}; | |||
65 | static bool first_go = true; | 64 | static bool first_go = true; |
66 | void skin_backdrop_init(void) | 65 | void skin_backdrop_init(void) |
67 | { | 66 | { |
68 | int i; | 67 | for (int i=0; i<NB_BDROPS; i++) |
69 | |||
70 | for (i=0; i<NB_BDROPS; i++) | ||
71 | { | 68 | { |
72 | if (first_go) | 69 | if (first_go) |
73 | backdrops[i].buflib_handle = -1; | 70 | backdrops[i].buflib_handle = -1; |
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index f7a0888afc..95e4310de9 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -692,7 +692,6 @@ int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout) | |||
692 | (void)skin; /* silence charcell warning */ | 692 | (void)skin; /* silence charcell warning */ |
693 | int button = ACTION_NONE; | 693 | int button = ACTION_NONE; |
694 | #ifdef HAVE_LCD_BITMAP | 694 | #ifdef HAVE_LCD_BITMAP |
695 | int i; | ||
696 | /* when the peak meter is enabled we want to have a | 695 | /* when the peak meter is enabled we want to have a |
697 | few extra updates to make it look smooth. On the | 696 | few extra updates to make it look smooth. On the |
698 | other hand we don't want to waste energy if it | 697 | other hand we don't want to waste energy if it |
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index 03afbc5195..bd875fe9e4 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c | |||
@@ -84,7 +84,7 @@ static struct gui_skin { | |||
84 | 84 | ||
85 | void gui_sync_skin_init(void) | 85 | void gui_sync_skin_init(void) |
86 | { | 86 | { |
87 | int i, j; | 87 | int j; |
88 | for(j=0; j<SKINNABLE_SCREENS_COUNT; j++) | 88 | for(j=0; j<SKINNABLE_SCREENS_COUNT; j++) |
89 | { | 89 | { |
90 | FOR_NB_SCREENS(i) | 90 | FOR_NB_SCREENS(i) |
@@ -105,7 +105,7 @@ void gui_sync_skin_init(void) | |||
105 | 105 | ||
106 | void skin_unload_all(void) | 106 | void skin_unload_all(void) |
107 | { | 107 | { |
108 | int i, j; | 108 | int j; |
109 | 109 | ||
110 | for(j=0; j<SKINNABLE_SCREENS_COUNT; j++) | 110 | for(j=0; j<SKINNABLE_SCREENS_COUNT; j++) |
111 | { | 111 | { |
@@ -123,7 +123,7 @@ void skin_unload_all(void) | |||
123 | 123 | ||
124 | void settings_apply_skins(void) | 124 | void settings_apply_skins(void) |
125 | { | 125 | { |
126 | int i, j; | 126 | int i; |
127 | 127 | ||
128 | skin_unload_all(); | 128 | skin_unload_all(); |
129 | /* Make sure each skin is loaded */ | 129 | /* Make sure each skin is loaded */ |
@@ -267,7 +267,6 @@ bool skin_do_full_update(enum skinnable_screens skin, | |||
267 | /* tell a skin to do a full update next time */ | 267 | /* tell a skin to do a full update next time */ |
268 | void skin_request_full_update(enum skinnable_screens skin) | 268 | void skin_request_full_update(enum skinnable_screens skin) |
269 | { | 269 | { |
270 | int i; | ||
271 | FOR_NB_SCREENS(i) | 270 | FOR_NB_SCREENS(i) |
272 | skins[skin][i].needs_full_update = true; | 271 | skins[skin][i].needs_full_update = true; |
273 | } | 272 | } |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 4ce751ca74..ad6625fec6 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -200,7 +200,6 @@ end: | |||
200 | void splashf(int ticks, const char *fmt, ...) | 200 | void splashf(int ticks, const char *fmt, ...) |
201 | { | 201 | { |
202 | va_list ap; | 202 | va_list ap; |
203 | int i; | ||
204 | 203 | ||
205 | /* If fmt is a lang ID then get the corresponding string (which | 204 | /* If fmt is a lang ID then get the corresponding string (which |
206 | still might contain % place holders). */ | 205 | still might contain % place holders). */ |
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index ad9a391e4c..7850e7cc27 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -268,7 +268,6 @@ char* sb_create_from_settings(enum screen_type screen) | |||
268 | 268 | ||
269 | void sb_skin_init(void) | 269 | void sb_skin_init(void) |
270 | { | 270 | { |
271 | int i; | ||
272 | FOR_NB_SCREENS(i) | 271 | FOR_NB_SCREENS(i) |
273 | { | 272 | { |
274 | oldinfovp_label[i] = NULL; | 273 | oldinfovp_label[i] = NULL; |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index d2b7f500b1..84de16987f 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -805,7 +805,6 @@ static void gui_statusbar_icon_recording_info(struct screen * display) | |||
805 | 805 | ||
806 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | 806 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) |
807 | { | 807 | { |
808 | int i; | ||
809 | FOR_NB_SCREENS(i) { | 808 | FOR_NB_SCREENS(i) { |
810 | gui_statusbar_init( &(bars->statusbars[i]) ); | 809 | gui_statusbar_init( &(bars->statusbars[i]) ); |
811 | gui_statusbar_set_screen( &(bars->statusbars[i]), &(screens[i]) ); | 810 | gui_statusbar_set_screen( &(bars->statusbars[i]), &(screens[i]) ); |
@@ -818,7 +817,6 @@ void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | |||
818 | #ifdef HAVE_LCD_BITMAP | 817 | #ifdef HAVE_LCD_BITMAP |
819 | if(!global_settings.statusbar) | 818 | if(!global_settings.statusbar) |
820 | return; | 819 | return; |
821 | int i; | ||
822 | struct viewport viewport; | 820 | struct viewport viewport; |
823 | FOR_NB_SCREENS(i) { | 821 | FOR_NB_SCREENS(i) { |
824 | GET_RECT(viewport,statusbar_position(i),&screens[i]); | 822 | GET_RECT(viewport,statusbar_position(i),&screens[i]); |
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 1d9fcec6e4..06770b1b94 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -184,7 +184,6 @@ static void usb_screen_fix_viewports(struct screen *screen, | |||
184 | 184 | ||
185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | 185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) |
186 | { | 186 | { |
187 | int i; | ||
188 | FOR_NB_SCREENS(i) | 187 | FOR_NB_SCREENS(i) |
189 | { | 188 | { |
190 | struct screen *screen = &screens[i]; | 189 | struct screen *screen = &screens[i]; |
@@ -242,7 +241,6 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
242 | 241 | ||
243 | void gui_usb_screen_run(bool early_usb) | 242 | void gui_usb_screen_run(bool early_usb) |
244 | { | 243 | { |
245 | int i; | ||
246 | struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS]; | 244 | struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS]; |
247 | #if defined HAVE_TOUCHSCREEN | 245 | #if defined HAVE_TOUCHSCREEN |
248 | enum touchscreen_mode old_mode = touchscreen_get_mode(); | 246 | enum touchscreen_mode old_mode = touchscreen_get_mode(); |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index df8093d581..2ab6c343ef 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -104,7 +104,6 @@ static void toggle_theme(enum screen_type screen, bool force) | |||
104 | bool enable_event = false; | 104 | bool enable_event = false; |
105 | static bool was_enabled[NB_SCREENS] = {false}; | 105 | static bool was_enabled[NB_SCREENS] = {false}; |
106 | static bool after_boot[NB_SCREENS] = {false}; | 106 | static bool after_boot[NB_SCREENS] = {false}; |
107 | int i; | ||
108 | 107 | ||
109 | FOR_NB_SCREENS(i) | 108 | FOR_NB_SCREENS(i) |
110 | { | 109 | { |
@@ -233,7 +232,6 @@ int viewport_get_nb_lines(const struct viewport *vp) | |||
233 | 232 | ||
234 | static void viewportmanager_redraw(void* data) | 233 | static void viewportmanager_redraw(void* data) |
235 | { | 234 | { |
236 | int i; | ||
237 | FOR_NB_SCREENS(i) | 235 | FOR_NB_SCREENS(i) |
238 | { | 236 | { |
239 | #ifdef HAVE_LCD_BITMAP | 237 | #ifdef HAVE_LCD_BITMAP |
@@ -249,7 +247,6 @@ static void viewportmanager_redraw(void* data) | |||
249 | void viewportmanager_init() | 247 | void viewportmanager_init() |
250 | { | 248 | { |
251 | #ifdef HAVE_LCD_BITMAP | 249 | #ifdef HAVE_LCD_BITMAP |
252 | int i; | ||
253 | FOR_NB_SCREENS(i) | 250 | FOR_NB_SCREENS(i) |
254 | { | 251 | { |
255 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ | 252 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ |
@@ -264,7 +261,6 @@ void viewportmanager_init() | |||
264 | #ifdef HAVE_LCD_BITMAP | 261 | #ifdef HAVE_LCD_BITMAP |
265 | void viewportmanager_theme_changed(const int which) | 262 | void viewportmanager_theme_changed(const int which) |
266 | { | 263 | { |
267 | int i; | ||
268 | #ifdef HAVE_BUTTONBAR | 264 | #ifdef HAVE_BUTTONBAR |
269 | if (which & THEME_BUTTONBAR) | 265 | if (which & THEME_BUTTONBAR) |
270 | { /* don't handle further, the custom ui viewport ignores the buttonbar, | 266 | { /* don't handle further, the custom ui viewport ignores the buttonbar, |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 4d56062c8d..6486e42fbb 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -120,7 +120,6 @@ char* wps_default_skin(enum screen_type screen) | |||
120 | 120 | ||
121 | static void update_non_static(void) | 121 | static void update_non_static(void) |
122 | { | 122 | { |
123 | int i; | ||
124 | FOR_NB_SCREENS(i) | 123 | FOR_NB_SCREENS(i) |
125 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); | 124 | skin_update(WPS, i, SKIN_REFRESH_NON_STATIC); |
126 | } | 125 | } |
@@ -306,7 +305,6 @@ bool ffwd_rew(int button) | |||
306 | int direction = -1; /* forward=1 or backward=-1 */ | 305 | int direction = -1; /* forward=1 or backward=-1 */ |
307 | bool exit = false; | 306 | bool exit = false; |
308 | bool usb = false; | 307 | bool usb = false; |
309 | int i = 0; | ||
310 | const long ff_rw_accel = (global_settings.ff_rewind_accel + 3); | 308 | const long ff_rw_accel = (global_settings.ff_rewind_accel + 3); |
311 | 309 | ||
312 | if (button == ACTION_NONE) | 310 | if (button == ACTION_NONE) |
@@ -630,8 +628,6 @@ static void wps_lcd_activation_hook(void *param) | |||
630 | 628 | ||
631 | static void gwps_leave_wps(void) | 629 | static void gwps_leave_wps(void) |
632 | { | 630 | { |
633 | int i; | ||
634 | |||
635 | FOR_NB_SCREENS(i) | 631 | FOR_NB_SCREENS(i) |
636 | { | 632 | { |
637 | skin_get_gwps(WPS, i)->display->stop_scroll(); | 633 | skin_get_gwps(WPS, i)->display->stop_scroll(); |
@@ -657,7 +653,6 @@ static void gwps_leave_wps(void) | |||
657 | * display the wps on entering or restoring */ | 653 | * display the wps on entering or restoring */ |
658 | static void gwps_enter_wps(void) | 654 | static void gwps_enter_wps(void) |
659 | { | 655 | { |
660 | int i; | ||
661 | struct gui_wps *gwps; | 656 | struct gui_wps *gwps; |
662 | struct screen *display; | 657 | struct screen *display; |
663 | FOR_NB_SCREENS(i) | 658 | FOR_NB_SCREENS(i) |
@@ -738,7 +733,6 @@ long gui_wps_show(void) | |||
738 | bool bookmark = false; | 733 | bool bookmark = false; |
739 | bool update = false; | 734 | bool update = false; |
740 | bool vol_changed = false; | 735 | bool vol_changed = false; |
741 | int i; | ||
742 | long last_left = 0, last_right = 0; | 736 | long last_left = 0, last_right = 0; |
743 | struct wps_state *state = skin_get_global_state(); | 737 | struct wps_state *state = skin_get_global_state(); |
744 | 738 | ||
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 5354aa526b..e89e45ae95 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -147,7 +147,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
147 | const struct text_message * yes_message, | 147 | const struct text_message * yes_message, |
148 | const struct text_message * no_message) | 148 | const struct text_message * no_message) |
149 | { | 149 | { |
150 | int i; | ||
151 | int button; | 150 | int button; |
152 | int result=-1; | 151 | int result=-1; |
153 | bool result_displayed; | 152 | bool result_displayed; |
@@ -239,7 +238,6 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
239 | This function needs the output text as an argument. */ | 238 | This function needs the output text as an argument. */ |
240 | bool yesno_pop(const char* text) | 239 | bool yesno_pop(const char* text) |
241 | { | 240 | { |
242 | int i; | ||
243 | const char *lines[]={text}; | 241 | const char *lines[]={text}; |
244 | const struct text_message message={lines, 1}; | 242 | const struct text_message message={lines, 1}; |
245 | bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES); | 243 | bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES); |