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/windows/serverdialog.cpp | |
| parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
| download | manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.zip | |
simplify variables cleanup.
Diffstat (limited to 'src/gui/windows/serverdialog.cpp')
| -rw-r--r-- | src/gui/windows/serverdialog.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 33b6f1599..9e85f5c89 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -46,6 +46,7 @@ #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/langs.h" @@ -295,11 +296,9 @@ ServerDialog::~ServerDialog() if (mDownload) { mDownload->cancel(); - delete mDownload; - mDownload = nullptr; + delete2(mDownload) } - delete mServersListModel; - mServersListModel = nullptr; + delete2(mServersListModel); } void ServerDialog::connectToSelectedServer() @@ -517,8 +516,7 @@ void ServerDialog::downloadServerList() if (mDownload) { mDownload->cancel(); - delete mDownload; - mDownload = nullptr; + delete2(mDownload) } mDownload = new Net::Download(this, listFile, |