[FIX] Exceptions no longer used in pokemod

[DEL] Exception and BugCatcher are no longer needed
[ADD] Object.cpp added

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

1 files changed, 17 insertions, 20 deletions

diff --git a/pokemod/Trainer.cpp b/pokemod/Trainer.cpp
index 270df528..eddb5972 100644
--- a/pokemod/Trainer.cpp
+++ b/pokemod/Trainer.cpp
@@ -50,22 +50,13 @@ Trainer::Trainer(const QDomElement& xml, const Object* parent, const int id) :
     load(xml, id);
 }
 
-bool Trainer::validate() const
+void Trainer::validate(QTextStream& stream)
 {
-    // TODO: validate
-//     bool valid = true;
-//     static_cast<const Pokemod*>(pokemod())->validationMsg(QString("---Trainer \"%1\" with id %2---").arg(m_name).arg(id()), Pokemod::V_Msg);
-//     if (m_name == "")
-//     {
-//         static_cast<const Pokemod*>(pokemod())->validationMsg("Name not defined");
-//         valid = false;
-//     }
-//     if (m_moneyFactor < 0)
-//     {
-//         static_cast<const Pokemod*>(pokemod())->validationMsg("Invalid money factor");
-//         valid = false;
-//     }
-//     return valid;
+    TEST_SETUP();
+    if (m_name.isEmpty())
+        error(stream, "Name is empty");
+    TEST(setMoneyFactor, moneyFactor);
+    TEST(setSkin, skin);
 }
 
 void Trainer::load(const QDomElement& xml, int id)
@@ -90,21 +81,27 @@ void Trainer::setName(const QString& name)
     m_name = name;
 }
 
-void Trainer::setMoneyFactor(const int moneyFactor) throw(BoundsException)
+void Trainer::setMoneyFactor(const int moneyFactor)
 {
     if (moneyFactor < 0)
-        error<BoundsException>("moneyFactor");
+    {
+        boundsError("moneyFactor");
+        return;
+    }
     m_moneyFactor = moneyFactor;
 }
 
-void Trainer::setSkin(const QPixmap& skin) throw(SizeException)
+void Trainer::setSkin(const QPixmap& skin)
 {
     if (skin.size() != QSize(192, 128))
-        error<SizeException>("skin");
+    {
+        sizeError("skin");
+        return;
+    }
     m_skin = skin;
 }
 
-// void Trainer::setAi(const QString& fileName) throw(Exception)
+// void Trainer::setAi(const QString& fileName)
 // {
 //     QFile file(ai());
 //     if (file.exists() && !file.remove())