[FIX] Models cleaned up (each class is now in its own file, parenting not hard-coded, etc.)

[FIX] Tree bug fixed! :)

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

1 files changed, 4 insertions, 27 deletions

diff --git a/pokemodr/models/MapTrainerModel.cpp b/pokemodr/models/MapTrainerModel.cpp
index a6d87af2..1ef4b875 100644
--- a/pokemodr/models/MapTrainerModel.cpp
+++ b/pokemodr/models/MapTrainerModel.cpp
@@ -60,11 +60,6 @@ QVariant MapTrainerModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-int MapTrainerModel::rowCount() const
-{
-    return static_cast<MapTrainer*>(m_object)->teamMemberCount();
-}
-
 bool MapTrainerModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
@@ -89,22 +84,10 @@ bool MapTrainerModel::setData(const QVariant& value, int role)
     return false;
 }
 
-BaseModel* MapTrainerModel::childItem(const int row)
-{
-    if (row < m_teamMembers.size())
-        return m_teamMembers[row];
-    return NULL;
-}
-
-int MapTrainerModel::indexNumber() const
-{
-    return static_cast<const Map*>(m_object->parent())->trainerIndex(m_object->id());
-}
-
 bool MapTrainerModel::insertRows(const int rows)
 {
     for (int i = 0; i < rows; ++i)
-        m_teamMembers.append(new MapTrainerTeamMemberModel(this, static_cast<MapTrainer*>(m_object)->newTeamMember()));
+        m_objects.append(new MapTrainerTeamMemberModel(this, static_cast<MapTrainer*>(m_object)->newTeamMember()));
     return true;
 }
 
@@ -113,8 +96,8 @@ bool MapTrainerModel::removeRows(const int position, const int rows)
     for (int i = 0; i < rows; ++i)
     {
         static_cast<MapTrainer*>(m_object)->deleteTeamMember(position);
-        delete m_teamMembers[position];
-        m_teamMembers.removeAt(position);
+        delete m_objects[position];
+        m_objects.removeAt(position);
     }
     return true;
 }
@@ -123,11 +106,5 @@ void MapTrainerModel::setupData()
 {
     MapTrainer* trainer = static_cast<MapTrainer*>(m_object);
     for (int i = 0; i < trainer->teamMemberCount(); ++i)
-        m_teamMembers.append(new MapTrainerTeamMemberModel(this, trainer->teamMember(i)));
-}
-
-void MapTrainerModel::clearData()
-{
-    foreach (MapTrainerTeamMemberModel* model, m_teamMembers)
-        delete model;
+        m_objects.append(new MapTrainerTeamMemberModel(this, trainer->teamMember(i)));
 }