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/net/eathena/generalhandler.cpp | 11 ++++-------
 src/net/eathena/network.cpp        |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/net/eathena')

diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index 3a18dede9..6243a3878 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -54,6 +54,7 @@
 #include "net/eathena/tradehandler.h"
 #include "net/eathena/skillhandler.h"
 
+#include "utils/delete2.h"
 #include "utils/gettext.h"
 
 #include "debug.h"
@@ -105,8 +106,7 @@ GeneralHandler::GeneralHandler() :
 
 GeneralHandler::~GeneralHandler()
 {
-    delete mNetwork;
-    mNetwork = nullptr;
+    delete2(mNetwork);
 }
 
 void GeneralHandler::handleMessage(Net::MessageIn &msg)
@@ -272,11 +272,8 @@ void GeneralHandler::gameEnded() const
         socialWindow->removeTab(Ea::taParty);
     }
 
-    delete Ea::guildTab;
-    Ea::guildTab = nullptr;
-
-    delete Ea::partyTab;
-    Ea::partyTab = nullptr;
+    delete2(Ea::guildTab);
+    delete2(Ea::partyTab);
 }
 
 }  // namespace EAthena
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 0162d82e8..87d5d4b5a 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -28,6 +28,8 @@
 #include "net/eathena/messagein.h"
 #include "net/eathena/protocol.h"
 
+#include "utils/delete2.h"
+
 #include "debug.h"
 
 namespace EAthena
@@ -120,8 +122,7 @@ Network::Network() :
 Network::~Network()
 {
     clearHandlers();
-    delete mMessageHandlers;
-    mMessageHandlers = nullptr;
+    delete2(mMessageHandlers);
     mInstance = nullptr;
 }
 
-- 
cgit v1.2.3-60-g2f50