diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-05-18 21:27:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-05-18 21:27:05 +0300 |
| commit | d63a8fd1db07b0cd0128165edb429418c3b5c393 (patch) | |
| tree | d523ac3f8cd60e98c45af9217141f7d4a6a4bffd | |
| parent | 2f548dd7865863a8cc774d485bef30bfc9b50b6d (diff) | |
| download | manaverse-d63a8fd1db07b0cd0128165edb429418c3b5c393.tar.gz manaverse-d63a8fd1db07b0cd0128165edb429418c3b5c393.tar.bz2 manaverse-d63a8fd1db07b0cd0128165edb429418c3b5c393.tar.xz manaverse-d63a8fd1db07b0cd0128165edb429418c3b5c393.zip | |
improve quitdialog class.
| -rw-r--r-- | src/gui/quitdialog.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp index 973883466..77bd26b8e 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/quitdialog.cpp @@ -76,9 +76,7 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe): addKeyListener(this); ContainerPlacer placer = getPlacer(0, 0); - const State state = Client::getState(); - mNeedForceQuit = (state == STATE_CHOOSE_SERVER || state == STATE_CONNECT_SERVER || state == STATE_LOGIN || state == STATE_PRE_LOGIN || state == STATE_LOGIN_ATTEMPT @@ -124,7 +122,6 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe): setLocationRelativeTo(getParent()); setVisible(true); soundManager.playGuiSound(SOUND_SHOW_WINDOW); -// enableVisibleSound(true); requestModalFocus(); mOkButton->requestFocus(); } @@ -133,7 +130,6 @@ QuitDialog::~QuitDialog() { if (mMyPointer) *mMyPointer = nullptr; - // Optional widgets, so delete them by hand. delete mForceQuit; mForceQuit = nullptr; delete mLogoutQuit; @@ -233,7 +229,8 @@ void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent) if (dir != 0) { std::vector<RadioButton*>::const_iterator it = mOptions.begin(); - std::vector<RadioButton*>::const_iterator it_end = mOptions.end(); + const std::vector<RadioButton*>::const_iterator + it_end = mOptions.end(); for (; it < it_end; ++it) { |