Fix first part of shadow variables/methods errors.

8 files changed, 72 insertions, 72 deletions

diff --git a/src/guichan/cliprectangle.cpp b/src/guichan/cliprectangle.cpp
index feaa47729..6effb48c8 100644
--- a/src/guichan/cliprectangle.cpp
+++ b/src/guichan/cliprectangle.cpp
@@ -61,15 +61,15 @@ namespace gcn
         yOffset = 0;
     }
 
-    ClipRectangle::ClipRectangle(int x, int y, int width, int height,
-                                 int xOffset, int yOffset)
+    ClipRectangle::ClipRectangle(int x0, int y0, int width0, int height0,
+                                 int xOffset0, int yOffset0)
     {
-        this->x = x;
-        this->y = y;
-        this->width = width;
-        this->height = height;
-        this->xOffset = xOffset;
-        this->yOffset = yOffset;
+        x = x0;
+        y = y0;
+        width = width0;
+        height = height0;
+        xOffset = xOffset0;
+        yOffset = yOffset0;
     }
 
     const ClipRectangle& ClipRectangle::operator=(const Rectangle& other)
diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp
index 792c40bb9..b5aa5e4af 100644
--- a/src/guichan/include/guichan/cliprectangle.hpp
+++ b/src/guichan/include/guichan/cliprectangle.hpp
@@ -67,23 +67,23 @@ namespace gcn
         /**
          * Constructor.
          *
-         * @param x The rectangle x coordinate.
-         * @param y The rectangle y coordinate.
-         * @param width The rectangle width.
-         * @param height The rectangle height.
-         * @param xOffset The offset of the x coordinate. Used to for
-         *                calculating the actual screen coordinate from
-         *                the relative screen coordinate.
-         * @param yOffset The offset of the y coordinate. Used to for
-         *                calculating the actual screen coordinate from
-         *                the relative screen coordinate.
+         * @param x0 The rectangle x coordinate.
+         * @param y0 The rectangle y coordinate.
+         * @param width0 The rectangle width.
+         * @param height0 The rectangle height.
+         * @param xOffset0 The offset of the x coordinate. Used to for
+         *                 calculating the actual screen coordinate from
+         *                 the relative screen coordinate.
+         * @param yOffset0 The offset of the y coordinate. Used to for
+         *                 calculating the actual screen coordinate from
+         *                 the relative screen coordinate.
          */
