Fix first part of shadow variables/methods errors.

5 files changed, 55 insertions, 60 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index d4764cba5..29fca7662 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -373,7 +373,7 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
             default:
             {
                 Map *map = viewport->getMap();
-                Avatar *ava = model->getAvatarAt(selected);
+                ava = model->getAvatarAt(selected);
                 if (map && ava)
                 {
                     MapItem *mapItem = map->findPortalXY(
@@ -384,7 +384,6 @@ void AvatarListBox::mousePressed(gcn::MouseEvent &event)
             }
         }
     }
-
     else if (event.getButton() == gcn::MouseEvent::MIDDLE)
     {
         if (ava->getType() == AVATAR_PLAYER && chatWindow)
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 65a25363d..c20eb4622 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -210,23 +210,23 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
 
         for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i)
         {
-            std::string row = *i;
-            for (unsigned int j = 0; j < row.size(); j++)
+            std::string tempRow = *i;
+            for (unsigned int j = 0; j < tempRow.size(); j++)
             {
-                std::string character = row.substr(j, 1);
+                std::string character = tempRow.substr(j, 1);
                 x += font->getWidth(character);
                 nextChar = j + 1;
 
                 // Wraping between words (at blank spaces)
-                if ((nextChar < row.size()) && (row.at(nextChar) == ' '))
+                if (nextChar < tempRow.size() && tempRow.at(nextChar) == ' ')
                 {
                     int nextSpacePos = static_cast<int>(
-                        row.find(" ", (nextChar + 1)));
+                        tempRow.find(" ", (nextChar + 1)));
                     if (nextSpacePos <= 0)
-                        nextSpacePos = static_cast<int>(row.size()) - 1;
+                        nextSpacePos = static_cast<int>(tempRow.size()) - 1;
 
                     unsigned nextWordWidth = font->getWidth(
-                        row.substr(nextChar,
+                        tempRow.substr(nextChar,
                         (nextSpacePos - nextChar)));
 
                     if ((x + nextWordWidth + 10) > (unsigned)getWidth())
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 38088770b..ebfdbe303 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -44,8 +44,8 @@ Popup::Popup(const std::string &name, const std::string &skin):
     mPopupName(name),
     mMinWidth(100),
     mMinHeight(40),
-    mMaxWidth(graphics->mWidth),
-    mMaxHeight(graphics->mHeight),
+    mMaxWidth(mainGraphics->mWidth),
+    mMaxHeight(mainGraphics->mHeight),
     mVertexes(new GraphicsVertexes()),
     mRedraw(true)
 {
@@ -190,9 +190,9 @@ void Popup::position(int x, int y)
     int posX = std::max(0, x - getWidth() / 2);
     int posY = y + distance;
 
-    if (posX + getWidth() > graphics->mWidth)
-        posX = graphics->mWidth - getWidth();
-    if (posY + getHeight() > graphics->mHeight)
+    if (posX + getWidth() > mainGraphics->mWidth)
+        posX = mainGraphics->mWidth - getWidth();
+    if (posY + getHeight() > mainGraphics->mHeight)
         posY = y - getHeight() - distance;
 
     setPosition(posX, posY);
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 52a26ddac..36ed96bd2 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -94,8 +94,8 @@ class ProgressBar : public gcn::Widget, public gcn::WidgetListener
         /**
          * Sets the text shown on the progress bar.
          */
-        void setText(const std::string &text)
-        { mText = text; }
+        void setText(const std::string &str)
+        { mText = str; }
 
         /**
          * Returns the text shown on the progress bar.
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9709f4c8a..05509ab39 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -63,8 +63,8 @@ Window::Window(const std::string &caption, bool modal, Window *parent,
     mStickyButtonLock(false),
     mMinWinWidth(100),
     mMinWinHeight(40),
-    mMaxWinWidth(graphics->mWidth),
-    mMaxWinHeight(graphics->mHeight),
+    mMaxWinWidth(mainGraphics->mWidth),
+    mMaxWinHeight(mainGraphics->mHeight),
     mVertexes(new GraphicsVertexes()),
     mRedraw(true)
 {
@@ -244,39 +244,39 @@ void Window::setLocationRelativeTo(ImageRect::ImagePosition position,
     }
     else if (position == ImageRect::UPPER_CENTER)
     {
-        offsetX += (graphics->mWidth - getWidth()) / 2;
+        offsetX += (mainGraphics->mWidth - getWidth()) / 2;
     }
     else if (position == ImageRect::UPPER_RIGHT)
     {
-        offsetX += graphics->mWidth - getWidth();
+        offsetX += mainGraphics->mWidth - getWidth();
     }
     else if (position == ImageRect::LEFT)
     {
-        offsetY += (graphics->mHeight - getHeight()) / 2;
+        offsetY += (mainGraphics->mHeight - getHeight()) / 2;
     }
     else if (position == ImageRect::CENTER)
     {
-        offsetX += (graphics->mWidth - getWidth()) / 2;
-        offsetY += (graphics->mHeight - getHeight()) / 2;
+        offsetX += (mainGraphics->mWidth - getWidth()) / 2;
+        offsetY += (mainGraphics->mHeight - getHeight()) / 2;
     }
     else if (position == ImageRect::RIGHT)
     {
-        offsetX += graphics->mWidth - getWidth();
-        offsetY += (graphics->mHeight - getHeight()) / 2;
+        offsetX += mainGraphics->mWidth - getWidth();
+        offsetY += (mainGraphics->mHeight - getHeight()) / 2;
     }
     else if (position == ImageRect::LOWER_LEFT)
     {
-        offsetY += graphics->mHeight - getHeight();
+        offsetY += mainGraphics->mHeight - getHeight();
     }
     else if (position == ImageRect::LOWER_CENTER)
     {
-        offsetX += (graphics->mWidth - getWidth()) / 2;
-        offsetY += graphics->mHeight - getHeight();
+        offsetX += (mainGraphics->mWidth - getWidth()) / 2;
+        offsetY += mainGraphics->mHeight - getHeight();
     }
     else if (position == ImageRect::LOWER_RIGHT)
     {
-        offsetX += graphics->mWidth - getWidth();
-        offsetY += graphics->mHeight - getHeight();
+        offsetX += mainGraphics->mWidth - getWidth();
+        offsetY += mainGraphics->mHeight - getHeight();
     }
 
     setPosition(offsetX, offsetY);
@@ -579,8 +579,8 @@ void Window::mouseDragged(gcn::MouseEvent &event)
     {
         int newX = std::max(0, getX());
         int newY = std::max(0, getY());
-        newX = std::min(graphics->mWidth - getWidth(), newX);
-        newY = std::min(graphics->mHeight - getHeight(), newY);
+        newX = std::min(mainGraphics->mWidth - getWidth(), newX);
+        newY = std::min(mainGraphics->mHeight - getHeight(), newY);
         setPosition(newX, newY);
     }
 
@@ -621,14 +621,10 @@ void Window::mouseDragged(gcn::MouseEvent &event)
             newDim.height += newDim.y;
             newDim.y = 0;
         }
-        if (newDim.x + newDim.width > graphics->mWidth)
-        {
-            newDim.width = graphics->mWidth - newDim.x;
-        }
-        if (newDim.y + newDim.height > graphics->mHeight)
-        {
-            newDim.height = graphics->mHeight - newDim.y;
-        }
+        if (newDim.x + newDim.width > mainGraphics->mWidth)
+            newDim.width = mainGraphics->mWidth - newDim.x;
+        if (newDim.y + newDim.height > mainGraphics->mHeight)
+            newDim.height = mainGraphics->mHeight - newDim.y;
 
         // Update mouse offset when dragging bottom or right border
         if (mouseResize & BOTTOM)
@@ -790,39 +786,39 @@ void Window::setDefaultSize(int defaultWidth, int defaultHeight,
     }
     else if (position == ImageRect::UPPER_CENTER)
     {
-        x = (graphics->mWidth - defaultWidth) / 2;
+        x = (mainGraphics->mWidth - defaultWidth) / 2;
     }
     else if (position == ImageRect::UPPER_RIGHT)
     {
-        x = graphics->mWidth - defaultWidth;
+        x = mainGraphics->mWidth - defaultWidth;
     }
     else if (position == ImageRect::LEFT)
     {
-        y = (graphics->mHeight - defaultHeight) / 2;
+        y = (mainGraphics->mHeight - defaultHeight) / 2;
     }
     else if (position == ImageRect::CENTER)
     {
-        x = (graphics->mWidth - defaultWidth) / 2;
-        y = (graphics->mHeight - defaultHeight) / 2;
+        x = (mainGraphics->mWidth - defaultWidth) / 2;
+        y = (mainGraphics->mHeight - defaultHeight) / 2;
     }
     else if (position == ImageRect::RIGHT)
     {
-        x = graphics->mWidth - defaultWidth;
-        y = (graphics->mHeight - defaultHeight) / 2;
+        x = mainGraphics->mWidth - defaultWidth;
+        y = (mainGraphics->mHeight - defaultHeight) / 2;
     }
     else if (position == ImageRect::LOWER_LEFT)
     {
-        y = graphics->mHeight - defaultHeight;
+        y = mainGraphics->mHeight - defaultHeight;
     }
     else if (position == ImageRect::LOWER_CENTER)
     {
-        x = (graphics->mWidth - defaultWidth) / 2;
-        y = graphics->mHeight - defaultHeight;
+        x = (mainGraphics->mWidth - defaultWidth) / 2;
+        y = mainGraphics->mHeight - defaultHeight;
     }
     else if (position == ImageRect::LOWER_RIGHT)
     {
-        x = graphics->mWidth - defaultWidth;
-        y = graphics->mHeight - defaultHeight;
+        x = mainGraphics->mWidth - defaultWidth;
+        y = mainGraphics->mHeight - defaultHeight;
     }
 
     mDefaultX = x - offsetX;
@@ -994,11 +990,11 @@ void Window::checkIfIsOffScreen(bool partially, bool entirely)
     // Look if the window is partially off-screen limits...
     if (partially)
     {
-        if (winDimension.x + winDimension.width > graphics->mWidth)
-            winDimension.x = graphics->mWidth - winDimension.width;
+        if (winDimension.x + winDimension.width > mainGraphics->mWidth)
+            winDimension.x = mainGraphics->mWidth - winDimension.width;
 
-        if (winDimension.y + winDimension.height > graphics->mHeight)
-            winDimension.y = graphics->mHeight - winDimension.height;
+        if (winDimension.y + winDimension.height > mainGraphics->mHeight)
+            winDimension.y = mainGraphics->mHeight - winDimension.height;
 
         setDimension(winDimension);
         return;
@@ -1006,11 +1002,11 @@ void Window::checkIfIsOffScreen(bool partially, bool entirely)
 
     if (entirely)
     {
-        if (winDimension.x > graphics->mWidth)
-            winDimension.x = graphics->mWidth - winDimension.width;
+        if (winDimension.x > mainGraphics->mWidth)
+            winDimension.x = mainGraphics->mWidth - winDimension.width;
 
-        if (winDimension.y > graphics->mHeight)
-            winDimension.y = graphics->mHeight - winDimension.height;
+        if (winDimension.y > mainGraphics->mHeight)
+            winDimension.y = mainGraphics->mHeight - winDimension.height;
     }
     setDimension(winDimension);
 }