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/gui/windows/chatwindow.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/gui/windows/chatwindow.cpp')

diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0a5480520..51ca414a7 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -67,6 +67,7 @@
 #include "net/net.h"
 
 #include "utils/copynpaste.h"
+#include "utils/delete2.h"
 #include "utils/gettext.h"
 
 #include "resources/resourcemanager.h"
@@ -266,12 +267,9 @@ ChatWindow::~ChatWindow()
     saveState();
     config.setValue("ReturnToggles", mReturnToggles);
     removeAllWhispers();
-    delete mItemLinkHandler;
-    mItemLinkHandler = nullptr;
-    delete mColorPicker;
-    mColorPicker = nullptr;
-    delete mColorListModel;
-    mColorListModel = nullptr;
+    delete2(mItemLinkHandler);
+    delete2(mColorPicker);
+    delete2(mColorListModel);
 }
 
 void ChatWindow::postInit()
@@ -646,8 +644,7 @@ void ChatWindow::ignoreAllWhispers()
                                          PlayerRelation::IGNORED);
         }
 
-        delete (iter->second);
-        iter->second = nullptr;
+        delete2 (iter->second)
     }
 }
 
-- 
cgit v1.2.3-70-g09d2