[FIX] Validation works in Pokémodr

[FIX] Macros moved to their own file
[FIX] Macros for subclasses added
[FIX] Key shortcuts added to context menu items
[FIX] Rules had a redundant field

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

1 files changed, 15 insertions, 16 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index d1fead4e..5c5e665d 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -19,6 +19,7 @@
 #include "MapTrainer.h"
 
 // Pokemod includes
+#include "Macros.h"
 #include "Map.h"
 #include "MapTrainerTeamMember.h"
 #include "Pokemod.h"
@@ -63,6 +64,7 @@ Pokemod::MapTrainer::~MapTrainer()
 
 void Pokemod::MapTrainer::validate()
 {
+    TEST_BEGIN();
     if (m_name.isEmpty())
         emit(error("Name is empty"));
     TEST(setTrainerClass, trainerClass);
@@ -72,13 +74,10 @@ void Pokemod::MapTrainer::validate()
     if (!teamMemberCount())
         emit(error("There are no team members"));
     QSet<int> idChecker;
-    foreach (MapTrainerTeamMember* teamMember, m_teamMember)
-    {
-        teamMember->validate();
-        if (idChecker.contains(teamMember->id()))
-            emit(error(subclass("team member", teamMember->id())));
-        idChecker.insert(teamMember->id());
-    }
+    TEST_SUB_BEGIN(MapTrainerTeamMember, teamMembers);
+        TEST_SUB("team member", id);
+    TEST_SUB_END();
+    TEST_END();
 }
 
 void Pokemod::MapTrainer::load(const QDomElement& xml, int id)
@@ -101,7 +100,7 @@ QDomElement Pokemod::MapTrainer::save() const
     SAVE(Point, coordinate);
     SAVE(int, numberFight);
     SAVE(Script, script);
-    SAVE_SUB(MapTrainerTeamMember, teamMember);
+    SAVE_SUB(MapTrainerTeamMember, teamMembers);
     return xml;
 }
 
@@ -188,13 +187,13 @@ int Pokemod::MapTrainer::leadTeamMember() const
 const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) const
 {
     Q_ASSERT(index < teamMemberCount());
-    return m_teamMember.at(index);
+    return m_teamMembers.at(index);
 }
 
 Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index)
 {
     Q_ASSERT(index < teamMemberCount());
-    return m_teamMember[index];
+    return m_teamMembers[index];
 }
 
 const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) const
@@ -211,7 +210,7 @@ int Pokemod::MapTrainer::teamMemberIndex(const int id) const
 {
     for (int i = 0; i < teamMemberCount(); ++i)
     {
-        if (m_teamMember[i]->id() == id)
+        if (m_teamMembers[i]->id() == id)
             return i;
     }
     return INT_MAX;
@@ -219,7 +218,7 @@ int Pokemod::MapTrainer::teamMemberIndex(const int id) const
 
 int Pokemod::MapTrainer::teamMemberCount() const
 {
-    return m_teamMember.size();
+    return m_teamMembers.size();
 }
 
 Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember()
@@ -239,15 +238,15 @@ Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const MapTrain
 
 Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember)
 {
-    m_teamMember.append(teamMember);
+    m_teamMembers.append(teamMember);
     return teamMember;
 }
 
 void Pokemod::MapTrainer::deleteTeamMember(const int index)
 {
     Q_ASSERT(index < teamMemberCount());
-    delete m_teamMember[index];
-    m_teamMember.removeAt(index);
+    delete m_teamMembers[index];
+    m_teamMembers.removeAt(index);
 }
 
 void Pokemod::MapTrainer::deleteTeamMemberById(const int id)
@@ -274,7 +273,7 @@ Pokemod::MapTrainer& Pokemod::MapTrainer::operator=(const MapTrainer& rhs)
     COPY(numberFight);
     COPY(script);
     COPY(leadTeamMember);
-    COPY_SUB(MapTrainerTeamMember, teamMember);
+    COPY_SUB(MapTrainerTeamMember, teamMembers);
     return *this;
 }