[FIX] Memory leaks in load and copy method

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@96 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 6 insertions, 4 deletions

diff --git a/pokemod/Ability.cpp b/pokemod/Ability.cpp
index ee2feeea..88dab692 100644
--- a/pokemod/Ability.cpp
+++ b/pokemod/Ability.cpp
@@ -47,8 +47,8 @@ Ability::Ability(const Pokemod* pokemod, const QString& fileName, const int id)
 
 Ability::~Ability()
 {
-    foreach (AbilityEffect* effect, m_effects)
-        delete effect;
+    while (effectCount())
+        deleteEffect(0);
 }
 
 bool Ability::validate() const
@@ -90,7 +90,8 @@ void Ability::load(const QString& fileName, int id) throw(Exception)
     QStringList path = pokemod()->path().split('/');
     path.removeLast();
     QDir fdir(path.join("/"));
-    m_effects.clear();
+    while (effectCount())
+        deleteEffect(0);
     if (fdir.cd("effect"))
     {
         QStringList files(fdir.entryList(QStringList("*.pini"), QDir::Files, QDir::Name));
@@ -202,7 +203,8 @@ Ability& Ability::operator=(const Ability& rhs)
     if (this == &rhs)
         return *this;
     m_name = rhs.m_name;
-    m_effects.clear();
+    while (effectCount())
+        deleteEffect(0);
     foreach (AbilityEffect* effect, rhs.m_effects)
         m_effects.append(new AbilityEffect(pokemod(), *effect, effect->id()));
     return *this;