summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-17 14:58:51 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-17 14:58:51 +0300
commit294f449c2f2819971ce9528c9557fc3be8cd4ed1 (patch)
tree1ac28965cc88b0d1f71528e77b1bf11dfdd60e83 /src
parent5fc6dccf5c22f7245d03094fab908e1afb2b22b8 (diff)
downloadmv-294f449c2f2819971ce9528c9557fc3be8cd4ed1.tar.gz
mv-294f449c2f2819971ce9528c9557fc3be8cd4ed1.tar.bz2
mv-294f449c2f2819971ce9528c9557fc3be8cd4ed1.tar.xz
mv-294f449c2f2819971ce9528c9557fc3be8cd4ed1.zip
Move windows deletion into windowmanager.
Diffstat (limited to 'src')
-rw-r--r--src/client.cpp10
-rw-r--r--src/gui/windowmanager.cpp13
-rw-r--r--src/gui/windowmanager.h2
3 files changed, 16 insertions, 9 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 342f24f14..c52468563 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -601,14 +601,7 @@ void Client::gameClear()
config.removeListeners(this);
eventsManager.shutdown();
-
- delete2(setupWindow);
- delete2(helpWindow);
- delete2(didYouKnowWindow);
- delete2(commandHandler);
- delete2(popupMenu);
- delete2(beingPopup);
- delete2(textPopup);
+ WindowManager::deleteWindows();
stopTimers();
@@ -694,7 +687,6 @@ void Client::gameClear()
if (logger)
logger->log1("Quitting9");
- delete2(userPalette);
delete2(joystick);
keyboard.deinit();
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index ff060594c..d96d632f0 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -42,6 +42,7 @@
#include "gui/widgets/desktop.h"
+#include "utils/delete2.h"
#include "utils/files.h"
#include "utils/sdlcheckutils.h"
#include "utils/sdlhelper.h"
@@ -104,6 +105,18 @@ void WindowManager::createWindows()
textPopup->postInit();
}
+void WindowManager::deleteWindows()
+{
+ delete2(textPopup);
+ delete2(beingPopup);
+ delete2(popupMenu);
+ delete2(commandHandler);
+ delete2(didYouKnowWindow);
+ delete2(helpWindow);
+ delete2(setupWindow);
+ delete2(userPalette);
+}
+
void WindowManager::initTitle()
{
if (settings.options.test.empty())
diff --git a/src/gui/windowmanager.h b/src/gui/windowmanager.h
index 26b07e410..46756f954 100644
--- a/src/gui/windowmanager.h
+++ b/src/gui/windowmanager.h
@@ -63,6 +63,8 @@ namespace WindowManager
void createWindows();
+ void deleteWindows();
+
void initTitle();
void setIcon();