aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/wince
diff options
context:
space:
mode:
authorD G Turner2012-11-20 01:21:47 +0000
committerD G Turner2012-12-16 23:22:31 +0000
commit2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d (patch)
tree83cf93c1a0df12b3e2357dea2133fed53359c776 /backends/platform/wince
parentc93a7c3921f27937bd4400ec2fb5fe90aad63c88 (diff)
downloadscummvm-rg350-2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d.tar.gz
scummvm-rg350-2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d.tar.bz2
scummvm-rg350-2cbb89fc1f92cbff15f01e3a9caa5a4582e3da2d.zip
WINCE: Fix shadow variable warnings associated with GUIElement classes.
Diffstat (limited to 'backends/platform/wince')
-rw-r--r--backends/platform/wince/CEgui/GUIElement.cpp8
-rw-r--r--backends/platform/wince/CEgui/GUIElement.h8
-rw-r--r--backends/platform/wince/CEgui/ToolbarHandler.cpp8
3 files changed, 12 insertions, 12 deletions
diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 241cf514f3..c8e68b87fd 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 2639de38ca..44c4b3f275 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 6f4ac317cd..f3e42e11fa 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