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/DialogModel.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pokemodr/models/DialogModel.cpp') diff --git a/pokemodr/models/DialogModel.cpp b/pokemodr/models/DialogModel.cpp index a39d160b..7cf453b6 100644 --- a/pokemodr/models/DialogModel.cpp +++ b/pokemodr/models/DialogModel.cpp @@ -15,19 +15,19 @@ * with this program. If not, see . */ -// Qt includes -#include -#include - -// Pokemod includes -#include -#include +// Header include +#include "DialogModel.h" // PokeModr includes -// #include "DialogUI.h" +// #include "../DialogUI.h" -// Header include -#include "DialogModel.h" +// Pokemod includes +#include "../../pokemod/Dialog.h" +#include "../../pokemod/Pokemod.h" + +// Qt includes +#include +#include DialogModel::DialogModel(BaseModel* parent, Object* object) : ObjectModel(parent, object) @@ -81,5 +81,5 @@ bool DialogModel::setData(const QVariant& value, int role) int DialogModel::indexNumber() const { - return m_object->pokemod()->dialogIndex(m_object->id()); + return static_cast(m_object->pokemod())->dialogIndex(m_object->id()); } -- cgit