diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-28 00:39:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-28 11:04:23 +0300 |
| commit | 0c35dab0ba366f85b40ef1795125521f1df8c264 (patch) | |
| tree | dde6abde3288f543ae96a2468b2275af8a03e704 /src/gui/viewport.cpp | |
| parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
| download | ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.zip | |
simplify variables cleanup.
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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) |