summaryrefslogtreecommitdiffstats
path: root/apps/menus
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2011-10-15 19:35:02 +0000
committerBjörn Stenberg <bjorn@haxx.se>2011-10-15 19:35:02 +0000
commit0942e2a0f71d809c1d7f2606cbddfa1d4beacb87 (patch)
treece2fbdea468cb8223598c546fee765a10660a0b0 /apps/menus
parentf301ac05f9dd6ace2355fa822bd61d454c2c4f28 (diff)
downloadrockbox-0942e2a0f71d809c1d7f2606cbddfa1d4beacb87.tar.gz
rockbox-0942e2a0f71d809c1d7f2606cbddfa1d4beacb87.tar.bz2
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/menus')
-rw-r--r--apps/menus/eq_menu.c2
-rw-r--r--apps/menus/recording_menu.c4
-rw-r--r--apps/menus/time_menu.c3
3 files changed, 4 insertions, 5 deletions
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index be1dd42b28..c1d9792c44 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -389,7 +389,7 @@ bool eq_menu_graphical(void)
int current_band, x, y, step, fast_step, min, max;
enum eq_slider_mode mode;
char buf[24];
- int i, w, h, height, start_item, nb_eq_sliders[NB_SCREENS];
+ int w, h, height, start_item, nb_eq_sliders[NB_SCREENS];
FOR_NB_SCREENS(i)
viewportmanager_theme_enable(i, false, NULL);
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index ae237b1b4a..3eeb8bc47e 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -458,7 +458,7 @@ int rectrigger(void)
{
struct viewport vp[NB_SCREENS], triggervp[NB_SCREENS];
struct gui_synclist lists;
- int i, action = ACTION_REDRAW;
+ int action = ACTION_REDRAW;
bool done = false, changed = true;
const struct settings_list *settings[TRIG_OPTION_COUNT];
@@ -550,7 +550,7 @@ int rectrigger(void)
pm_x, pm_y, pm_h, NB_SCREENS, triggervp);
FOR_NB_SCREENS(i)
screens[i].update();
- i = gui_synclist_get_sel_pos(&lists);
+ int i = gui_synclist_get_sel_pos(&lists);
switch (action)
{
case ACTION_STD_CANCEL:
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index 46be790274..6631b46195 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -202,7 +202,6 @@ static int time_menu_callback(int action,
const struct menu_item_ex *this_item)
{
(void)this_item;
- int i;
static int last_redraw = 0;
bool redraw = false;
@@ -247,7 +246,7 @@ MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), time_menu_callback, Icon_NOICON,
int time_screen(void* ignored)
{
(void)ignored;
- int i, nb_lines, font_h, ret;
+ int nb_lines, font_h, ret;
menu_was_pressed = false;
push_current_activity(ACTIVITY_TIMEDATESCREEN);