summaryrefslogtreecommitdiffstats
path: root/pokemodr/models/CoinListObjectModel.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-04-27 15:15:17 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-04-27 15:15:17 +0000
commit807071d35159de0660f9df31c48d5bf895ca3622 (patch)
treea1e9dbdc1e58b91cd2e4a5e472597b0204ccb41d /pokemodr/models/CoinListObjectModel.cpp
parentf444f5a45e9325644a360f656176d47d7f540f52 (diff)
downloadsigen-807071d35159de0660f9df31c48d5bf895ca3622.tar.gz
sigen-807071d35159de0660f9df31c48d5bf895ca3622.tar.xz
sigen-807071d35159de0660f9df31c48d5bf895ca3622.zip
[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
Diffstat (limited to 'pokemodr/models/CoinListObjectModel.cpp')
-rw-r--r--pokemodr/models/CoinListObjectModel.cpp26
1 files changed, 13 insertions, 13 deletions
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 <http://www.gnu.org/licenses/>.
*/
-// Qt includes
-#include <QDomDocument>
-#include <QFile>
-
-// Pokemod includes
-#include <CoinListObject.h>
-#include <Item.h>
-#include <Species.h>
+// 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 <QDomDocument>
+#include <QFile>
CoinListObjectModel::CoinListObjectModel(BaseModel* parent, Object* object) :
ObjectModel(parent, object)
@@ -45,9 +45,9 @@ QVariant CoinListObjectModel::data(int role) const
{
CoinListObject* object = static_cast<CoinListObject*>(m_object);
if (object->type() == CoinListObject::Item)
- return m_object->pokemod()->item(object->object())->name();
+ return static_cast<const Pokemod*>(m_object->pokemod())->item(object->object())->name();
else if (object->type() == CoinListObject::Species)
- return m_object->pokemod()->species(object->object())->name();
+ return static_cast<const Pokemod*>(m_object->pokemod())->species(object->object())->name();
}
else if (role == BaseModel::XmlRole)
{