Renamed more OSystem methods

svn-id: r13410

4 files changed, 22 insertions, 22 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();