From 405c23831a4e1363f26f848215c8140f6d6d9f78 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Wed, 8 Mar 2006 19:13:26 +0000 Subject: Added a 'dtor' helper functor to delete objects in arrays and containers using STL algorithms. --- src/flooritemmanager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/flooritemmanager.cpp') diff --git a/src/flooritemmanager.cpp b/src/flooritemmanager.cpp index f87c925b..680616a8 100644 --- a/src/flooritemmanager.cpp +++ b/src/flooritemmanager.cpp @@ -25,6 +25,8 @@ #include "floor_item.h" +#include "utils/dtor.h" + FloorItemManager::~FloorItemManager() { clear(); @@ -46,11 +48,7 @@ void FloorItemManager::destroy(FloorItem *item) void FloorItemManager::clear() { - FloorItemIterator i; - for (i = mFloorItems.begin(); i != mFloorItems.end(); i++) - { - delete *i; - } + for_each(mFloorItems.begin(), mFloorItems.end(), make_dtor(mFloorItems)); mFloorItems.clear(); } -- cgit v1.2.3-60-g2f50