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/viewport.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index ba11bdf95..df97a5673 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -35,6 +35,7 @@
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
+#include "gui/font.h"
 
 #include "gui/popups/beingpopup.h"
 #include "gui/popups/popupmenu.h"
@@ -42,7 +43,7 @@
 
 #include "gui/windows/ministatuswindow.h"
 
-#include "gui/font.h"
+#include "utils/delete2.h"
 
 #include "debug.h"
 
@@ -104,12 +105,9 @@ Viewport::~Viewport()
 {
     config.removeListeners(this);
     CHECKLISTENERS
-    delete mPopupMenu;
-    mPopupMenu = nullptr;
-    delete mBeingPopup;
-    mBeingPopup = nullptr;
-    delete mTextPopup;
-    mTextPopup = nullptr;
+    delete2(mPopupMenu);
+    delete2(mBeingPopup);
+    delete2(mTextPopup);
 }
 
 void Viewport::setMap(Map *const map)
-- 
cgit v1.2.3-60-g2f50