Renamed more OSystem methods

svn-id: r13410

16 files changed, 141 insertions, 141 deletions

diff --git a/backends/PalmOS/Src/arm/ArmNative.h b/backends/PalmOS/Src/arm/ArmNative.h
index 2a85104b97..5f58ab59ad 100644
--- a/backends/PalmOS/Src/arm/ArmNative.h
+++ b/backends/PalmOS/Src/arm/ArmNative.h
@@ -28,7 +28,7 @@ typedef struct {
 
 DECLARE(OSystem_PALMOS_update_screen__wide_portrait)
 DECLARE(OSystem_PALMOS_update_screen__wide_landscape)
-DECLARE(OSystem_PALMOS_copy_rect)
+DECLARE(OSystem_PALMOS_copyRectToScreen)
 
 // rsrc
 #define ARMCODE_1	1000
diff --git a/backends/PalmOS/Src/arm/PNOMain.cpp b/backends/PalmOS/Src/arm/PNOMain.cpp
index 6fc59e0000..a38682c5e1 100644
--- a/backends/PalmOS/Src/arm/PNOMain.cpp
+++ b/backends/PalmOS/Src/arm/PNOMain.cpp
@@ -31,7 +31,7 @@ unsigned long PNO_Main(const void *emulStateP, void *userData68KP, Call68KFuncTy
 /*	const PnoProc call[] = {
 		(PnoProc)__ARMlet_Take_Func_Addr__(OSystem_PALMOS_update_screen__wide_portrait),
 		(PnoProc)__ARMlet_Take_Func_Addr__(OSystem_PALMOS_update_screen__wide_landscape),
-		//OSystem_PALMOS_copy_rect
+		//OSystem_PALMOS_copyRectToScreen
 	};
 */
 #ifndef WIN32
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp
index 8bcbea07d8..278cc68211 100644
--- a/backends/PalmOS/Src/palm.cpp
+++ b/backends/PalmOS/Src/palm.cpp
@@ -324,7 +324,7 @@ void OSystem_PALMOS::initSize(uint w, uint h) {
 	load_gfx_mode();
 }
 
-void OSystem_PALMOS::copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_PALMOS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
 	/* Clip the coordinates */
 	if (x < 0) {
 		w += x;
@@ -674,7 +674,7 @@ void OSystem_PALMOS::updateScreen() {
 
 }
 
-bool OSystem_PALMOS::show_mouse(bool visible) {
+bool OSystem_PALMOS::showMouse(bool visible) {
 	if (_mouseVisible == visible)
 		return visible;
 	
@@ -689,7 +689,7 @@ bool OSystem_PALMOS::show_mouse(bool visible) {
 	return last;
 }
 
-void OSystem_PALMOS::warp_mouse(int x, int y) {
+void OSystem_PALMOS::warpMouse(int x, int y) {
 	set_mouse_pos(x, y);
 }
 
@@ -701,7 +701,7 @@ void OSystem_PALMOS::set_mouse_pos(int x, int y) {
 	}
 }
 
-void OSystem_PALMOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
+void OSystem_PALMOS::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
 	_mouseCurState.w = w;
 	_mouseCurState.h = h;
 
@@ -1649,7 +1649,7 @@ void OSystem_PALMOS::timer_handler(UInt32 current_msecs) {
 	}
 }
 
-void OSystem_PALMOS::show_overlay() {
+void OSystem_PALMOS::showOverlay() {
 	// hide the mouse
 	undraw_mouse();
 	// save background
@@ -1673,18 +1673,18 @@ void OSystem_PALMOS::show_overlay() {
 	}
 
 	_overlayVisible = true;
-	clear_overlay();
+	clearOverlay();
 }
 
-void OSystem_PALMOS::hide_overlay() {
+void OSystem_PALMOS::hideOverlay() {
 	// hide the mouse
 	undraw_mouse();
 
 	_overlayVisible = false;
-	copy_rect(_tmpBackupP, _screenWidth, 0, 0, _screenWidth, _screenHeight);
+	copyRectToScreen(_tmpBackupP, _screenWidth, 0, 0, _screenWidth, _screenHeight);
 }
 
-void OSystem_PALMOS::clear_overlay() {
+void OSystem_PALMOS::clearOverlay() {
 	if (!_overlayVisible)
 		return;
 
@@ -1697,7 +1697,7 @@ void OSystem_PALMOS::clear_overlay() {
 		MemMove(_tmpScreenP, _tmpBackupP, _screenWidth * _screenHeight);
 }
 
-void OSystem_PALMOS::grab_overlay(byte *buf, int pitch) {
+void OSystem_PALMOS::grabOverlay(byte *buf, int pitch) {
 	if (!_overlayVisible)
 		return;
 
@@ -1714,7 +1714,7 @@ void OSystem_PALMOS::grab_overlay(byte *buf, int pitch) {
 	} while (--h);
 }
 
-void OSystem_PALMOS::copy_rect_overlay(const byte *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_PALMOS::copyRectToOverlay(const byte *buf, int pitch, int x, int y, int w, int h) {
 	if (!_overlayVisible)
 		return;
 
diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index 910daff9c0..8cf579641e 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -54,7 +54,7 @@ public:
 
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
-	void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 
 	// Moves the screen content around by the given amount of pixels
 	// but only the top height pixel rows, the rest stays untouched
@@ -64,7 +64,7 @@ public:
 	void updateScreen();
 
 	// Either show or hide the mouse cursor
-	bool show_mouse(bool visible);
+	bool showMouse(bool visible);
 
 	// Set the position of the mouse cursor
 	void set_mouse_pos(int x, int y);
@@ -72,11 +72,11 @@ public:
 	// Warp the mouse cursor. Where set_mouse_pos() only informs the
 	// backend of the mouse cursor's current position, this function
 	// actually moves the cursor to the specified position.
-	void warp_mouse(int x, int y);
+	void warpMouse(int x, int y);
 
 
 	// Set the bitmap that's used when drawing the cursor.
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void set_shake_pos(int shake_pos);
@@ -140,11 +140,11 @@ public:
 	UInt8 _quitCount;
 
 	// Overlay
-	void show_overlay();
-	void hide_overlay();
-	void clear_overlay();
-	void grab_overlay(byte *buf, int pitch);
-	void copy_rect_overlay(const byte *buf, int pitch, int x, int y, int w, int h);
+	void showOverlay();
+	void hideOverlay();
+	void clearOverlay();
+	void grabOverlay(byte *buf, int pitch);
+	void copyRectToOverlay(const byte *buf, int pitch, int x, int y, int w, int h);
 
 	int16 getWidth();
 	int16 getHeight();
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index b040edab92..04b9fc5bb6 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -72,20 +72,20 @@ class OSystem_Dreamcast : public OSystem {
 
   // Draw a bitmap to screen.
   // The screen will not be updated to reflect the new bitmap
-  void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+  void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
   void move_screen(int dx, int dy, int height);
 
   // Update the dirty areas of the screen
   void updateScreen();
 
   // Either show or hide the mouse cursor
-  bool show_mouse(bool visible);
+  bool showMouse(bool visible);
 
   // Move ("warp") the mouse cursor to the specified position.
-  void warp_mouse(int x, int y);
+  void warpMouse(int x, int y);
 
   // Set the bitmap that's used when drawing the cursor.
-  void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+  void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
   
   // Shaking is used in SCUMM. Set current shake position.
   void set_shake_pos(int shake_pos);
@@ -128,11 +128,11 @@ class OSystem_Dreamcast : public OSystem {
   void quit();
 
   // Overlay
-  void show_overlay();
-  void hide_overlay();
-  void clear_overlay();
-  void grab_overlay(int16 *buf, int pitch);
-  void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+  void showOverlay();
+  void hideOverlay();
+  void clearOverlay();
+  void grabOverlay(int16 *buf, int pitch);
+  void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
 
   // Add a callback timer
   void setTimerCallback(TimerProc callback, int timer);
diff --git a/backends/dc/display.cpp b/backends/dc/display.cpp
index 7a5ff6bbf0..50abc5e522 100644
--- a/backends/dc/display.cpp
+++ b/backends/dc/display.cpp
@@ -192,7 +192,7 @@ void OSystem_Dreamcast::initSize(uint w, uint h)
   //  dc_reset_screen(0, 0);
 }
 
-void OSystem_Dreamcast::copy_rect(const byte *buf, int pitch, int x, int y,
+void OSystem_Dreamcast::copyRectToScreen(const byte *buf, int pitch, int x, int y,
 				  int w, int h)
 {
   unsigned char *dst = screen + y*SCREEN_W + x;
@@ -215,12 +215,12 @@ void OSystem_Dreamcast::move_screen(int dx, int dy, int height) {
 			// move down
 			// copy from bottom to top
 			for (int y = height - 1; y >= dy; y--)
-				copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
+				copyRectToScreen(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
 		} else {
 			// move up
 			// copy from top to bottom
 			for (int y = 0; y < height + dx; y++)
-				copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
+				copyRectToScreen(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
 		}
 	} else if (dy == 0) {
 		// horizontal movement
@@ -228,12 +228,12 @@ void OSystem_Dreamcast::move_screen(int dx, int dy, int height) {
 			// move right
 			// copy from right to left
 			for (int x = _screen_w - 1; x >= dx; x--)
-				copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+				copyRectToScreen(screen + x - dx, SCREEN_W, x, 0, 1, height);
 		} else {
 			// move left
 			// copy from left to right
 			for (int x = 0; x < _screen_w; x++)
-				copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+				copyRectToScreen(screen + x - dx, SCREEN_W, x, 0, 1, height);
 		}
 	} else {
 		// free movement
@@ -244,7 +244,7 @@ void OSystem_Dreamcast::move_screen(int dx, int dy, int height) {
 }
 
 
-bool OSystem_Dreamcast::show_mouse(bool visible)
+bool OSystem_Dreamcast::showMouse(bool visible)
 {	
   bool last = _ms_visible;
   _ms_visible = visible;
@@ -252,13 +252,13 @@ bool OSystem_Dreamcast::show_mouse(bool visible)
   return last;
 }
 
-void OSystem_Dreamcast::warp_mouse(int x, int y)
+void OSystem_Dreamcast::warpMouse(int x, int y)
 {
   _ms_cur_x = x;
   _ms_cur_y = y;
 }
 
-void OSystem_Dreamcast::set_mouse_cursor(const byte *buf, uint w, uint h,
+void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
 					 int hotspot_x, int hotspot_y)
 {
   _ms_cur_w = w;
@@ -511,18 +511,18 @@ void OSystem_Dreamcast::drawMouse(int xdraw, int ydraw, int w, int h,
 }
 
 
-void OSystem_Dreamcast::show_overlay()
+void OSystem_Dreamcast::showOverlay()
 {
   _overlay_visible = true;
-  clear_overlay();
+  clearOverlay();
 }
 
-void OSystem_Dreamcast::hide_overlay()
+void OSystem_Dreamcast::hideOverlay()
 {
   _overlay_visible = false;
 }
 
-void OSystem_Dreamcast::clear_overlay()
+void OSystem_Dreamcast::clearOverlay()
 {
   if(!_overlay_visible)
     return;
@@ -541,7 +541,7 @@ void OSystem_Dreamcast::clear_overlay()
   _overlay_dirty = true;
 }
 
-void OSystem_Dreamcast::grab_overlay(int16 *buf, int pitch)
+void OSystem_Dreamcast::grabOverlay(int16 *buf, int pitch)
 {
   int h = OVL_H;
   unsigned short *src = overlay;
@@ -552,7 +552,7 @@ void OSystem_Dreamcast::grab_overlay(int16 *buf, int pitch)
   } while (--h);
 }
 
-void OSystem_Dreamcast::copy_rect_overlay(const int16 *buf, int pitch,
+void OSystem_Dreamcast::copyRectToOverlay(const int16 *buf, int pitch,
 					  int x, int y, int w, int h)
 {
   unsigned short *dst = overlay + y*OVL_W + x;
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index 8d5462e48e..6d3f7dbf02 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -185,7 +185,7 @@ void OSystem_GP32::add_dirty_rgn_auto(const byte *buf) {
 
 // Draw a bitmap to screen.
 // The screen will not be updated to reflect the new bitmap
-void OSystem_GP32::copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) { 
+void OSystem_GP32::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) { 
 	if (_screen == NULL)
 		return;
 
@@ -361,12 +361,12 @@ void OSystem_GP32::move_screen(int dx, int dy, int height) {
 			// move down
 			// copy from bottom to top
 			for (int y = height - 1; y >= dy; y--)
-				copy_rect((byte *)_screen->pixels + _screenWidth * (y - dy), _screenWidth, 0, y, _screenWidth, 1);
+				copyRectToScreen((byte *)_screen->pixels + _screenWidth * (y - dy), _screenWidth, 0, y, _screenWidth, 1);
 		} else {
 			// move up
 			// copy from top to bottom
 			for (int y = 0; y < height + dx; y++)
-				copy_rect((byte *)_screen->pixels + _screenWidth * (y - dy), _screenWidth, 0, y, _screenWidth, 1);
+				copyRectToScreen((byte *)_screen->pixels + _screenWidth * (y - dy), _screenWidth, 0, y, _screenWidth, 1);
 		}
 	} else if (dy == 0) {
 		// horizontal movement
@@ -374,12 +374,12 @@ void OSystem_GP32::move_screen(int dx, int dy, int height) {
 			// move right
 			// copy from right to left
 			for (int x = _screenWidth - 1; x >= dx; x--)
-				copy_rect((byte *)_screen->pixels + x - dx, _screenWidth, x, 0, 1, height);
+				copyRectToScreen((byte *)_screen->pixels + x - dx, _screenWidth, x, 0, 1, height);
 		} else {
 			// move left
 			// copy from left to right
 			for (int x = 0; x < _screenWidth; x++)
-				copy_rect((byte *)_screen->pixels + x - dx, _screenWidth, x, 0, 1, height);
+				copyRectToScreen((byte *)_screen->pixels + x - dx, _screenWidth, x, 0, 1, height);
 		}
 	} else {
 		// free movement
@@ -798,7 +798,7 @@ void OSystem_GP32::updateScreen() {
 }
 
 // Either show or hide the mouse cursor
-bool OSystem_GP32::show_mouse(bool visible) { 
+bool OSystem_GP32::showMouse(bool visible) { 
 	if (_mouseVisible == visible)
 		return visible;
 	
@@ -825,12 +825,12 @@ void OSystem_GP32::set_mouse_pos(int x, int y) {
 	}
 }
 
-void OSystem_GP32::warp_mouse(int x, int y) {
+void OSystem_GP32::warpMouse(int x, int y) {
 	set_mouse_pos(x, y);	
 }
 
 // Set the bitmap that's used when drawing the cursor.
-void OSystem_GP32::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) { 
+void OSystem_GP32::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) { 
 	_mouse_cur_state.w = w;
 	_mouse_cur_state.h = h;
 
@@ -1014,7 +1014,7 @@ void OSystem_GP32::hotswap_gfx_mode() {
 	SDL_SetColors(_screen, _currentPalette, 0, 256);
 
 	// blit image
-	copy_rect(bak_mem, _screenWidth, 0, 0, _screenWidth, _screenHeight);
+	copyRectToScreen(bak_mem, _screenWidth, 0, 0, _screenWidth, _screenHeight);
 	free(bak_mem);
 
 	updateScreen();
@@ -1086,7 +1086,7 @@ void OSystem_GP32::quit() {
 }
 	
 // Overlay
-void OSystem_GP32::show_overlay() { 
+void OSystem_GP32::showOverlay() { 
 	// hide the mouse
 
 	undraw_mouse();
@@ -1107,10 +1107,10 @@ GpGraphicModeSet(16, NULL); //ph0x
 //GpRectFill(NULL,&gpDraw[GAME_SURFACE], 0, 0, 320, 240*2, 0); //black border
 
 	_overlay_visible = true;
-	clear_overlay();
+	clearOverlay();
 }
 
-void OSystem_GP32::hide_overlay() { 
+void OSystem_GP32::hideOverlay() { 
 	// hide the mouse
 	undraw_mouse();
 
@@ -1121,7 +1121,7 @@ GpRectFill(NULL,&gpDraw[GAME_SURFACE], 0, 200, 320, 40, 0); //black border
 	_forceFull = true;
 }
 
-void OSystem_GP32::clear_overlay() { 
+void OSystem_GP32::clearOverlay() { 
 	if (!_overlay_visible)
 		return;
 	
@@ -1140,7 +1140,7 @@ void OSystem_GP32::clear_overlay() {
 	_forceFull = true;
 }
 
-void OSystem_GP32::grab_overlay(int16 *buf, int pitch) { 
+void OSystem_GP32::grabOverlay(int16 *buf, int pitch) { 
 	if (!_overlay_visible)
 		return;
 
@@ -1164,7 +1164,7 @@ void OSystem_GP32::grab_overlay(int16 *buf, int pitch) {
 	///SDL_UnlockSurface(sdl_tmpscreen);
 }
 
-void OSystem_GP32::copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h) { 
+void OSystem_GP32::copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h) { 
 	if (!_overlay_visible)
 		return;
 
diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h
index 11f44c9a61..37c08ce080 100644
--- a/backends/gp32/gp32.h
+++ b/backends/gp32/gp32.h
@@ -45,7 +45,7 @@ public:
 	
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
-	void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 
 	// Moves the screen content around by the given amount of pixels
 	// but only the top height pixel rows, the rest stays untouched
@@ -55,14 +55,14 @@ public:
 	void updateScreen();
 
 	// Either show or hide the mouse cursor
-	bool show_mouse(bool visible);
-	void warp_mouse(int x, int y);
+	bool showMouse(bool visible);
+	void warpMouse(int x, int y);
 	
 	// Set the position of the mouse cursor
 	void set_mouse_pos(int x, int y);
 	
 	// Set the bitmap that's used when drawing the cursor.
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 	
 	// Shaking is used in SCUMM. Set current shake position.
 	void set_shake_pos(int shake_pos);
@@ -112,11 +112,11 @@ public:
 	void quit();
 	
 	// Overlay
-	void show_overlay();
-	void hide_overlay();
-	void clear_overlay();
-	void grab_overlay(int16 *buf, int pitch);
-	void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+	void showOverlay();
+	void hideOverlay();
+	void clearOverlay();
+	void grabOverlay(int16 *buf, int pitch);
+	void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
 
 	static OSystem *create(int gfx_mode, bool full_screen);
 
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index a68b818295..ed62106f32 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -969,7 +969,7 @@ bool OSystem_MorphOS::poll_event(Event *event)
 	return false;
 }
 
-void OSystem_MorphOS::warp_mouse(int x, int y)
+void OSystem_MorphOS::warpMouse(int x, int y)
 {
 	if (InputIORequest)
 	{
@@ -1017,7 +1017,7 @@ void OSystem_MorphOS::set_shake_pos(int shake_pos)
 		(MouseOldY+MouseOldHeight <= y) || (MouseOldY >= y+h)))
 
 /* Copy part of bitmap */
-void OSystem_MorphOS::copy_rect(const byte *src, int pitch, int x, int y, int w, int h)
+void OSystem_MorphOS::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h)
 {
 	byte *dst;
 
@@ -1119,13 +1119,13 @@ void OSystem_MorphOS::move_screen(int dx, int dy, int height) {
 		// move down
 		// copy from bottom to top
 		for (int y = height - 1; y >= dy; y--)
-			copy_rect((byte *)ScummBuffer + ScummBufferWidth * (y - dy), ScummBufferWidth, 0, y, ScummBufferWidth, 1);
+			copyRectToScreen((byte *)ScummBuffer + ScummBufferWidth * (y - dy), ScummBufferWidth, 0, y, ScummBufferWidth, 1);
 	} else if (dy < 0) {
 		// move up
 		// copy from top to bottom
 		dy = -dy;
 		for (int y = dy; y < height; y++)
-			copy_rect((byte *)ScummBuffer + ScummBufferWidth * y, ScummBufferWidth, 0, y - dy, ScummBufferWidth, 1);
+			copyRectToScreen((byte *)ScummBuffer + ScummBufferWidth * y, ScummBufferWidth, 0, y - dy, ScummBufferWidth, 1);
 	}
 
 	// horizontal movement
@@ -1133,13 +1133,13 @@ void OSystem_MorphOS::move_screen(int dx, int dy, int height) {
 		// move right
 		// copy from right to left
 		for (int x = ScummBufferWidth - 1; x >= dx; x--)
-			copy_rect((byte *)ScummBuffer + x - dx, ScummBufferWidth, x, 0, 1, height);
+			copyRectToScreen((byte *)ScummBuffer + x - dx, ScummBufferWidth, x, 0, 1, height);
 	} else if (dx < 0) {
 		// move left
 		// copy from left to right
 		dx = -dx;
 		for (int x = dx; x < ScummBufferWidth; x++)
-			copy_rect((byte *)ScummBuffer + x, ScummBufferWidth, x, 0, 1, height);
+			copyRectToScreen((byte *)ScummBuffer + x, ScummBufferWidth, x, 0, 1, height);
 	}
 }
 
@@ -1399,7 +1399,7 @@ void OSystem_MorphOS::UndrawMouse()
 	}
 }
 
-bool OSystem_MorphOS::show_mouse(bool visible)
+bool OSystem_MorphOS::showMouse(bool visible)
 {
 	if (MouseVisible == visible)
 		return visible;
@@ -1423,7 +1423,7 @@ void OSystem_MorphOS::set_mouse_pos(int x, int y)
 	}
 }
 
-void OSystem_MorphOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y)
+void OSystem_MorphOS::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y)
 {
 	MouseWidth = w;
 	MouseHeight	= h;
@@ -1577,11 +1577,11 @@ int16 OSystem_MorphOS::getHeight()
 	return ScummScrHeight;
 }
 
-void OSystem_MorphOS::show_overlay()
+void OSystem_MorphOS::showOverlay()
 {
 	UndrawMouse();
 	memcpy(OvlSavedBuffer, ScummBuffer, ScummBufferWidth*ScummBufferHeight);
-	clear_overlay();
+	clearOverlay();
 	for (int c = 0; c < 256; c++)
 	{
 		ULONG r, g, b;
@@ -1592,18 +1592,18 @@ void OSystem_MorphOS::show_overlay()
 	}
 }
 
-void OSystem_MorphOS::hide_overlay()
+void OSystem_MorphOS::hideOverlay()
 {
-	copy_rect((byte *) OvlSavedBuffer, ScummBufferWidth, 0, 0, ScummBufferWidth, ScummBufferHeight);
+	copyRectToScreen((byte *) OvlSavedBuffer, ScummBufferWidth, 0, 0, ScummBufferWidth, ScummBufferHeight);
 }
 
-void OSystem_MorphOS::clear_overlay()
+void OSystem_MorphOS::clearOverlay()
 {
 	AUTO_LOCK
 
 	UBYTE *src = (UBYTE *) ScummBuffer;
 	UBYTE *dest = (UBYTE *) OvlBitMap;
-	copy_rect((byte *) OvlSavedBuffer, ScummBufferWidth, 0, 0, ScummBufferWidth, ScummBufferHeight);
+	copyRectToScreen((byte *) OvlSavedBuffer, ScummBufferWidth, 0, 0, ScummBufferWidth, ScummBufferHeight);
 	for (int y = 0; y < ScummBufferHeight; y++)
 		for (int x = 0; x < ScummBufferWidth; x++)
 		{
@@ -1613,7 +1613,7 @@ void OSystem_MorphOS::clear_overlay()
 		}
 }
 
-void OSystem_MorphOS::grab_overlay(int16 *buf, int pitch)
+void OSystem_MorphOS::grabOverlay(int16 *buf, int pitch)
 {
 	int h = ScummBufferHeight;
 	int x;
@@ -1630,7 +1630,7 @@ void OSystem_MorphOS::grab_overlay(int16 *buf, int pitch)
 	} while (--h);
 }
 
-void OSystem_MorphOS::copy_rect_overlay(const int16 *ovl, int pitch, int x, int y, int w, int h)
+void OSystem_MorphOS::copyRectToOverlay(const int16 *ovl, int pitch, int x, int y, int w, int h)
 {
 	int x1, y1;
 	UBYTE *dest;
@@ -1672,7 +1672,7 @@ void OSystem_MorphOS::copy_rect_overlay(const int16 *ovl, int pitch, int x, int
 			dest += (ScummBufferWidth-w)*3;
 			ovl += pitch-w;
 		}
-		copy_rect(bmap, w, x, y, w, h);
+		copyRectToScreen(bmap, w, x, y, w, h);
 		FreeVec(bmap);
 	}
 }
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index fd40369fd1..3d23e28476 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -51,30 +51,30 @@ class OSystem_MorphOS : public OSystem
 
 		// Draw a bitmap to screen.
 		// The screen will not be updated to reflect the new bitmap
-		virtual void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+		virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 		void move_screen(int dx, int dy, int height);
 
 		// Update the dirty areas of the screen
 		virtual void updateScreen();
 
 		// Either show or hide the mouse cursor
-		virtual bool show_mouse(bool visible);
+		virtual bool showMouse(bool visible);
 
 		// Set the position of the mouse cursor
 		virtual void set_mouse_pos(int x, int y);
 
 		// Set the bitmap that's used when drawing the cursor.
-		virtual void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+		virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 
 		// Shaking is used in SCUMM. Set current shake position.
 		virtual void set_shake_pos(int shake_pos);
 
 		// Overlay
-		virtual void show_overlay();
-		virtual void hide_overlay();
-		virtual void clear_overlay();
-		virtual void grab_overlay(int16 *buf, int pitch);
-		virtual void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+		virtual void showOverlay();
+		virtual void hideOverlay();
+		virtual void clearOverlay();
+		virtual void grabOverlay(int16 *buf, int pitch);
+		virtual void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
 		virtual int16 getHeight();
 		virtual int16 getWidth();
 
@@ -98,7 +98,7 @@ class OSystem_MorphOS : public OSystem
 		virtual bool poll_event(Event *event);
 
 		// Moves mouse pointer to specified position
-		virtual void warp_mouse(int x, int y);
+		virtual void warpMouse(int x, int y);
 
 		// Set the function to be invoked whenever samples need to be generated
 		virtual bool setSoundCallback(SoundProc proc, void *param);
diff --git a/backends/null/null.cpp b/backends/null/null.cpp
index f78754d813..71685882f7 100644
--- a/backends/null/null.cpp
+++ b/backends/null/null.cpp
@@ -31,12 +31,12 @@ class OSystem_NULL : public OSystem {
 public:
 	void setPalette(const byte *colors, uint start, uint num) {}
 	void initSize(uint w, uint h);
-	void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) {}
+	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {}
 	void move_screen(int dx, int dy) {}
 	void updateScreen() {}
-	bool show_mouse(bool visible) { return false; }
+	bool showMouse(bool visible) { return false; }
 	void set_mouse_pos(int x, int y) {}
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {}
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {}
 	void set_shake_pos(int shake_pos) {}
 	uint32 get_msecs();
 	void delay_msecs(uint msecs);
diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
index 7ebb5e5d41..6842ab057c 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/sdl/graphics.cpp
@@ -532,7 +532,7 @@ void OSystem_SDL::setFullscreenMode(bool enable) {
 	}
 }
 
-void OSystem_SDL::copy_rect(const byte *src, int pitch, int x, int y, int w, int h) {
+void OSystem_SDL::copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h) {
 	if (_screen == NULL)
 		return;
 
@@ -829,15 +829,15 @@ void OSystem_SDL::set_shake_pos(int shake_pos) {
 #pragma mark --- Overlays ---
 #pragma mark -
 
-void OSystem_SDL::show_overlay() {
+void OSystem_SDL::showOverlay() {
 	// hide the mouse
 	undraw_mouse();
 
 	_overlayVisible = true;
-	clear_overlay();
+	clearOverlay();
 }
 
-void OSystem_SDL::hide_overlay() {
+void OSystem_SDL::hideOverlay() {
 	// hide the mouse
 	undraw_mouse();
 
@@ -845,7 +845,7 @@ void OSystem_SDL::hide_overlay() {
 	_forceFull = true;
 }
 
-void OSystem_SDL::clear_overlay() {
+void OSystem_SDL::clearOverlay() {
 	if (!_overlayVisible)
 		return;
 	
@@ -866,7 +866,7 @@ void OSystem_SDL::clear_overlay() {
 	_forceFull = true;
 }
 
-void OSystem_SDL::grab_overlay(OverlayColor *buf, int pitch) {
+void OSystem_SDL::grabOverlay(OverlayColor *buf, int pitch) {
 	if (!_overlayVisible)
 		return;
 
@@ -890,7 +890,7 @@ void OSystem_SDL::grab_overlay(OverlayColor *buf, int pitch) {
 	SDL_UnlockSurface(_tmpscreen);
 }
 
-void OSystem_SDL::copy_rect_overlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_SDL::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
 	if (!_overlayVisible)
 		return;
 
@@ -953,7 +953,7 @@ void OSystem_SDL::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
 #pragma mark --- Mouse ---
 #pragma mark -
 
-bool OSystem_SDL::show_mouse(bool visible) {
+bool OSystem_SDL::showMouse(bool visible) {
 	if (_mouseVisible == visible)
 		return visible;
 	
@@ -977,7 +977,7 @@ void OSystem_SDL::set_mouse_pos(int x, int y) {
 	}
 }
 
-void OSystem_SDL::warp_mouse(int x, int y) {
+void OSystem_SDL::warpMouse(int x, int y) {
 	if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		SDL_WarpMouse(x * _scaleFactor, y * _scaleFactor);
 
@@ -992,7 +992,7 @@ void OSystem_SDL::warp_mouse(int x, int y) {
 	}
 }
 	
-void OSystem_SDL::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
+void OSystem_SDL::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
 
 	undraw_mouse();
 
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index c71e147956..89a5b750fe 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -48,7 +48,7 @@ public:
 
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
-	void copy_rect(const byte *src, int pitch, int x, int y, int w, int h);
+	void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h);
 
 	void move_screen(int dx, int dy, int height);
 
@@ -56,15 +56,15 @@ public:
 	void updateScreen();
 
 	// Either show or hide the mouse cursor
-	bool show_mouse(bool visible);
+	bool showMouse(bool visible);
 	
 	// Warp the mouse cursor. Where set_mouse_pos() only informs the
 	// backend of the mouse cursor's current position, this function
 	// actually moves the cursor to the specified position.
-	void warp_mouse(int x, int y);
+	void warpMouse(int x, int y);
 
 	// Set the bitmap that's used when drawing the cursor.
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void set_shake_pos(int shake_pos);
@@ -111,11 +111,11 @@ public:
 	void deleteMutex(MutexRef mutex);
 
 	// Overlay
-	virtual void show_overlay();
-	virtual void hide_overlay();
-	virtual void clear_overlay();
-	virtual void grab_overlay(OverlayColor *buf, int pitch);
-	virtual void copy_rect_overlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
+	virtual void showOverlay();
+	virtual void hideOverlay();
+	virtual void clearOverlay();
+	virtual void grabOverlay(OverlayColor *buf, int pitch);
+	virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
 	virtual int16 getHeight();
 	virtual int16 getWidth();
 
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index 1789c56c3c..da6918d3b1 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -944,7 +944,7 @@ void OSystem_WINCE3::fillMouseEvent(Event &event, int x, int y) {
 	event.mouse.y = event.mouse.y * _scaleFactorYd / _scaleFactorYm;
 }
 
-void OSystem_WINCE3::warp_mouse(int x, int y) {
+void OSystem_WINCE3::warpMouse(int x, int y) {
 		if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		SDL_WarpMouse(x * _scaleFactorXm / _scaleFactorXd, y * _scaleFactorYm / _scaleFactorYd);
 
diff --git a/backends/wince/wince-sdl.h b/backends/wince/wince-sdl.h
index c11761e582..910cd558d0 100644
--- a/backends/wince/wince-sdl.h
+++ b/backends/wince/wince-sdl.h
@@ -57,7 +57,7 @@ public:
 	// Overloaded from SDL_Common (new scaler handling)
 	void add_dirty_rect(int x, int y, int w, int h);
 	// Overloaded from SDL_Common (new scaler handling)
-	void warp_mouse(int x, int y);
+	void warpMouse(int x, int y);
 	// Overloaded from SDL_Commmon
 	void quit();
 	// Overloaded from SDL_Commmon (master volume and sample rate subtleties)
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp
index 5b49cbac08..482c52bbc6 100644
--- a/backends/x11/x11.cpp
+++ b/backends/x11/x11.cpp
@@ -88,7 +88,7 @@ public:
 
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
-	void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 
 	void move_screen(int dx, int dy, int height);
 
@@ -96,7 +96,7 @@ public:
 	void updateScreen();
 
 	// Either show or hide the mouse cursor
-	bool show_mouse(bool visible);
+	bool showMouse(bool visible);
 
 	// Set the position of the mouse cursor
 	void set_mouse_pos(int x, int y);
@@ -104,10 +104,10 @@ public:
 	// Warp the mouse cursor. Where set_mouse_pos() only informs the
 	// backend of the mouse cursor's current position, this function
 	// actually moves the cursor to the specified position.
-	void warp_mouse(int x, int y);
+	void warpMouse(int x, int y);
 
 	// Set the bitmap that's used when drawing the cursor.
-	void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
 
 	// Shaking is used in SCUMM. Set current shake position.
 	void set_shake_pos(int shake_pos);
@@ -159,11 +159,11 @@ public:
 	void deleteMutex(MutexRef mutex);
 
 	// Overlay handling for the new menu system
-	void show_overlay();
-	void hide_overlay();
-	void clear_overlay();
-	void grab_overlay(int16 *, int);
-	void copy_rect_overlay(const int16 *, int, int, int, int, int);
+	void showOverlay();
+	void hideOverlay();
+	void clearOverlay();
+	void grabOverlay(int16 *, int);
+	void copyRectToOverlay(const int16 *, int, int, int, int, int);
 	virtual int16 getHeight();
 	virtual int16 getWidth();
 
@@ -550,7 +550,7 @@ void OSystem_X11::setPalette(const byte *colors, uint start, uint num) {
     num_of_dirty_square++;					\
   }
 
-void OSystem_X11::copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_X11::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
 	uint8 *dst;
 
 	if (y < 0) {
@@ -586,12 +586,12 @@ void OSystem_X11::move_screen(int dx, int dy, int height) {
 			// move down
 			// copy from bottom to top
 			for (int y = height - 1; y >= dy; y--)
-				copy_rect(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
+				copyRectToScreen(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
 		} else {
 			// move up
 			// copy from top to bottom
 			for (int y = 0; y < height + dx; y++)
-				copy_rect(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
+				copyRectToScreen(local_fb + fb_width * (y - dy), fb_width, 0, y, fb_width, 1);
 		}
 	} else if (dy == 0) {
 		// horizontal movement
@@ -599,12 +599,12 @@ void OSystem_X11::move_screen(int dx, int dy, int height) {
 			// move right
 			// copy from right to left
 			for (int x = fb_width - 1; x >= dx; x--)
-				copy_rect(local_fb + x - dx, fb_width, x, 0, 1, height);
+				copyRectToScreen(local_fb + x - dx, fb_width, x, 0, 1, height);
 		} else {
 			// move left
 			// copy from left to right
 			for (int x = 0; x < fb_width; x++)
-				copy_rect(local_fb + x - dx, fb_width, x, 0, 1, height);
+				copyRectToScreen(local_fb + x - dx, fb_width, x, 0, 1, height);
 		}
 	} else {
 		// free movement
@@ -697,7 +697,7 @@ void OSystem_X11::updateScreen() {
 	}
 }
 
-bool OSystem_X11::show_mouse(bool visible)
+bool OSystem_X11::showMouse(bool visible)
 {
 	if (_mouse_visible == visible)
 		return visible;
@@ -804,11 +804,11 @@ void OSystem_X11::set_mouse_pos(int x, int y) {
 	}
 }
 
-void OSystem_X11::warp_mouse(int x, int y) {
+void OSystem_X11::warpMouse(int x, int y) {
 	set_mouse_pos(x, y);
 }
 
-void OSystem_X11::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
+void OSystem_X11::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
 	cur_state.w = w;
 	cur_state.h = h;
 	cur_state.hot_x = hotspot_x;
@@ -1095,16 +1095,16 @@ void OSystem_X11::deleteMutex(MutexRef mutex) {
 	free(mutex);
 }
 
-void OSystem_X11::show_overlay() {
+void OSystem_X11::showOverlay() {
 	_overlay_visible = true;
 }
 
-void OSystem_X11::hide_overlay() {
+void OSystem_X11::hideOverlay() {
 	_overlay_visible = false;
 	_palette_changed = true; // This is to force a full redraw to hide the overlay
 }
 
-void OSystem_X11::clear_overlay() {
+void OSystem_X11::clearOverlay() {
 	if (_overlay_visible == false)
 		return;
 	dirty_square d = { 0, 0, fb_width, fb_height };
@@ -1112,7 +1112,7 @@ void OSystem_X11::clear_overlay() {
 	blit_convert(&d, local_fb_overlay, fb_width);
 }
 
-void OSystem_X11::grab_overlay(int16 *dest, int pitch) {
+void OSystem_X11::grabOverlay(int16 *dest, int pitch) {
 	if (_overlay_visible == false)
 		return;
 	
@@ -1120,7 +1120,7 @@ void OSystem_X11::grab_overlay(int16 *dest, int pitch) {
 	blit_convert(&d, (uint16 *) dest, pitch);
 }
 
-void OSystem_X11::copy_rect_overlay(const int16 *src, int pitch, int x, int y, int w, int h) {
+void OSystem_X11::copyRectToOverlay(const int16 *src, int pitch, int x, int y, int w, int h) {
 	if (_overlay_visible == false)
 		return;
 	uint16 *dst = local_fb_overlay + x + (y * fb_width);