[ADD] MapTrainerUI logic

[FIX] MapTrainer UI now uses the PointWidget
[FIX] Unnecessary static_casts removed
[FIX] MapTrainer API changed a bit
[FIX] PointWidget::setMaximum slot
[FIX] spec file now for F9 (qt and kdelibs are now 4, not 3)

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

1 files changed, 19 insertions, 19 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 898c7a99..03d0fcba 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -40,8 +40,8 @@ MapTrainer::MapTrainer(const Map* parent, const int id) :
         m_coordinate(0, 0),
         m_sight(0),
         m_direction(INT_MAX),
-        m_numFight(1),
-        m_appearFlag(0, 0),
+        m_numberFight(1),
+        m_flag(0, 0),
         m_dialog(INT_MAX),
         m_leadTeamMember(INT_MAX)
 {
@@ -71,7 +71,7 @@ void MapTrainer::validate()
     TEST(setTrainerClass, trainerClass);
     TEST(setCoordinate, coordinate);
     TEST(setDirection, direction);
-    TEST(setNumFight, numFight);
+    TEST(setNumberFight, numberFight);
     TEST(setDialog, dialog);
     TEST(setLeadTeamMember, leadTeamMember);
     if (!teamMemberCount())
@@ -94,8 +94,8 @@ void MapTrainer::load(const QDomElement& xml, int id)
     LOAD(Point, coordinate);
     LOAD(int, sight);
     LOAD(int, direction);
-    LOAD(int, numFight);
-    LOAD(Flag, appearFlag);
+    LOAD(int, numberFight);
+    LOAD(Flag, flag);
     LOAD(int, dialog);
     LOAD_SUB(newTeamMember, MapTrainerTeamMember);
     LOAD(int, leadTeamMember);
@@ -109,8 +109,8 @@ QDomElement MapTrainer::save() const
     SAVE(Point, coordinate);
     SAVE(int, sight);
     SAVE(int, direction);
-    SAVE(int, numFight);
-    SAVE(Flag, appearFlag);
+    SAVE(int, numberFight);
+    SAVE(Flag, flag);
     SAVE(int, dialog);
     SAVE_SUB(MapTrainerTeamMember, teamMember);
     return xml;
@@ -156,19 +156,19 @@ void MapTrainer::setDirection(const int direction)
     m_direction = direction;
 }
 
-void MapTrainer::setNumFight(const int numFight)
+void MapTrainer::setNumberFight(const int numberFight)
 {
-    if (!numFight || (static_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numFight))
+    if (!numberFight || (static_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numberFight))
     {
-        emit(error(bounds("numFight")));
+        emit(error(bounds("numberFight")));
         return;
     }
-    m_numFight = numFight;
+    m_numberFight = numberFight;
 }
 
-void MapTrainer::setAppearFlag(const Flag& appearFlag)
+void MapTrainer::setFlag(const Flag& flag)
 {
-    m_appearFlag = appearFlag;
+    m_flag = flag;
 }
 
 void MapTrainer::setDialog(const int dialog)
@@ -216,14 +216,14 @@ int MapTrainer::direction() const
     return m_direction;
 }
 
-int MapTrainer::numFight() const
+int MapTrainer::numberFight() const
 {
-    return m_numFight;
+    return m_numberFight;
 }
 
-Flag MapTrainer::appearFlag() const
+Flag MapTrainer::flag() const
 {
-    return m_appearFlag;
+    return m_flag;
 }
 
 int MapTrainer::dialog() const
@@ -327,8 +327,8 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs)
     COPY(coordinate);
     COPY(sight);
     COPY(direction);
-    COPY(numFight);
-    COPY(appearFlag);
+    COPY(numberFight);
+    COPY(flag);
     COPY(dialog);
     COPY(leadTeamMember);
     COPY_SUB(MapTrainerTeamMember, teamMember);