From 807071d35159de0660f9df31c48d5bf895ca3622 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 27 Apr 2008 15:15:17 +0000 Subject: [FIX] Pokemod objects now know about parents [FIX] Project includes are now relative [FIX] Headers included for better detection of invalid headers [FIX] Validation code commented out so it can be done better git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@111 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/models/CoinListObjectModel.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pokemodr/models/CoinListObjectModel.cpp') diff --git a/pokemodr/models/CoinListObjectModel.cpp b/pokemodr/models/CoinListObjectModel.cpp index 0176b7e2..ed788cae 100644 --- a/pokemodr/models/CoinListObjectModel.cpp +++ b/pokemodr/models/CoinListObjectModel.cpp @@ -15,20 +15,20 @@ * with this program. If not, see . */ -// Qt includes -#include -#include - -// Pokemod includes -#include -#include -#include +// Header include +#include "CoinListObjectModel.h" // PokeModr includes -#include "CoinListObjectUI.h" +#include "../CoinListObjectUI.h" -// Header include -#include "CoinListObjectModel.h" +// Pokemod includes +#include "../../pokemod/CoinListObject.h" +#include "../../pokemod/Item.h" +#include "../../pokemod/Species.h" + +// Qt includes +#include +#include CoinListObjectModel::CoinListObjectModel(BaseModel* parent, Object* object) : ObjectModel(parent, object) @@ -45,9 +45,9 @@ QVariant CoinListObjectModel::data(int role) const { CoinListObject* object = static_cast(m_object); if (object->type() == CoinListObject::Item) - return m_object->pokemod()->item(object->object())->name(); + return static_cast(m_object->pokemod())->item(object->object())->name(); else if (object->type() == CoinListObject::Species) - return m_object->pokemod()->species(object->object())->name(); + return static_cast(m_object->pokemod())->species(object->object())->name(); } else if (role == BaseModel::XmlRole) { -- cgit