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)

3 files changed, 3 insertions, 9 deletions

diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index d7398c17..1c0f9373 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -19,8 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
-
 #include "imageset.h"
 
 #include "../log.h"
@@ -44,7 +42,7 @@ ImageSet::ImageSet(Image *img, int width, int height)
 
 ImageSet::~ImageSet()
 {
-    for_each(mImages.begin(), mImages.end(), make_dtor(mImages));
+    delete_all(mImages);
 }
 
 Image*
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index e6f2fd1f..c05d4604 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -19,7 +19,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <algorithm>
 #include <cassert>
 #include <libxml/tree.h>
 
@@ -144,7 +143,7 @@ void ItemDB::unload()
     delete mUnknown;
     mUnknown = NULL;
 
-    for_each(mItemInfos.begin(), mItemInfos.end(), make_dtor(mItemInfos));
+    delete_all(mItemInfos);
     mItemInfos.clear();
     mLoaded = false;
 }
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 <algorithm>
-
 #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();
 }