From 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 Nov 2011 00:44:17 +0300 Subject: Fix more gcc 4.7 warnings. --- src/guildmanager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/guildmanager.cpp') diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index 4620de742..16edb369a 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -46,7 +46,7 @@ GuildManager::GuildManager() : mSentInfoRequest(false), mSentNameRequest(false), mHavePower(false), - mTab(0), + mTab(nullptr), mRequest(false) { } @@ -54,7 +54,7 @@ GuildManager::GuildManager() : GuildManager::~GuildManager() { delete mTab; - mTab = 0; + mTab = nullptr; } void GuildManager::init() @@ -79,7 +79,7 @@ void GuildManager::init() else if (guildManager) { delete guildManager; - guildManager = 0; + guildManager = nullptr; } } @@ -100,7 +100,7 @@ void GuildManager::reload() socialWindow->removeTab(guild); } delete mTab; - mTab = 0; + mTab = nullptr; } void GuildManager::send(std::string msg) @@ -211,7 +211,7 @@ Guild *GuildManager::createGuild() { Guild *guild = Guild::getGuild(1); if (!guild) - return 0; + return nullptr; guild->setServerGuild(false); return guild; @@ -484,7 +484,7 @@ bool GuildManager::afterRemove() } SERVER_NOTICE(_("You have left the guild.")) delete mTab; - mTab = 0; + mTab = nullptr; if (socialWindow) socialWindow->removeTab(guild); -- cgit v1.2.3-60-g2f50