summaryrefslogtreecommitdiff
path: root/src/gui/quitdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
commite3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch)
tree494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/gui/quitdialog.cpp
parent703a3c4df3732e3e88559147001260f3355d42d6 (diff)
downloadmanaverse-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz
manaverse-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2
manaverse-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz
manaverse-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/gui/quitdialog.cpp')
-rw-r--r--src/gui/quitdialog.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 96848f645..e71e291d1 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -55,7 +55,7 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
addKeyListener(this);
- ContainerPlacer place = getPlacer(0, 0);
+ ContainerPlacer placer = getPlacer(0, 0);
const State state = Client::getState();
@@ -67,25 +67,25 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
state == STATE_UPDATE ||
state == STATE_LOAD_DATA)
{
- placeOption(place, mForceQuit);
+ placeOption(placer, mForceQuit);
}
else
{
// Only added if we are connected to an accountserver or gameserver
- placeOption(place, mLogoutQuit);
- placeOption(place, mSwitchAccountServer);
+ placeOption(placer, mLogoutQuit);
+ placeOption(placer, mSwitchAccountServer);
// Only added if we are connected to a gameserver
if (state == STATE_GAME)
- placeOption(place, mSwitchCharacter);
+ placeOption(placer, mSwitchCharacter);
}
mOptions[0]->setSelected(true);
- place = getPlacer(0, 1);
+ placer = getPlacer(0, 1);
- place(1, 0, mOkButton, 1);
- place(2, 0, mCancelButton, 1);
+ placer(1, 0, mOkButton, 1);
+ placer(2, 0, mCancelButton, 1);
reflowLayout(200, 0);
setLocationRelativeTo(getParent());
@@ -109,9 +109,9 @@ QuitDialog::~QuitDialog()
mSwitchCharacter = 0;
}
-void QuitDialog::placeOption(ContainerPlacer &place, gcn::RadioButton *option)
+void QuitDialog::placeOption(ContainerPlacer &placer, gcn::RadioButton *option)
{
- place(0, static_cast<int>(mOptions.size()), option, 3);
+ placer(0, static_cast<int>(mOptions.size()), option, 3);
mOptions.push_back(option);
}