diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/charselectdialog.cpp | |
parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
download | ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r-- | src/gui/charselectdialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 00cae41e6..93302e0ff 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -122,14 +122,14 @@ class CharacterDisplay : public Container }; CharSelectDialog::CharSelectDialog(LoginData *data): - Window(_("Account and Character Management"), false, 0, "char.xml"), + Window(_("Account and Character Management"), false, nullptr, "char.xml"), mLocked(false), - mUnregisterButton(0), - mChangeEmailButton(0), + mUnregisterButton(nullptr), + mChangeEmailButton(nullptr), mCharacterEntries(0), mLoginData(data), mCharHandler(Net::getCharHandler()), - mDeleteDialog(0), + mDeleteDialog(nullptr), mDeleteIndex(-1) { setCloseButton(false); @@ -246,7 +246,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event) == LoginDialog::savedPassword) { attemptCharacterDelete(mDeleteIndex); - mDeleteDialog = 0; + mDeleteDialog = nullptr; } else { @@ -313,7 +313,7 @@ void CharSelectDialog::setCharacters(const Net::Characters &characters) for (iter = mCharacterEntries.begin(), iter_end = mCharacterEntries.end(); iter != iter_end; ++iter) { - (*iter)->setCharacter(0); + (*iter)->setCharacter(nullptr); } Net::Characters::const_iterator i, i_end = characters.end(); @@ -399,7 +399,7 @@ bool CharSelectDialog::selectByName(const std::string &name, CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog): - mCharacter(0), + mCharacter(nullptr), mPlayerBox(new PlayerBox) { mButton = new Button("wwwwwwwww", "go", charSelectDialog); @@ -445,7 +445,7 @@ void CharacterDisplay::setCharacter(Net::Character *character) return; mCharacter = character; - mPlayerBox->setPlayer(character ? character->dummy : 0); + mPlayerBox->setPlayer(character ? character->dummy : nullptr); update(); } |