summaryrefslogtreecommitdiffstats
path: root/pokemod/MapTrainer.cpp
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2008-05-21 17:22:27 +0000
committerBen Boeckel <MathStuf@gmail.com>2008-05-21 17:22:27 +0000
commitfa85318e91ea9bbe4638092767b3b8e0ea64f57c (patch)
treeeb0bcb69ab624721d59ec9905d392937810cb7b6 /pokemod/MapTrainer.cpp
parent404b30c8601d3a3cb25bb6972427d93b1ebed640 (diff)
[FIX] Classes in pokemod will no longer emit a changed signal if not actually changed
[FIX] Logic error with checking to see if certain GUI elements need resetting [FIX] Using activated rather than currentIndexChanged signals for combo boxes [FIX] Qt bugs now irrelevant git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@161 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemod/MapTrainer.cpp')
-rw-r--r--pokemod/MapTrainer.cpp31
1 files changed, 11 insertions, 20 deletions
diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index 8eb93ebd..3bba2093 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -119,8 +119,7 @@ QDomElement MapTrainer::save() const
void MapTrainer::setName(const QString& name)
{
- m_name = name;
- emit(changed());
+ CHECK(name);
}
void MapTrainer::setTrainerClass(const int trainerClass)
@@ -130,8 +129,7 @@ void MapTrainer::setTrainerClass(const int trainerClass)
emit(error(bounds("trainerClass")));
return;
}
- m_trainerClass = trainerClass;
- emit(changed());
+ CHECK(trainerClass);
}
void MapTrainer::setCoordinate(const Point& coordinate)
@@ -141,14 +139,12 @@ void MapTrainer::setCoordinate(const Point& coordinate)
emit(error(bounds("coordinate")));
return;
}
- m_coordinate = coordinate;
- emit(changed());
+ CHECK(coordinate);
}
void MapTrainer::setSight(const int sight)
{
- m_sight = sight;
- emit(changed());
+ CHECK(sight);
}
void MapTrainer::setDirection(const int direction)
@@ -158,8 +154,7 @@ void MapTrainer::setDirection(const int direction)
emit(error(bounds("direction")));
return;
}
- m_direction = direction;
- emit(changed());
+ CHECK(direction);
}
void MapTrainer::setNumberFight(const int numberFight)
@@ -169,14 +164,12 @@ void MapTrainer::setNumberFight(const int numberFight)
emit(error(bounds("numberFight")));
return;
}
- m_numberFight = numberFight;
- emit(changed());
+ CHECK(numberFight);
}
void MapTrainer::setAppearFlag(const Flag& appearFlag)
{
- m_appearFlag = appearFlag;
- emit(changed());
+ CHECK(appearFlag);
}
void MapTrainer::setDialog(const int dialog)
@@ -186,19 +179,17 @@ void MapTrainer::setDialog(const int dialog)
emit(error(bounds("dialog")));
return;
}
- m_dialog = dialog;
- emit(changed());
+ CHECK(dialog);
}
-void MapTrainer::setLeadTeamMember(const int leadMember)
+void MapTrainer::setLeadTeamMember(const int leadTeamMember)
{
- if (teamMemberCount() <= leadMember)
+ if (teamMemberCount() <= leadTeamMember)
{
emit(error(bounds("leadTeamMember")));
return;
}
- m_leadTeamMember = leadMember;
- emit(changed());
+ CHECK(leadTeamMember);
}
QString MapTrainer::name() const