diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/delete2.h | 30 | ||||
| -rw-r--r-- | src/utils/translation/translationmanager.cpp | 4 |
2 files changed, 32 insertions, 2 deletions
diff --git a/src/utils/delete2.h b/src/utils/delete2.h new file mode 100644 index 000000000..104f6fa60 --- /dev/null +++ b/src/utils/delete2.h @@ -0,0 +1,30 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef UTILS_DELETE2_H +#define UTILS_DELETE2_H + +#define delete2(var) \ + {\ + delete var;\ + var = nullptr;\ + } + +#endif // UTILS_DELETE2_H diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 893e4d33f..9bbdec810 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -20,6 +20,7 @@ #include "utils/translation/translationmanager.h" +#include "utils/delete2.h" #include "utils/stringutils.h" #include "utils/translation/podict.h" @@ -46,8 +47,7 @@ void TranslationManager::loadCurrentLang() void TranslationManager::close() { - delete translator; - translator = nullptr; + delete2(translator); } PoDict *TranslationManager::loadLang(const LangVect &lang, |