From ef36048760f80708ac1eaccbc2a21e7a700dc2ab Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 4 Sep 2008 20:09:57 +0000
Subject: Introduced another template to make deleting all values in a
 container easier. Inspired by qDeleteAll() from Qt.

---
 src/gui/setup.cpp           | 2 +-
 src/gui/shop.cpp            | 4 +---
 src/gui/skill.cpp           | 4 +---
 src/gui/windowcontainer.cpp | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 22b91ed4..53e7a9f1 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -92,7 +92,7 @@ Setup::Setup():
 
 Setup::~Setup()
 {
-    for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs));
+    delete_all(mTabs);
 }
 
 void Setup::action(const gcn::ActionEvent &event)
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index effe8858..c5e257da 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -25,8 +25,6 @@
 
 #include "../utils/dtor.h"
 
-#include <algorithm>
-
 ShopItems::~ShopItems()
 {
     clear();
@@ -59,7 +57,7 @@ ShopItem* ShopItems::at(int i)
 
 void ShopItems::clear()
 {
-    std::for_each(mShopItems.begin(), mShopItems.end(), make_dtor(mShopItems));
+    delete_all(mShopItems);
     mShopItems.clear();
 }
 
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 6cc7a294..49037cbd 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -21,8 +21,6 @@
  *  $Id$
  */
 
-#include <algorithm>
-
 #include <guichan/widgets/label.hpp>
 #include <guichan/widgets/container.hpp>
 #include <guichan/widgets/icon.hpp>
@@ -78,7 +76,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    for_each(mTabs.begin(), mTabs.end(), make_dtor(mTabs));
+    delete_all(mTabs);
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index d10c519c..006dbf44 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -21,15 +21,13 @@
  *  $Id$
  */
 
-#include <algorithm>
-
 #include "windowcontainer.h"
 
 #include "../utils/dtor.h"
 
 void WindowContainer::logic()
 {
-    for_each(mDeathList.begin(), mDeathList.end(), make_dtor(mDeathList));
+    delete_all(mDeathList);
     mDeathList.clear();
 
     gcn::Container::logic();
-- 
cgit v1.2.3-70-g09d2