diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-05-16 16:55:28 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-05-16 16:55:28 +0000 |
| commit | 9c1388c7964bd3b4ae147e39c146c96dc20947e9 (patch) | |
| tree | 09628e1b12604d3194b7056c31df0573af4239bd /pokemodr/models/MapModel.cpp | |
| parent | a2a81fa0eee00670a1e18918458f6ac12860d59c (diff) | |
| download | sigen-9c1388c7964bd3b4ae147e39c146c96dc20947e9.tar.gz sigen-9c1388c7964bd3b4ae147e39c146c96dc20947e9.tar.xz sigen-9c1388c7964bd3b4ae147e39c146c96dc20947e9.zip | |
[FIX] TypeModel done for data() in models
[FIX] Another Qt bug found :(
[FIX] Better connections for the editor widget
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@141 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemodr/models/MapModel.cpp')
| -rw-r--r-- | pokemodr/models/MapModel.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pokemodr/models/MapModel.cpp b/pokemodr/models/MapModel.cpp index 0628ebe8..e3834e1a 100644 --- a/pokemodr/models/MapModel.cpp +++ b/pokemodr/models/MapModel.cpp @@ -35,7 +35,7 @@ #include <QFile> MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Map* map) : - GroupModel(parent, map, "Abilities") + GroupModel(parent, map, "Effects") { setupData(); } @@ -155,7 +155,7 @@ void MapWarpGroupModel::setupData() } MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Map* map) : - GroupModel(parent, map, "Maps") + GroupModel(parent, map, "Wild Lists") { setupData(); } @@ -220,7 +220,7 @@ QVariant MapModel::data(int role) const QWidget* widget = new MapUI(static_cast<Map*>(m_object), NULL); return QVariant::fromValue(widget); } - return QVariant(); + return GroupObjectModel::data(role); } int MapModel::rowCount() const @@ -278,7 +278,6 @@ BaseModel* MapModel::childItem(const int row) int MapModel::indexNumber() const { - // TODO: get map index return static_cast<const Pokemod*>(m_object->parent())->mapIndex(m_object->id()); } |