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/guildmanager.cpp | |
parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
download | manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.zip |
simplify variables cleanup.
Diffstat (limited to 'src/guildmanager.cpp')
-rw-r--r-- | src/guildmanager.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index a1fab3b1e..48485e9b4 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -36,6 +36,7 @@ #include "net/chathandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/timer.h" #include "debug.h" @@ -60,8 +61,7 @@ GuildManager::GuildManager() : GuildManager::~GuildManager() { - delete mTab; - mTab = nullptr; + delete2(mTab); } void GuildManager::init() @@ -85,8 +85,7 @@ void GuildManager::init() } else if (guildManager) { - delete guildManager; - guildManager = nullptr; + delete2(guildManager); } } @@ -108,8 +107,7 @@ void GuildManager::reload() if (guild && socialWindow) socialWindow->removeTab(guild); } - delete mTab; - mTab = nullptr; + delete2(mTab); } void GuildManager::send(const std::string &msg) @@ -520,8 +518,7 @@ bool GuildManager::afterRemove() player_node->clearGuilds(); } NotifyManager::notify(NotifyManager::GUILD_LEFT); - delete mTab; - mTab = nullptr; + delete2(mTab); if (socialWindow) socialWindow->removeTab(guild); |