Diff: GraphicsDisplay.h

Revision:

33:b6b710758ab3

Parent:

32:0e4f2ae512e2

Child:

34:c99ec28fac66

diff -r 0e4f2ae512e2 -r b6b710758ab3 GraphicsDisplay.h
--- a/GraphicsDisplay.h	Tue Jan 21 03:28:36 2014 +0000
+++ b/GraphicsDisplay.h	Wed Jan 22 03:50:55 2014 +0000
@@ -39,7 +39,7 @@
     /// @param color defines the color for the pixel.
     /// @returns success/failure code. @see RetCode_t.
     ///
-    virtual RetCode_t pixel(unsigned int x, unsigned int y, color_t colour) = 0;
+    virtual RetCode_t pixel(unsigned int x, unsigned int y, color_t color) = 0;
     
     /// get the screen width in pixels
     ///
@@ -98,11 +98,11 @@
     ///
     /// @param x is the left edge in pixels.
     /// @param y is the top edge in pixels.
-    /// @param width is the window width in pixels.
-    /// @param height is the window height in pixels.
+    /// @param w is the window width in pixels.
+    /// @param h is the window height in pixels.
     /// @returns success/failure code. @see RetCode_t.
     ///
-    virtual RetCode_t window(unsigned int x,unsigned int y,unsigned int w,unsigned int h);
+    virtual RetCode_t window(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
     
     /// Clear the screen.
     ///
@@ -127,10 +127,10 @@
     virtual RetCode_t putp(color_t pixel);
 
             
-    virtual void fill(int x, int y, int w, int h, color_t colour);
-    virtual void blit(int x, int y, int w, int h, const int * colour);    
+    virtual void fill(int x, int y, int w, int h, color_t color);
+    virtual void blit(int x, int y, int w, int h, const int * color);    
     
-    virtual int blitbit(int x, int y, int w, int h, const char * colour);
+    virtual int blitbit(int x, int y, int w, int h, const char * color);
     
     /// This method transfers one character from the external font data
     /// to the screen.
@@ -262,3 +262,4 @@
 };
 
 #endif
+