[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

1 files changed, 23 insertions, 25 deletions

diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
index efbdf11c..7ee7df28 100644
--- a/pokemodr/BadgeUI.cpp
+++ b/pokemodr/BadgeUI.cpp
@@ -22,28 +22,26 @@
 #include "FileDialog.h"
 
 // Pokemod includes
+#include "../pokemod/Badge.h"
 #include "../pokemod/Pokemod.h"
 
 // General includes
 #include "../general/BugCatcher.h"
-#include "../general/Exception.h"
-
-// Qt includes
-#include <QListWidgetItem>
-#include <QSize>
 
 BadgeUI::BadgeUI(Badge* badge, QWidget* parent) :
-        ObjectUI(parent),
-        m_badge(badge),
-        m_badge_mod(new Badge(*badge))
+        ObjectUI(parent)
 {
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
-    setObjects(m_badge, m_badge_mod);
+    setObjects(badge, new Badge(*badge));
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     init();
 }
 
+BadgeUI::~BadgeUI()
+{
+}
+
 void BadgeUI::initGui()
 {
     varHMs->addItems(Pokemod::HMStr);
@@ -52,38 +50,38 @@ void BadgeUI::initGui()
 void BadgeUI::refreshGui()
 {
     varStat->clear();
-    const bool isSplit = static_cast<const Pokemod*>(m_badge->pokemod())->rules()->specialSplit();
+    const bool isSplit = static_cast<const Pokemod*>(static_cast<Badge*>(original())->pokemod())->rules()->specialSplit();
     varStat->addItems((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr).mid(0, isSplit ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY));
-    varObey->setMaximum(static_cast<const Pokemod*>(m_badge->pokemod())->rules()->maxLevel());
+    varObey->setMaximum(static_cast<const Pokemod*>(static_cast<Badge*>(original())->pokemod())->rules()->maxLevel());
 }
 
 void BadgeUI::setGui()
 {
-    varName->setText(m_badge_mod->name());
-    varObey->setValue(m_badge_mod->obey());
-    varFace->setIcon(m_badge_mod->face());
-    varBadge->setIcon(m_badge_mod->badge());
-    varStatMultiplier->setValue(m_badge_mod->stat(varStat->currentIndex()));
+    varName->setText(static_cast<Badge*>(modified())->name());
+    varObey->setValue(static_cast<Badge*>(modified())->obey());
+    varFace->setIcon(static_cast<Badge*>(modified())->face());
+    varBadge->setIcon(static_cast<Badge*>(modified())->badge());
+    varStatMultiplier->setValue(static_cast<Badge*>(modified())->stat(varStat->currentIndex()));
     for (int i = 0; i < varHMs->count(); ++i)
-        varHMs->item(i)->setSelected(m_badge_mod->hm(i));
+        varHMs->item(i)->setSelected(static_cast<Badge*>(modified())->hm(i));
 }
 
 void BadgeUI::on_buttonApply_clicked()
 {
-    *m_badge = *m_badge_mod;
+    *static_cast<Badge*>(original()) = *static_cast<Badge*>(modified());
     emit(changed(false));
 }
 
 void BadgeUI::on_buttonDiscard_clicked()
 {
-    *m_badge_mod = *m_badge;
+    *static_cast<Badge*>(modified()) = *static_cast<Badge*>(original());
     setGui();
     emit(changed(false));
 }
 
 void BadgeUI::on_varName_textChanged(const QString& name)
 {
-    m_badge_mod->setName(name);
+    static_cast<Badge*>(modified())->setName(name);
     emit(changed(true));
 }
 
@@ -91,7 +89,7 @@ void BadgeUI::on_varObey_valueChanged(const int obey)
 {
     try
     {
-        m_badge_mod->setObey(obey);
+        static_cast<Badge*>(modified())->setObey(obey);
         emit(changed(true));
     }
     catch (BoundsException& exception)
@@ -108,7 +106,7 @@ void BadgeUI::on_varFace_pressed()
     {
         try
         {
-            m_badge_mod->setFace(QPixmap(dialog.selectedFile()));
+            static_cast<Badge*>(modified())->setFace(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -125,7 +123,7 @@ void BadgeUI::on_varBadge_pressed()
     {
         try
         {
-            m_badge_mod->setBadge(QPixmap(dialog.selectedFile()));
+            static_cast<Badge*>(modified())->setBadge(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -145,7 +143,7 @@ void BadgeUI::on_varStatMultiplier_valueChanged(const Fraction& multiplier)
 {
     try
     {
-        m_badge_mod->setStat(varStat->currentIndex(), multiplier);
+        static_cast<Badge*>(modified())->setStat(varStat->currentIndex(), multiplier);
         emit(changed(true));
     }
     catch (Exception& exception)
@@ -160,7 +158,7 @@ void BadgeUI::on_varHMs_itemSelectionChanged()
     try
     {
         for (int i = 0; i < varHMs->count(); ++i)
-            m_badge_mod->setHm(i, varHMs->item(i)->isSelected());
+            static_cast<Badge*>(modified())->setHm(i, varHMs->item(i)->isSelected());
         emit(changed(true));
     }
     catch (BoundsException& exception)