From 0c35dab0ba366f85b40ef1795125521f1df8c264 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 28 Mar 2014 00:39:12 +0300
Subject: simplify variables cleanup.

---
 src/guildmanager.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/guildmanager.cpp')

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);
-- 
cgit v1.2.3-70-g09d2