From 0fa52c1f61c457c9b68bec53bcce3af858e5eb44 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 27 Apr 2008 17:57:32 +0000 Subject: [FIX] More header cleanliness [FIX] UI classes now just use the ObjectUI pointers [FIX] Some miscellaneous qmake options git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@112 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/MapTrainerTeamMemberUI.cpp | 53 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'pokemodr/MapTrainerTeamMemberUI.cpp') diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp index 531300ef..f8836671 100644 --- a/pokemodr/MapTrainerTeamMemberUI.cpp +++ b/pokemodr/MapTrainerTeamMemberUI.cpp @@ -20,57 +20,56 @@ // Pokemod includes #include "../pokemod/Item.h" +#include "../pokemod/MapTrainerTeamMember.h" #include "../pokemod/Nature.h" #include "../pokemod/Pokemod.h" #include "../pokemod/Species.h" // General includes #include "../general/BugCatcher.h" -#include "../general/Exception.h" - -// Qt includes -#include MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent) : - ObjectUI(parent), - m_teamMember(teamMember), - m_teamMember_mod(new MapTrainerTeamMember(*teamMember)) + ObjectUI(parent) { setupUi(this); QMetaObject::connectSlotsByName(this); - setObjects(m_teamMember, m_teamMember_mod); + setObjects(teamMember, new MapTrainerTeamMember(*teamMember)); connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool))); init(); } +MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI() +{ +} + void MapTrainerTeamMemberUI::refreshGui() { varSpecies->clear(); - for (int i = 0; i < static_cast(m_teamMember->pokemod())->speciesCount(); ++i) + for (int i = 0; i < static_cast(static_cast(original())->pokemod())->speciesCount(); ++i) { - const Species* species = static_cast(m_teamMember->pokemod())->species(i); + const Species* species = static_cast(static_cast(original())->pokemod())->species(i); varSpecies->addItem(species->name()); varSpecies->setItemData(i, species->id()); } - varLevel->setMaximum(static_cast(m_teamMember->pokemod())->rules()->maxLevel()); + varLevel->setMaximum(static_cast(static_cast(original())->pokemod())->rules()->maxLevel()); } void MapTrainerTeamMemberUI::setGui() { - varSpecies->setCurrentIndex(varSpecies->findData(m_teamMember_mod->species())); - varLevel->setValue(m_teamMember_mod->level()); - varNature->setCurrentIndex(varNature->findData(m_teamMember_mod->nature())); + varSpecies->setCurrentIndex(varSpecies->findData(static_cast(modified())->species())); + varLevel->setValue(static_cast(modified())->level()); + varNature->setCurrentIndex(varNature->findData(static_cast(modified())->nature())); for (int i = 0; i < varItems->count(); ++i) { QListWidgetItem* widgetItem = varItems->item(i); - widgetItem->setSelected(m_teamMember_mod->item(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast(modified())->item(widgetItem->data(Qt::UserRole).toInt())); } varNature->clear(); - if (static_cast(m_teamMember->pokemod())->rules()->natureAllowed()) + if (static_cast(static_cast(original())->pokemod())->rules()->natureAllowed()) { - for (int i = 0; i < static_cast(m_teamMember->pokemod())->natureCount(); ++i) + for (int i = 0; i < static_cast(static_cast(original())->pokemod())->natureCount(); ++i) { - const Nature* nature = static_cast(m_teamMember->pokemod())->nature(i); + const Nature* nature = static_cast(static_cast(original())->pokemod())->nature(i); varNature->addItem(nature->name()); varNature->setItemData(i, nature->id()); } @@ -78,11 +77,11 @@ void MapTrainerTeamMemberUI::setGui() else boxNature->setEnabled(false); varItems->clear(); - if (static_cast(m_teamMember->pokemod())->rules()->holdItems()) + if (static_cast(static_cast(original())->pokemod())->rules()->holdItems()) { - for (int i = 0; i < static_cast(m_teamMember->pokemod())->itemCount(); ++i) + for (int i = 0; i < static_cast(static_cast(original())->pokemod())->itemCount(); ++i) { - const Item* item = static_cast(m_teamMember->pokemod())->item(i); + const Item* item = static_cast(static_cast(original())->pokemod())->item(i); QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems); widgetItem->setData(Qt::UserRole, item->id()); } @@ -93,13 +92,13 @@ void MapTrainerTeamMemberUI::setGui() void MapTrainerTeamMemberUI::on_buttonApply_clicked() { - *m_teamMember = *m_teamMember_mod; + *static_cast(original()) = *static_cast(modified()); emit(changed(false)); } void MapTrainerTeamMemberUI::on_buttonDiscard_clicked() { - *m_teamMember_mod = *m_teamMember; + *static_cast(modified()) = *static_cast(original()); setGui(); emit(changed(false)); } @@ -108,7 +107,7 @@ void MapTrainerTeamMemberUI::on_varSpecies_currentIndexChanged(const int species { try { - m_teamMember_mod->setSpecies(varSpecies->itemData(species).toInt()); + static_cast(modified())->setSpecies(varSpecies->itemData(species).toInt()); emit(changed(true)); } catch (BoundsException& exception) @@ -122,7 +121,7 @@ void MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level) { try { - m_teamMember_mod->setLevel(level); + static_cast(modified())->setLevel(level); emit(changed(true)); } catch (Exception& exception) @@ -136,7 +135,7 @@ void MapTrainerTeamMemberUI::on_varNature_currentIndexChanged(const int nature) { try { - m_teamMember_mod->setNature(varNature->itemData(nature).toInt()); + static_cast(modified())->setNature(varNature->itemData(nature).toInt()); emit(changed(true)); } catch (BoundsException& exception) @@ -153,7 +152,7 @@ void MapTrainerTeamMemberUI::on_varItems_itemSelectionChanged() for (int i = 0; i < varItems->count(); ++i) { const QListWidgetItem* widgetItem = varItems->item(i); - m_teamMember_mod->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected()); + static_cast(modified())->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected()); } emit(changed(true)); } -- cgit