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/net/ea/guildhandler.cpp | |
| parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
| download | mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz mv-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip | |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/net/ea/guildhandler.cpp')
| -rw-r--r-- | src/net/ea/guildhandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 66488d5fb..907fa13db 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -35,8 +35,8 @@ namespace Ea { -GuildTab *guildTab = 0; -Guild *taGuild = 0; +GuildTab *guildTab = nullptr; +Guild *taGuild = nullptr; GuildHandler::GuildHandler() : showBasicInfo(false) @@ -46,7 +46,7 @@ GuildHandler::GuildHandler() : GuildHandler::~GuildHandler() { delete guildTab; - guildTab = 0; + guildTab = nullptr; } void GuildHandler::requestAlliance(int guildId A_UNUSED, @@ -450,7 +450,7 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) } SERVER_NOTICE(_("You have left the guild.")) delete guildTab; - guildTab = 0; + guildTab = nullptr; if (socialWindow && taGuild) socialWindow->removeTab(taGuild); @@ -497,7 +497,7 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) } SERVER_NOTICE(_("You was kicked from guild.")); delete guildTab; - guildTab = 0; + guildTab = nullptr; if (socialWindow && taGuild) socialWindow->removeTab(taGuild); @@ -607,7 +607,7 @@ void GuildHandler::processGuildBroken(Net::MessageIn &msg) void GuildHandler::clear() { - taGuild = 0; + taGuild = nullptr; } } // namespace Ea |