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/MapTrainerTeamMemberUI.cpp | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'pokemodr/MapTrainerTeamMemberUI.cpp') diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp index e630658f..531300ef 100644 --- a/pokemodr/MapTrainerTeamMemberUI.cpp +++ b/pokemodr/MapTrainerTeamMemberUI.cpp @@ -15,21 +15,21 @@ * with this program. If not, see . */ -// Qt includes -#include - -// General includes -#include -#include +// Header include +#include "MapTrainerTeamMemberUI.h" // Pokemod includes -#include -#include -#include -#include +#include "../pokemod/Item.h" +#include "../pokemod/Nature.h" +#include "../pokemod/Pokemod.h" +#include "../pokemod/Species.h" -// Header include -#include "MapTrainerTeamMemberUI.h" +// General includes +#include "../general/BugCatcher.h" +#include "../general/Exception.h" + +// Qt includes +#include MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent) : ObjectUI(parent), @@ -46,13 +46,13 @@ MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, void MapTrainerTeamMemberUI::refreshGui() { varSpecies->clear(); - for (int i = 0; i < m_teamMember->pokemod()->speciesCount(); ++i) + for (int i = 0; i < static_cast(m_teamMember->pokemod())->speciesCount(); ++i) { - const Species* species = m_teamMember->pokemod()->species(i); + const Species* species = static_cast(m_teamMember->pokemod())->species(i); varSpecies->addItem(species->name()); varSpecies->setItemData(i, species->id()); } - varLevel->setMaximum(m_teamMember->pokemod()->rules()->maxLevel()); + varLevel->setMaximum(static_cast(m_teamMember->pokemod())->rules()->maxLevel()); } void MapTrainerTeamMemberUI::setGui() @@ -66,11 +66,11 @@ void MapTrainerTeamMemberUI::setGui() widgetItem->setSelected(m_teamMember_mod->item(widgetItem->data(Qt::UserRole).toInt())); } varNature->clear(); - if (m_teamMember->pokemod()->rules()->natureAllowed()) + if (static_cast(m_teamMember->pokemod())->rules()->natureAllowed()) { - for (int i = 0; i < m_teamMember->pokemod()->natureCount(); ++i) + for (int i = 0; i < static_cast(m_teamMember->pokemod())->natureCount(); ++i) { - const Nature* nature = m_teamMember->pokemod()->nature(i); + const Nature* nature = static_cast(m_teamMember->pokemod())->nature(i); varNature->addItem(nature->name()); varNature->setItemData(i, nature->id()); } @@ -78,11 +78,11 @@ void MapTrainerTeamMemberUI::setGui() else boxNature->setEnabled(false); varItems->clear(); - if (m_teamMember->pokemod()->rules()->holdItems()) + if (static_cast(m_teamMember->pokemod())->rules()->holdItems()) { - for (int i = 0; i < m_teamMember->pokemod()->itemCount(); ++i) + for (int i = 0; i < static_cast(m_teamMember->pokemod())->itemCount(); ++i) { - const Item* item = m_teamMember->pokemod()->item(i); + const Item* item = static_cast(m_teamMember->pokemod())->item(i); QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems); widgetItem->setData(Qt::UserRole, item->id()); } -- cgit