diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-28 00:39:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-28 11:04:23 +0300 |
| commit | 0c35dab0ba366f85b40ef1795125521f1df8c264 (patch) | |
| tree | dde6abde3288f543ae96a2468b2275af8a03e704 /src/net/ea/guildhandler.cpp | |
| parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
| download | manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz manaverse-0c35dab0ba366f85b40ef1795125521f1df8c264.zip | |
simplify variables cleanup.
Diffstat (limited to 'src/net/ea/guildhandler.cpp')
| -rw-r--r-- | src/net/ea/guildhandler.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 1e56ac75b..fc1ef8def 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -34,6 +34,8 @@ #include "net/ea/gui/guildtab.h" +#include "utils/delete2.h" + #include "debug.h" namespace Ea @@ -48,8 +50,7 @@ GuildHandler::GuildHandler() : GuildHandler::~GuildHandler() { - delete guildTab; - guildTab = nullptr; + delete2(guildTab); } void GuildHandler::requestAlliance(const int guildId A_UNUSED, @@ -462,8 +463,7 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) const taGuild->clearMembers(); } NotifyManager::notify(NotifyManager::GUILD_LEFT); - delete guildTab; - guildTab = nullptr; + delete2(guildTab) if (socialWindow && taGuild) socialWindow->removeTab(taGuild); @@ -506,8 +506,7 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) const taGuild->clearMembers(); } NotifyManager::notify(NotifyManager::GUILD_KICKED); - delete guildTab; - guildTab = nullptr; + delete2(guildTab) if (socialWindow && taGuild) socialWindow->removeTab(taGuild); |