Use the abstract SETTINGS_ defines instead of the target-specific BUTTON_ defines for the time/date settings screen - in preparation for H300/iPod RTC support

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

1 files changed, 8 insertions, 12 deletions

diff --git a/apps/screens.c b/apps/screens.c
index 934b2663f1..5c5d96fd44 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -879,22 +879,22 @@ bool set_time_screen(const char* string, struct tm *tm)
 
         button = button_get_w_tmo(HZ/2);
         switch ( button ) {
-            case BUTTON_LEFT:
+            case SETTINGS_PREV:
                 cursorpos = (cursorpos + 6 - 1) % 6;
                 break;
-            case BUTTON_RIGHT:
+            case SETTINGS_NEXT:
                 cursorpos = (cursorpos + 6 + 1) % 6;
                 break;
-            case BUTTON_UP:
-            case BUTTON_UP | BUTTON_REPEAT:
+            case SETTINGS_INC:
+            case SETTINGS_INC | BUTTON_REPEAT:
                 *valptr = (*valptr + steps - min + 1) %
                     steps + min;
                 if(*valptr == 0)
                     *valptr = min;
                 say_time(cursorpos, tm);
                 break;
-            case BUTTON_DOWN:
-            case BUTTON_DOWN | BUTTON_REPEAT:
+            case SETTINGS_DEC:
+            case SETTINGS_DEC | BUTTON_REPEAT:
                 *valptr = (*valptr + steps - min - 1) %
                     steps + min;
                 if(*valptr == 0)
@@ -902,15 +902,11 @@ bool set_time_screen(const char* string, struct tm *tm)
                 say_time(cursorpos, tm);
                 break;
 
-#ifdef BUTTON_ON
-            case BUTTON_ON:
-#elif defined BUTTON_MENU
-            case BUTTON_MENU:
-#endif
+            case SETTINGS_ACCEPT:
                 done = true;
                 break;
 
-            case BUTTON_OFF:
+            case SETTINGS_CANCEL:
                 done = true;
                 tm->tm_year = -1;
                 break;