[FIX] pokemod now uses signals/slots for errors and warnings

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

1 files changed, 11 insertions, 11 deletions

diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index 1a6759ba..67c7109a 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -20,8 +20,9 @@
 
 // Pokemod includes
 #include "Item.h"
-#include "Species.h"
+#include "MapTrainer.h"
 #include "Pokemod.h"
+#include "Species.h"
 
 // Qt includes
 #include <QSet>
@@ -32,7 +33,7 @@ MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMembe
     *this = teamMember;
 }
 
-MapTrainerTeamMember::MapTrainerTeamMember(const Object* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) :
         Object("MapTrainerTeamMember", parent, id),
         m_species(INT_MAX),
         m_level(INT_MAX),
@@ -40,21 +41,20 @@ MapTrainerTeamMember::MapTrainerTeamMember(const Object* parent, const int id) :
 {
 }
 
-MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const Object* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) :
         Object("MapTrainerTeamMember", parent, id)
 {
     *this = teamMember;
 }
 
-MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const Object* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) :
         Object("MapTrainerTeamMember", parent, id)
 {
     load(xml, id);
 }
 
-void MapTrainerTeamMember::validate(QTextStream& stream)
+void MapTrainerTeamMember::validate()
 {
-    TEST_SETUP();
     TEST(setSpecies, species);
     TEST(setLevel, level);
     if (m_item.size() <= static_cast<const Pokemod*>(pokemod())->rules()->holdItems())
@@ -62,7 +62,7 @@ void MapTrainerTeamMember::validate(QTextStream& stream)
         TEST_LIST(setItem, item);
     }
     else
-        error(stream, "Too many held items");
+        emit(error("Too many held items"));
     if (static_cast<const Pokemod*>(pokemod())->rules()->natureAllowed())
     {
         TEST(setNature, nature);
@@ -92,7 +92,7 @@ void MapTrainerTeamMember::setSpecies(const int species)
 {
     if (static_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX)
     {
-        boundsError("species");
+        emit(error(bounds("species")));
         return;
     }
     m_species = species;
@@ -102,7 +102,7 @@ void MapTrainerTeamMember::setLevel(const int level)
 {
     if (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < level)
     {
-        boundsError("level");
+        emit(error(bounds("level")));
         return;
     }
     m_level = level;
@@ -112,7 +112,7 @@ void MapTrainerTeamMember::setItem(const int item, const bool state)
 {
     if (static_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX)
     {
-        boundsError("item");
+        emit(error(bounds("item")));
         return;
     }
     if (state)
@@ -128,7 +128,7 @@ void MapTrainerTeamMember::setNature(const int nature)
 {
     if (!static_cast<const Pokemod*>(pokemod())->rules()->natureAllowed() || (static_cast<const Pokemod*>(pokemod())->natureIndex(nature) == INT_MAX))
     {
-        boundsError("nature");
+        emit(error(bounds("nature")));
         return;
     }
     m_nature = nature;