diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/gui/windowmenu.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz manaverse-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/gui/windowmenu.cpp')
-rw-r--r-- | src/gui/windowmenu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 487035350..3f41be466 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -58,7 +58,7 @@ extern Window *botCheckerWindow; extern Window *socialWindow; WindowMenu::WindowMenu(): - mEmotePopup(0) + mEmotePopup(nullptr) { int x = 0, h = 0; @@ -115,7 +115,7 @@ WindowMenu::WindowMenu(): WindowMenu::~WindowMenu() { delete mTextPopup; - mTextPopup = 0; + mTextPopup = nullptr; mButtonNames.clear(); std::vector <gcn::Button*>::iterator it, it_end; for (it = mButtons.begin(), it_end = mButtons.end(); it != it_end; ++it) @@ -132,7 +132,7 @@ WindowMenu::~WindowMenu() void WindowMenu::action(const gcn::ActionEvent &event) { - Window *window = 0; + Window *window = nullptr; if (event.getId() == ":-)") { @@ -153,14 +153,14 @@ void WindowMenu::action(const gcn::ActionEvent &event) } else { - mEmotePopup = 0; + mEmotePopup = nullptr; } } else { if (windowContainer) windowContainer->scheduleDelete(mEmotePopup); - mEmotePopup = 0; + mEmotePopup = nullptr; } } else if (event.getId() == "STA") @@ -238,7 +238,7 @@ void WindowMenu::valueChanged(const gcn::SelectionEvent &event) if (windowContainer) windowContainer->scheduleDelete(mEmotePopup); - mEmotePopup = 0; + mEmotePopup = nullptr; } } |