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/emotewindow.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

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

diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp
index 3a7141533..0f286b145 100644
--- a/src/gui/windows/emotewindow.cpp
+++ b/src/gui/windows/emotewindow.cpp
@@ -28,6 +28,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "utils/delete2.h"
 #include "utils/gettext.h"
 
 #include "resources/image.h"
@@ -121,20 +122,13 @@ EmoteWindow::~EmoteWindow()
 {
     mTabs->removeAll(false);
     mTabs->removeTab(mTabs->getTabByIndex(0));
-    delete mEmotePage;
-    mEmotePage = nullptr;
-    delete mColorPage;
-    mColorPage = nullptr;
-    delete mColorModel;
-    mColorModel = nullptr;
-    delete mScrollColorPage;
-    mScrollColorPage = nullptr;
-    delete mFontPage;
-    mFontPage = nullptr;
-    delete mFontModel;
-    mFontModel = nullptr;
-    delete mScrollFontPage;
-    mScrollFontPage = nullptr;
+    delete2(mEmotePage);
+    delete2(mColorPage);
+    delete2(mColorModel);
+    delete2(mScrollColorPage);
+    delete2(mFontPage);
+    delete2(mFontModel);
+    delete2(mScrollFontPage);
     if (mImageSet)
     {
         mImageSet->decRef();
-- 
cgit v1.2.3-60-g2f50