From ddc93c461070fb3d868fbb5426e8361d1b93ee38 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 8 Dec 2008 21:13:38 +0100 Subject: Introduced another template to make deleting all values in a container easier. Inspired by qDeleteAll() from Qt. Conflicts: ChangeLog src/beingmanager.cpp src/channelmanager.cpp src/gui/skill.cpp src/map.cpp src/resources/monsterinfo.cpp (cherry picked from mainline) --- src/resources/monsterinfo.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/resources/monsterinfo.cpp') diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 7661c86b..4a71a122 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -19,8 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include - #include "monsterinfo.h" #include "../utils/dtor.h" @@ -33,8 +31,7 @@ MonsterInfo::MonsterInfo() MonsterInfo::~MonsterInfo() { // kill vectors in mSoundEffects - for_each (mSounds.begin(), mSounds.end(), - make_dtor(mSounds)); + delete_all(mSounds); mSounds.clear(); } -- cgit v1.2.3-70-g09d2