1 files changed, 2 insertions, 35 deletions

diff --git a/pokemodr/models/AbilityModel.cpp b/pokemodr/models/AbilityModel.cpp
index 9a3f6b76..a76a6c87 100644
--- a/pokemodr/models/AbilityModel.cpp
+++ b/pokemodr/models/AbilityModel.cpp
@@ -18,28 +18,22 @@
 // Header include
 #include "AbilityModel.h"
 
-// Model includes
-#include "AbilityEffectModel.h"
-
 // PokeModr includes
 #include "../AbilityUI.h"
 
 // Pokemod includes
 #include "../../pokemod/Ability.h"
-#include "../../pokemod/Pokemod.h"
 
 // Qt includes
 #include <QFile>
 
 AbilityModel::AbilityModel(BaseModel* parent, Ability* ability) :
-        GroupObjectModel(parent, ability)
+        ObjectModel(parent, ability)
 {
-    setupData();
 }
 
 AbilityModel::~AbilityModel()
 {
-    clearData();
 }
 
 QVariant AbilityModel::data(int role) const
@@ -57,7 +51,7 @@ QVariant AbilityModel::data(int role) const
         QWidget* widget = new AbilityUI(static_cast<Ability*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
-    return GroupObjectModel::data(role);
+    return ObjectModel::data(role);
 }
 
 bool AbilityModel::setData(const QVariant& value, int role)
@@ -72,9 +66,7 @@ bool AbilityModel::setData(const QVariant& value, int role)
             {
                 if (xml.doctype().name() == m_object->className())
                 {
-                    clearData();
                     m_object->load(xml.documentElement());
-                    setupData();
                     return true;
                 }
                 file.close();
@@ -83,28 +75,3 @@ bool AbilityModel::setData(const QVariant& value, int role)
     }
     return false;
 }
-
-bool AbilityModel::insertRows(const int rows)
-{
-    for (int i = 0; i < rows; ++i)
-        m_objects.append(new AbilityEffectModel(this, static_cast<Ability*>(m_object)->newEffect()));
-    return true;
-}
-
-bool AbilityModel::removeRows(const int position, const int rows)
-{
-    for (int i = 0; i < rows; ++i)
-    {
-        static_cast<Ability*>(m_object)->deleteEffect(position);
-        delete m_objects[position];
-        m_objects.removeAt(position);
-    }
-    return true;
-}
-
-void AbilityModel::setupData()
-{
-    Ability* ability = static_cast<Ability*>(m_object);
-    for (int i = 0; i < ability->effectCount(); ++i)
-        m_objects.append(new AbilityEffectModel(this, ability->effect(i)));
-}