Add _rect to {draw,fill}_viewport as suggested by Jonathan Gordon to reduce the chance to confuse it with update_viewport().

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

6 files changed, 11 insertions, 11 deletions

diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index db94362..9abd851 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -69,7 +69,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
     vp.width = button_width-1;
     vp.x = button_width * num;
     display->set_viewport(&vp);
-    display->fill_viewport(NULL);
+    display->fill_viewport_rect(NULL);
     if(buttonbar->caption[num][0] != 0)
     {
         display->getstringsize(buttonbar->caption[num], &fw, &fh);
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 8c5f57f..5123e5d 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -163,7 +163,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
 #endif
         vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
 
-    screen->fill_viewport(NULL);
+    screen->fill_viewport_rect(NULL);
 
 #if LCD_DEPTH > 1
     if (screen->depth > 1)
@@ -174,7 +174,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
 #endif
         vp.drawmode = DRMODE_SOLID;
 
-    screen->draw_viewport(NULL);
+    screen->draw_viewport_rect(NULL);
 
     /* prepare putting the text */
     y = RECT_SPACING;
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index a05a11a..467907c 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -280,7 +280,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
     {
         display->set_viewport(vp);
         display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
-        display->fill_viewport(NULL);
+        display->fill_viewport_rect(NULL);
         display->set_drawmode(DRMODE_SOLID);
 
         if (bar->info.battery_state)
diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c
index 3920b8e..8b559a4 100644
--- a/apps/plugins/lib/pluginlib_touchscreen.c
+++ b/apps/plugins/lib/pluginlib_touchscreen.c
@@ -129,7 +129,7 @@ void touchbutton_draw(struct touchbutton *data, int num_buttons) {
             }
             
             /* Draw bounding box around the button location. */
-            lcd->draw_viewport(NULL);
+            lcd->draw_viewport_rect(NULL);
         }
     }
     lcd->set_viewport(NULL); /* Go back to the default viewport */
diff --git a/apps/screen_access.c b/apps/screen_access.c
index e828fea..d16a441 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -162,8 +162,8 @@ struct screen screens[NB_SCREENS] =
         .update_viewport_rect=&lcd_update_viewport_rect,
         .fillrect=&lcd_fillrect,
         .drawrect=&lcd_drawrect,
-        .draw_viewport=&lcd_draw_viewport,
-        .fill_viewport=&lcd_fill_viewport,
+        .draw_viewport_rect=&lcd_draw_viewport_rect,
+        .fill_viewport_rect=&lcd_fill_viewport_rect,
         .drawpixel=&lcd_drawpixel,
         .drawline=&lcd_drawline,
         .vline=&lcd_vline,
@@ -255,8 +255,8 @@ struct screen screens[NB_SCREENS] =
         .update_viewport_rect=&lcd_remote_update_viewport_rect,
         .fillrect=&lcd_remote_fillrect,
         .drawrect=&lcd_remote_drawrect,
-        .draw_viewport=&lcd_remote_draw_viewport,
-        .fill_viewport=&lcd_remote_fill_viewport,
+        .draw_viewport_rect=&lcd_remote_draw_viewport_rect,
+        .fill_viewport_rect=&lcd_remote_fill_viewport_rect,
         .drawpixel=&lcd_remote_drawpixel,
         .drawline=&lcd_remote_drawline,
         .vline=&lcd_remote_vline,
diff --git a/apps/screen_access.h b/apps/screen_access.h
index fb7aa7b..6a4750d 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -117,8 +117,8 @@ struct screen
     void (*update_viewport_rect)(int x, int y, int width, int height);
     void (*fillrect)(int x, int y, int width, int height);
     void (*drawrect)(int x, int y, int width, int height);
-    void (*fill_viewport)(const struct viewport *vp);
-    void (*draw_viewport)(const struct viewport *vp);
+    void (*fill_viewport_rect)(const struct viewport *vp);
+    void (*draw_viewport_rect)(const struct viewport *vp);
     void (*drawpixel)(int x, int y);
     void (*drawline)(int x1, int y1, int x2, int y2);
     void (*vline)(int x, int y1, int y2);