diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-08 21:13:38 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-08 21:22:43 +0100 |
| commit | ddc93c461070fb3d868fbb5426e8361d1b93ee38 (patch) | |
| tree | 250eacd391542d36a51c4d3aa398d4f6346619fb /src/gui/shop.cpp | |
| parent | d129ce9776a6fd0e165b676a3addd14186c5d85d (diff) | |
| download | Mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.gz Mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.bz2 Mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.tar.xz Mana-ddc93c461070fb3d868fbb5426e8361d1b93ee38.zip | |
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)
Diffstat (limited to 'src/gui/shop.cpp')
| -rw-r--r-- | src/gui/shop.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp index 085e93ce..a4478a62 100644 --- a/src/gui/shop.cpp +++ b/src/gui/shop.cpp @@ -23,8 +23,6 @@ #include "../utils/dtor.h" -#include <algorithm> - ShopItems::~ShopItems() { clear(); @@ -59,7 +57,7 @@ ShopItem* ShopItems::at(int i) const void ShopItems::clear() { - std::for_each(mShopItems.begin(), mShopItems.end(), make_dtor(mShopItems)); + delete_all(mShopItems); mShopItems.clear(); } |