[FIX] Some invalid indexing in PokemodModel

[FIX] Root now makes only 1 Pokemod for now

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

4 files changed, 13 insertions, 10 deletions

diff --git a/Changelog b/Changelog
index aa013795..8b607524 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  122
+Date: 8 May 2008
+User: MathStuf
+-----------------
+[FIX] Some invalid indexing in PokemodModel
+[FIX] Root now makes only 1 Pokemod for now
+
+-----------------
 Rev:  121
 Date: 6 May 2008
 User: MathStuf
diff --git a/pokemodr/PokemodTreeModel.cpp b/pokemodr/PokemodTreeModel.cpp
index 9c6964ff..03532c40 100644
--- a/pokemodr/PokemodTreeModel.cpp
+++ b/pokemodr/PokemodTreeModel.cpp
@@ -24,9 +24,6 @@
 // Qt includes
 #include <QMimeData>
 
-// Test code includes
-#include <QtDebug>
-
 PokemodTreeModel::PokemodTreeModel(const QStringList& pokemods, QObject* parent) :
         QAbstractItemModel(parent)
 {
@@ -70,7 +67,7 @@ QModelIndex PokemodTreeModel::parent(const QModelIndex& index) const
         return QModelIndex();
     BaseModel* object = static_cast<BaseModel*>(index.internalPointer());
     BaseModel* parent = object->parent();
-    if (parent == m_root)
+    if (!parent || (parent == m_root))
         return QModelIndex();
     return createIndex(parent->indexNumber(), 0, parent);
 }
diff --git a/pokemodr/models/PokemodModel.cpp b/pokemodr/models/PokemodModel.cpp
index 01b0d429..b26b2121 100644
--- a/pokemodr/models/PokemodModel.cpp
+++ b/pokemodr/models/PokemodModel.cpp
@@ -832,16 +832,16 @@ BaseModel* PokemodModel::childItem(const int row)
         case 13:
             model = m_stores;
             break;
-        case 15:
+        case 14:
             model = m_tiles;
             break;
-        case 16:
+        case 15:
             model = m_times;
             break;
-        case 17:
+        case 16:
             model = m_trainers;
             break;
-        case 18:
+        case 17:
             model = m_types;
             break;
         default:
diff --git a/pokemodr/models/RootModel.cpp b/pokemodr/models/RootModel.cpp
index a0a237f8..7dac9b39 100644
--- a/pokemodr/models/RootModel.cpp
+++ b/pokemodr/models/RootModel.cpp
@@ -64,7 +64,6 @@ void RootModel::setupData()
     setupData(QList<QVariant>());
 }
 
-
 void RootModel::setupData(const QList<QVariant>& pokemods)
 {
     QFile fin("full.pmod");
@@ -73,6 +72,5 @@ void RootModel::setupData(const QList<QVariant>& pokemods)
     xml.setContent(&fin);
     fin.close();
     m_objects.append(new PokemodModel(this, new Pokemod(xml.documentElement())));
-    m_objects.append(new PokemodModel(this, new Pokemod(xml.documentElement())));
     // TODO: make sub models from data
 }