[Scummvm-cvs-logs] scummvm master -> 2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d

digitall dgturner at iee.org
Mon Dec 17 00:23:45 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2cbb89fc1f WINCE: Fix shadow variable warnings associated with GUIElement classes.


Commit: 2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d
    https://github.com/scummvm/scummvm/commit/2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d
Author: D G Turner (digitall at scummvm.org)
Date: 2012-12-16T15:22:31-08:00

Commit Message:
WINCE: Fix shadow variable warnings associated with GUIElement classes.

Changed paths:
    backends/platform/wince/CEgui/GUIElement.cpp
    backends/platform/wince/CEgui/GUIElement.h
    backends/platform/wince/CEgui/ToolbarHandler.cpp



diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 241cf51..c8e68b8 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -98,19 +98,19 @@ bool GUIElement::drawn() {
 	return _drawn;
 }
 
-int GUIElement::x() {
+int GUIElement::getX() {
 	return _x;
 }
 
-int GUIElement::y() {
+int GUIElement::getY() {
 	return _y;
 }
 
-int GUIElement::width() {
+int GUIElement::getWidth() {
 	return _width;
 }
 
-int GUIElement::height() {
+int GUIElement::getHeight() {
 	return _height;
 }
 
diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h
index 2639de3..44c4b3f 100644
--- a/backends/platform/wince/CEgui/GUIElement.h
+++ b/backends/platform/wince/CEgui/GUIElement.h
@@ -40,10 +40,10 @@ public:
 	virtual bool draw(SDL_Surface *surface);
 	virtual ~GUIElement();
 	void move(int x, int y);
-	int width();
-	int height();
-	int x();
-	int y();
+	int getWidth();
+	int getHeight();
+	int getX();
+	int getY();
 	virtual bool action(int x, int y, bool pushed) = 0;
 	bool visible();
 	bool drawn();
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp
index 6f4ac31..f3e42e1 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp
@@ -96,10 +96,10 @@ bool ToolbarHandler::draw(SDL_Surface *surface, SDL_Rect *rect) {
 	if (_active) {
 		bool result = _active->draw(surface);
 		if (result) {
-			rect->x = _active->x();
-			rect->y = _active->y();
-			rect->w = _active->width();
-			rect->h = _active->height();
+			rect->x = _active->getX();
+			rect->y = _active->getY();
+			rect->w = _active->getWidth();
+			rect->h = _active->getHeight();
 		}
 		return result;
 	} else






More information about the Scummvm-git-logs mailing list