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

diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index 0d9dd96a..a4ab4495 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -26,44 +26,44 @@
 #include "../pokemod/Item.h"
 #include "../pokemod/Map.h"
 #include "../pokemod/MapWarp.h"
+#include "../pokemod/Pokemod.h"
 
 // General includes
 #include "../general/BugCatcher.h"
-#include "../general/Exception.h"
-
-// Qt includes
-#include <QSize>
 
 PokemodUI::PokemodUI(Pokemod* pokemod, QWidget* parent) :
         ObjectUI(parent),
-        m_lastMap(-1),
-        m_pokemod(pokemod),
-        m_pokemod_mod(new Pokemod(*pokemod))
+        m_lastMap(-1)
 {
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
-    setObjects(m_pokemod, m_pokemod_mod);
+    setObjects(pokemod, new Pokemod(*pokemod));
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
     init();
 }
 
+PokemodUI::~PokemodUI()
+{
+}
+
 void PokemodUI::refreshGui()
 {
     varMap->clear();
-    for (int i = 0; i < m_pokemod->mapCount(); ++i)
+    for (int i = 0; i < static_cast<Pokemod*>(original())->mapCount(); ++i)
     {
-        const Map* map = m_pokemod->map(i);
+        const Map* map = static_cast<Pokemod*>(original())->map(i);
         varMap->addItem(map->name());
         varMap->setItemData(i, map->id());
     }
-    varTypechart->setRowCount(m_pokemod->typeCount());
-    varTypechart->setColumnCount(m_pokemod->typeCount());
+    varTypechart->setRowCount(static_cast<Pokemod*>(original())->typeCount());
+    varTypechart->setColumnCount(static_cast<Pokemod*>(original())->typeCount());
     QStringList types;
-    Matrix<Fraction>* typeChart = m_pokemod->typeChart();
-    for (int i = 0; i < m_pokemod->typeCount(); ++i)
+    Matrix<Fraction>* typeChart = static_cast<Pokemod*>(original())->typeChart();
+    for (int i = 0; i < static_cast<Pokemod*>(original())->typeCount(); ++i)
     {
-        types << m_pokemod->item(i)->name();
-//         for (int j = 0; j < m_pokemod->typeCount(); ++j)
+        types << static_cast<Pokemod*>(original())->item(i)->name();
+        // TODO: set the typechart corrently
+//         for (int j = 0; j < static_cast<Pokemod*>(original())->typeCount(); ++j)
 //             static_cast<TypechartWidgetItem*>(varTypechart->item(i, j))->setData(Qt::EditRole, QVariant::fromValue((*typeChart)(i, j)));
     }
     varTypechart->setVerticalHeaderLabels(types);
@@ -72,21 +72,21 @@ void PokemodUI::refreshGui()
 
 void PokemodUI::setGui()
 {
-    const bool resetWarps = (m_pokemod_mod->startMap() == m_lastMap);
-    varTitle->setText(m_pokemod_mod->title());
-    varVersion->setText(m_pokemod_mod->version());
-    varDescription->setText(m_pokemod_mod->description());
-    varMap->setCurrentIndex(varMap->findData(m_pokemod_mod->startMap()));
-    m_lastMap = m_pokemod_mod->startMap();
+    const bool resetWarps = (static_cast<Pokemod*>(modified())->startMap() == m_lastMap);
+    varTitle->setText(static_cast<Pokemod*>(modified())->title());
+    varVersion->setText(static_cast<Pokemod*>(modified())->version());
+    varDescription->setText(static_cast<Pokemod*>(modified())->description());
+    varMap->setCurrentIndex(varMap->findData(static_cast<Pokemod*>(modified())->startMap()));
+    m_lastMap = static_cast<Pokemod*>(modified())->startMap();
     if (resetWarps)
     {
         varWarp->clear();
-        int index = m_pokemod->mapIndex(m_pokemod_mod->startMap());
+        int index = static_cast<Pokemod*>(original())->mapIndex(static_cast<Pokemod*>(modified())->startMap());
         if (index != INT_MAX)
         {
             try
             {
-                const Map* map = m_pokemod->map(index);
+                const Map* map = static_cast<Pokemod*>(original())->map(index);
                 for (int i = 0; i < map->warpCount(); ++i)
                 {
                     const MapWarp* warp = map->warp(i);
@@ -100,45 +100,45 @@ void PokemodUI::setGui()
             }
         }
     }
-    varWarp->setCurrentIndex(varWarp->findData(m_pokemod_mod->startWarp()));
-    varSuperPCUsername->setText(m_pokemod_mod->superPCUname());
-    varSuperPCPassword->setText(m_pokemod_mod->superPCPasswd());
-    varWalkSkin->setIcon(m_pokemod->walkSkin());
-    varBikeSkin->setIcon(m_pokemod->bikeSkin());
-    varFlySkin->setIcon(m_pokemod->flySkin());
-    varSurfSkin->setIcon(m_pokemod->surfSkin());
-    varFishSkin->setIcon(m_pokemod->fishSkin());
-    varSurfFishSkin->setIcon(m_pokemod->surfFishSkin());
+    varWarp->setCurrentIndex(varWarp->findData(static_cast<Pokemod*>(modified())->startWarp()));
+    varSuperPCUsername->setText(static_cast<Pokemod*>(modified())->superPCUname());
+    varSuperPCPassword->setText(static_cast<Pokemod*>(modified())->superPCPasswd());
+    varWalkSkin->setIcon(static_cast<Pokemod*>(original())->walkSkin());
+    varBikeSkin->setIcon(static_cast<Pokemod*>(original())->bikeSkin());
+    varFlySkin->setIcon(static_cast<Pokemod*>(original())->flySkin());
+    varSurfSkin->setIcon(static_cast<Pokemod*>(original())->surfSkin());
+    varFishSkin->setIcon(static_cast<Pokemod*>(original())->fishSkin());
+    varSurfFishSkin->setIcon(static_cast<Pokemod*>(original())->surfFishSkin());
 }
 
 void PokemodUI::on_buttonApply_clicked()
 {
-    *m_pokemod = *m_pokemod_mod;
+    *static_cast<Pokemod*>(original()) = *static_cast<Pokemod*>(modified());
     emit(changed(false));
 }
 
 void PokemodUI::on_buttonDiscard_clicked()
 {
-    *m_pokemod_mod = *m_pokemod;
+    *static_cast<Pokemod*>(modified()) = *static_cast<Pokemod*>(original());
     setGui();
     emit(changed(false));
 }
 
 void PokemodUI::on_varTitle_textChanged(const QString& title)
 {
-    m_pokemod_mod->setTitle(title);
+    static_cast<Pokemod*>(modified())->setTitle(title);
     emit(changed(true));
 }
 
 void PokemodUI::on_varVersion_textChanged(const QString& version)
 {
-    m_pokemod_mod->setVersion(version);
+    static_cast<Pokemod*>(modified())->setVersion(version);
     emit(changed(true));
 }
 
 void PokemodUI::on_varDescription_textChanged()
 {
-    m_pokemod_mod->setDescription(varDescription->toPlainText());
+    static_cast<Pokemod*>(modified())->setDescription(varDescription->toPlainText());
     emit(changed(true));
 }
 
@@ -146,7 +146,7 @@ void PokemodUI::on_varMap_currentIndexChanged(const int map)
 {
     try
     {
-        m_pokemod_mod->setStartMap(map);
+        static_cast<Pokemod*>(modified())->setStartMap(map);
         emit(changed(true));
     }
     catch (BoundsException& exception)
@@ -160,7 +160,7 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int warp)
 {
     try
     {
-        m_pokemod_mod->setStartWarp(warp);
+        static_cast<Pokemod*>(modified())->setStartWarp(warp);
         emit(changed(true));
     }
     catch (BoundsException& exception)
@@ -172,13 +172,13 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int warp)
 
 void PokemodUI::on_varSuperPCUsername_textChanged(const QString& username)
 {
-    m_pokemod_mod->setSuperPCUname(username);
+    static_cast<Pokemod*>(modified())->setSuperPCUname(username);
     emit(changed(true));
 }
 
 void PokemodUI::on_varSuperPCPassword_textChanged(const QString& password)
 {
-    m_pokemod_mod->setSuperPCPasswd(password);
+    static_cast<Pokemod*>(modified())->setSuperPCPasswd(password);
     emit(changed(true));
 }
 
@@ -189,7 +189,7 @@ void PokemodUI::on_varWalkSkin_pressed()
     {
         try
         {
-            m_pokemod->setWalkSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setWalkSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -206,7 +206,7 @@ void PokemodUI::on_varBikeSkin_pressed()
     {
         try
         {
-            m_pokemod->setBikeSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setBikeSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -223,7 +223,7 @@ void PokemodUI::on_varFlySkin_pressed()
     {
         try
         {
-            m_pokemod->setFlySkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setFlySkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -240,7 +240,7 @@ void PokemodUI::on_varSurfSkin_pressed()
     {
         try
         {
-            m_pokemod->setSurfSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setSurfSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -257,7 +257,7 @@ void PokemodUI::on_varFishSkin_pressed()
     {
         try
         {
-            m_pokemod->setFishSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setFishSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {
@@ -274,7 +274,7 @@ void PokemodUI::on_varSurfFishSkin_pressed()
     {
         try
         {
-            m_pokemod->setSurfFishSkin(QPixmap(dialog.selectedFile()));
+            static_cast<Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog.selectedFile()));
         }
         catch (SaveException& exception)
         {