summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-14 19:10:55 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-14 19:10:55 +0300
commit8660f14a94af91d42d3c8aae1b370f47cad9720b (patch)
tree777b5782c3c6e97c575c7ca9a54d2ef55d2d07b1 /src/gui
parent1d3e44a5d4e50d18e614a888c6cd3b8cccdf7da4 (diff)
downloadmanaplus-8660f14a94af91d42d3c8aae1b370f47cad9720b.tar.gz
manaplus-8660f14a94af91d42d3c8aae1b370f47cad9720b.tar.bz2
manaplus-8660f14a94af91d42d3c8aae1b370f47cad9720b.tar.xz
manaplus-8660f14a94af91d42d3c8aae1b370f47cad9720b.zip
Fix some pointer to bool conversions.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popupmanager.cpp2
-rw-r--r--src/gui/windowmanager.cpp4
-rw-r--r--src/gui/windows/chatwindow.cpp2
-rw-r--r--src/gui/windows/statuswindow.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/popupmanager.cpp b/src/gui/popupmanager.cpp
index 3aed639e9..134aaac7b 100644
--- a/src/gui/popupmanager.cpp
+++ b/src/gui/popupmanager.cpp
@@ -76,7 +76,7 @@ void PopupManager::hidePopupMenu()
void PopupManager::hideItemPopup()
{
#ifndef DYECMD
- if (itemPopup)
+ if (itemPopup != nullptr)
itemPopup->hide();
#endif // DYECMD
}
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 978e6ae42..ab4224f25 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -133,7 +133,7 @@ void WindowManager::createWindows()
CREATEWIDGETV0(spellPopup, SpellPopup);
CREATEWIDGETV0(skillPopup, SkillPopup);
delete2(debugChatTab);
- if (chatWindow)
+ if (chatWindow != nullptr)
{
chatWindow->scheduleDelete();
chatWindow = nullptr;
@@ -145,7 +145,7 @@ void WindowManager::createWindows()
"#Debug", ChatTabType::DEBUG);
debugChatTab->setAllowHighlight(false);
chatWindow->setVisible(Visible_false);
- if (debugWindow)
+ if (debugWindow != nullptr)
{
debugWindow->scheduleDelete();
debugWindow = nullptr;
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0c7123631..7992c6262 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -670,7 +670,7 @@ void ChatWindow::chatInput(const std::string &message) const
if (tab != nullptr)
tab->chatInput(msg);
Game *const game = Game::instance();
- if (game)
+ if (game != nullptr)
game->setValidSpeed();
}
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 3dc7110b9..520bdefd0 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -260,7 +260,7 @@ void StatusWindow::addTabBasic(const std::string &name)
void StatusWindow::updateLevelLabel()
{
- if (!localPlayer)
+ if (localPlayer != nullptr)
return;
const int groupId = localPlayer->getGroupId();