-        ClipRectangle(int x, 
-                      int y, 
-                      int width, 
-                      int height,
-                      int xOffset, 
-                      int yOffset);
+        ClipRectangle(int x0,
+                      int y0,
+                      int width0,
+                      int height0,
+                      int xOffset0,
+                      int yOffset0);
 
         /**
          * Copy constructor. Copies x, y, width and height 
diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp
index 8594d3dae..f252341cf 100644
--- a/src/guichan/include/guichan/inputevent.hpp
+++ b/src/guichan/include/guichan/inputevent.hpp
@@ -69,10 +69,10 @@ namespace gcn
          * @param isMetaPressed True if meta is pressed, false otherwise.
          */
         InputEvent(Widget* source,
-                   bool isShiftPressed,
-                   bool isControlPressed,
-                   bool isAltPressed,
-                   bool isMetaPressed);
+                   bool shiftPressed,
+                   bool controlPressed,
+                   bool altPressed,
+                   bool metaPressed);
 
         /**
          * Checks if shift is pressed.
diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp
index f42601235..5c10238c5 100644
--- a/src/guichan/include/guichan/keyevent.hpp
+++ b/src/guichan/include/guichan/keyevent.hpp
@@ -71,22 +71,22 @@ namespace gcn
          * Constructor.
          *
          * @param source The source widget of the event.
-         * @param isShiftPressed True if shift is pressed, false otherwise.
-         * @param isControlPressed True if control is pressed, false otherwise.
-         * @param isAltPressed True if alt is pressed, false otherwise.
-         * @param isMetaPressed True if meta is pressed, false otherwise.
+         * @param shiftPressed True if shift is pressed, false otherwise.
+         * @param controlPressed True if control is pressed, false otherwise.
+         * @param altPressed True if alt is pressed, false otherwise.
+         * @param metaPressed True if meta is pressed, false otherwise.
          * @param type The type of the event. A value from KeyEventType.
-         * @param isNumericPad True if the event occured on the numeric pad,
+         * @param numericPad True if the event occured on the numeric pad,
          *                     false otherwise.
          * @param key The key of the event.
          */
         KeyEvent(Widget* source,
-                 bool isShiftPressed,
-                 bool isControlPressed,
-                 bool isAltPressed,
-                 bool isMetaPressed,
+                 bool shiftPressed,
+                 bool controlPressed,
+                 bool altPressed,
+                 bool metaPressed,
                  unsigned int type,
-                 bool isNumericPad,
+                 bool numericPad,
                  const Key& key);
 
         /**
diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp
index 280d373e6..6f6dc828c 100644
--- a/src/guichan/include/guichan/mouseevent.hpp
+++ b/src/guichan/include/guichan/mouseevent.hpp
@@ -66,10 +66,10 @@ namespace gcn
          * Constructor.
          *
          * @param source The source widget of the mouse event.
-         * @param isShiftPressed True if shift is pressed, false otherwise.
-         * @param isControlPressed True if control is pressed, false otherwise.
-         * @param isAltPressed True if alt is pressed, false otherwise.
-         * @param isMetaPressed True if meta is pressed, false otherwise.
+         * @param shiftPressed True if shift is pressed, false otherwise.
+         * @param controlPressed True if control is pressed, false otherwise.
+         * @param altPressed True if alt is pressed, false otherwise.
+         * @param metaPressed True if meta is pressed, false otherwise.
          * @param type The type of the mouse event.
          * @param button The button of the mouse event.
          * @param x The x coordinate of the event relative to the source widget.
@@ -78,10 +78,10 @@ namespace gcn
          *                   It's set to zero if another button is used.
          */
         MouseEvent(Widget* source,
-                   bool isShiftPressed,
-                   bool isControlPressed,
-                   bool isAltPressed,
-                   bool isMetaPressed,
+                   bool shiftPressed,
+                   bool controlPressed,
+                   bool altPressed,
+                   bool metaPressed,
                    unsigned int type,
                    unsigned int button,
                    int x,
diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp
index 7a3bdb06d..a135b15b8 100644
--- a/src/guichan/inputevent.cpp
+++ b/src/guichan/inputevent.cpp
@@ -52,15 +52,15 @@
 namespace gcn
 {
     InputEvent::InputEvent(Widget* source,
-                           bool isShiftPressed,
-                           bool isControlPressed,
-                           bool isAltPressed,
-                           bool isMetaPressed)
+                           bool shiftPressed,
+                           bool controlPressed,
+                           bool altPressed,
+                           bool metaPressed)
             :Event(source),
-             mShiftPressed(isShiftPressed),
-             mControlPressed(isControlPressed),
-             mAltPressed(isAltPressed),
-             mMetaPressed(isMetaPressed),
+             mShiftPressed(shiftPressed),
+             mControlPressed(controlPressed),
+             mAltPressed(altPressed),
+             mMetaPressed(metaPressed),
              mIsConsumed(false)
     {
 
diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp
index 1bc8fe9d2..f9c14bb59 100644
--- a/src/guichan/keyevent.cpp
+++ b/src/guichan/keyevent.cpp
@@ -52,20 +52,20 @@
 namespace gcn
 {
     KeyEvent::KeyEvent(Widget* source,
-                       bool isShiftPressed,
-                       bool isControlPressed,
-                       bool isAltPressed,
-                       bool isMetaPressed,
+                       bool shiftPressed,
+                       bool controlPressed,
+                       bool altPressed,
+                       bool metaPressed,
                        unsigned int type,
-                       bool isNumericPad,
+                       bool numericPad,
                        const Key& key)
             :InputEvent(source,
-                        isShiftPressed,
-                        isControlPressed,
-                        isAltPressed,
-                        isMetaPressed),
+                        shiftPressed,
+                        controlPressed,
+                        altPressed,
+                        metaPressed),
              mType(type),
-             mIsNumericPad(isNumericPad),
+             mIsNumericPad(numericPad),
              mKey(key)
     {
 
diff --git a/src/guichan/mouseevent.cpp b/src/guichan/mouseevent.cpp
index e5046ed15..5ff544a04 100644
--- a/src/guichan/mouseevent.cpp
+++ b/src/guichan/mouseevent.cpp
@@ -52,20 +52,20 @@
 namespace gcn
 {
     MouseEvent::MouseEvent(Widget* source,
-                           bool isShiftPressed,
-                           bool isControlPressed,
-                           bool isAltPressed,
-                           bool isMetaPressed,
+                           bool shiftPressed,
+                           bool controlPressed,
+                           bool altPressed,
+                           bool metaPressed,
                            unsigned int type,
                            unsigned int button,
                            int x,
                            int y,
                            int clickCount)
             :InputEvent(source,
-                        isShiftPressed,
-                        isControlPressed,
-                        isAltPressed,
-                        isMetaPressed),
+                        shiftPressed,
+                        controlPressed,
+                        altPressed,
+                        metaPressed),
              mType(type),
              mButton(button),
              mX(x),