diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/windows/textcommandeditor.cpp | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/textcommandeditor.cpp')
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index dead469bc..2eccb255d 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -38,6 +38,7 @@ #include "gui/widgets/layout.h" #include "gui/widgets/radiobutton.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -191,12 +192,9 @@ void TextCommandEditor::postInit() TextCommandEditor::~TextCommandEditor() { - delete mIconsModel; - mIconsModel = nullptr; - delete mTargetTypeModel; - mTargetTypeModel = nullptr; - delete mMagicSchoolModel; - mMagicSchoolModel = nullptr; + delete2(mIconsModel); + delete2(mTargetTypeModel); + delete2(mMagicSchoolModel); } void TextCommandEditor::action(const ActionEvent &event) |