1 files changed, 18 insertions, 17 deletions

diff --git a/pokemodr/TrainerUI.cpp b/pokemodr/TrainerUI.cpp
index f51c38c0..5551df55 100644
--- a/pokemodr/TrainerUI.cpp
+++ b/pokemodr/TrainerUI.cpp
@@ -21,48 +21,49 @@
 // PokeModr includes
 #include "FileDialog.h"
 
+// Pokemod includes
+#include "../pokemod/Trainer.h"
+
 // General includes
 #include "../general/BugCatcher.h"
-#include "../general/Exception.h"
-
-// Qt includes
-#include <QSize>
 
 TrainerUI::TrainerUI(Trainer * trainer, QWidget * parent) :
-        ObjectUI(parent),
-        m_trainer(trainer),
-        m_trainer_mod(new Trainer(*trainer))
+        ObjectUI(parent)
 {
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
-    setObjects(m_trainer, m_trainer_mod);
+    setObjects(trainer, new Trainer(*trainer));
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     init();
 }
 
+TrainerUI::~TrainerUI()
+{
+}
+
 void TrainerUI::setGui()
 {
-    varName->setText(m_trainer_mod->name());
-    varMoneyFactor->setValue(m_trainer_mod->moneyFactor());
-    varSkin->setIcon(m_trainer_mod->skin());
-//     varAI->setText(QFile::exists(trainer_mod->ai()) ? "Valid" : "Invalid");
+    varName->setText(static_cast<Trainer*>(modified())->name());
+    varMoneyFactor->setValue(static_cast<Trainer*>(modified())->moneyFactor());
+    varSkin->setIcon(static_cast<Trainer*>(modified())->skin());
+//     varAI->setText(QFile::exists(static_cast<Trainer*>(modified())->ai()) ? "Valid" : "Invalid");
 }
 
 void TrainerUI::on_buttonApply_clicked()
 {
-    *m_trainer = *m_trainer_mod;
+    *static_cast<Trainer*>(original()) = *static_cast<Trainer*>(modified());
     emit(changed(false));
 }
 
 void TrainerUI::on_buttonDiscard_clicked()
 {
-    *m_trainer_mod = *m_trainer;
+    *static_cast<Trainer*>(modified()) = *static_cast<Trainer*>(original());
     emit(changed(false));
 }
 
 void TrainerUI::on_varName_textChanged(const QString & name)
 {
-    m_trainer_mod->setName(name);
+    static_cast<Trainer*>(modified())->setName(name);
     emit(changed(true));
 }
 
@@ -70,7 +71,7 @@ void TrainerUI::on_varMoneyFactor_valueChaged(const int moneyFactor)
 {
     try
     {
-        m_trainer_mod->setMoneyFactor(moneyFactor);
+        static_cast<Trainer*>(modified())->setMoneyFactor(moneyFactor);
         emit(changed(true));
     }
     catch (BoundsException& exception)
@@ -87,7 +88,7 @@ void TrainerUI::on_varSkin_pressed()
     {
         try
         {
-            m_trainer_mod->setSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Trainer*>(modified())->setSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {