From 4484b433abc8f07bcf7d4d22fd946e00b66b078d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Sep 2011 19:43:40 +0300
Subject: Fix first part of shadow variables/methods errors.

---
 src/gui/charselectdialog.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui/charselectdialog.cpp')

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 75468d1ab..f926a90aa 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -121,20 +121,20 @@ class CharacterDisplay : public Container
         Button *mDelete;
 };
 
-CharSelectDialog::CharSelectDialog(LoginData *loginData):
+CharSelectDialog::CharSelectDialog(LoginData *data):
     Window(_("Account and Character Management")),
     mLocked(false),
     mUnregisterButton(0),
     mChangeEmailButton(0),
     mCharacterEntries(0),
-    mLoginData(loginData),
+    mLoginData(data),
     mCharHandler(Net::getCharHandler()),
     mDeleteDialog(0),
     mDeleteIndex(-1)
 {
     setCloseButton(false);
 
-    mAccountNameLabel = new Label(loginData->username);
+    mAccountNameLabel = new Label(mLoginData->username);
     mSwitchLoginButton = new Button(_("Switch Login"), "switch", this);
     mChangePasswordButton = new Button(_("Change Password"), "change_password",
                                        this);
@@ -373,7 +373,7 @@ void CharSelectDialog::setLocked(bool locked)
 }
 
 bool CharSelectDialog::selectByName(const std::string &name,
-                                    SelectAction action)
+                                    SelectAction selAction)
 {
     if (mLocked)
         return false;
@@ -387,7 +387,7 @@ bool CharSelectDialog::selectByName(const std::string &name,
             {
                 if (mCharacterEntries[i])
                     mCharacterEntries[i]->requestFocus();
-                if (action == Choose)
+                if (selAction == Choose)
                     attemptCharacterSelect(i);
                 return true;
             }
-- 
cgit v1.2.3-70-g09d2