[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, 13 insertions, 8 deletions

diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
index cd9459ed..a307e0f0 100644
--- a/pokemodr/AbilityUI.cpp
+++ b/pokemodr/AbilityUI.cpp
@@ -18,38 +18,43 @@
 // Header include
 #include "AbilityUI.h"
 
+// Pokemod includes
+#include "../pokemod/Ability.h"
+
 AbilityUI::AbilityUI(Ability* ability, QWidget* parent) :
-        ObjectUI(parent),
-        m_ability(ability),
-        m_ability_mod(new Ability(*ability))
+        ObjectUI(parent)
 {
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
-    setObjects(m_ability, m_ability_mod);
+    setObjects(ability, new Ability(*ability));
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     init();
 }
 
+AbilityUI::~AbilityUI()
+{
+}
+
 void AbilityUI::setGui()
 {
-    varName->setText(m_ability_mod->name());
+    varName->setText(static_cast<Ability*>(modified())->name());
 }
 
 void AbilityUI::on_buttonApply_clicked()
 {
-    *m_ability = *m_ability_mod;
+    *static_cast<Ability*>(original()) = *static_cast<Ability*>(modified());
     emit(changed(false));
 }
 
 void AbilityUI::on_buttonDiscard_clicked()
 {
-    *m_ability_mod = *m_ability;
+    *static_cast<Ability*>(modified()) = *static_cast<Ability*>(original());
     setGui();
     emit(changed(false));
 }
 
 void AbilityUI::on_varName_textChanged(const QString& name)
 {
-    m_ability_mod->setName(name);
+    static_cast<Ability*>(modified())->setName(name);
     emit(changed(true));
 }