[FIX] Frac bug with type of Over1

[FIX] PokemodUI vtable errors
[FIX] Manual .pro file clean up
[FIX] Was attempting to emit a slot...

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@72 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 14 insertions, 16 deletions

diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index dddbf447..0366d663 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -25,8 +25,6 @@
 #include <BugCatcher.h>
 #include <Exception.h>
 
-#include <Pokemod.h>
-
 #include "PokemodUI.h"
 
 PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
@@ -38,7 +36,7 @@ PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(pokemod, pokemod_mod);
-    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
+    connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < pokemod->getPokemod()->getMapCount(); ++i)
     {
         const Map* m = pokemod->getPokemod()->getMap(i);
@@ -85,32 +83,32 @@ void PokemodUI::setGui()
 void PokemodUI::on_buttonApply_clicked()
 {
     *pokemod = *pokemod_mod;
-    emit(setChanged(false));
+    emit(changed(false));
 }
 
 void PokemodUI::on_buttonDiscard_clicked()
 {
     *pokemod_mod = *pokemod;
-    emit(setChanged(false));
+    emit(changed(false));
     setGui();
 }
 
-void PokemodUI::on_varTitle_textChanged(const QString & t)
+void PokemodUI::on_varTitle_textChanged(const QString& t)
 {
     pokemod_mod->setTitle(t);
-    emit(setChanged(true));
+    emit(changed(true));
 }
 
-void PokemodUI::on_varVersion_textChanged(const QString & v)
+void PokemodUI::on_varVersion_textChanged(const QString& v)
 {
     pokemod_mod->setVersion(v);
-    emit(setChanged(true));
+    emit(changed(true));
 }
 
 void PokemodUI::on_varDescription_textChanged()
 {
     pokemod_mod->setDescription(varDescription->toPlainText());
-    emit(setChanged(true));
+    emit(changed(true));
 }
 
 void PokemodUI::on_varMap_currentIndexChanged(const int s)
@@ -118,7 +116,7 @@ void PokemodUI::on_varMap_currentIndexChanged(const int s)
     try
     {
         pokemod_mod->setStartMap(s);
-        emit(setChanged(true));
+        emit(changed(true));
     }
     catch (BoundsException& e)
     {
@@ -132,7 +130,7 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int s)
     try
     {
         pokemod_mod->setStartWarp(s);
-        emit(setChanged(true));
+        emit(changed(true));
     }
     catch (BoundsException& e)
     {
@@ -141,14 +139,14 @@ void PokemodUI::on_varWarp_currentIndexChanged(const int s)
     }
 }
 
-void PokemodUI::on_varSuperPCUsername_textChanged(const QString & u)
+void PokemodUI::on_varSuperPCUsername_textChanged(const QString& u)
 {
     pokemod_mod->setSuperPCUname(u);
-    emit(setChanged(true));
+    emit(changed(true));
 }
 
-void PokemodUI::on_varSuperPCPassword_textChanged(const QString & p)
+void PokemodUI::on_varSuperPCPassword_textChanged(const QString& p)
 {
     pokemod_mod->setSuperPCPasswd(p);
-    emit(setChanged(true));
+    emit(changed(true));
 }