From 60a2ed8ee8aa994c83d382af2ec477e171beb950 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 9 Jun 2008 00:50:59 +0000 Subject: [FIX] All modules now use their own namespace git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@201 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemod/MapEffect.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'pokemod/MapEffect.cpp') diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index 73593d22..4f628e54 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -25,13 +25,13 @@ // Qt includes #include -MapEffect::MapEffect(const MapEffect& effect) : +Pokemod::MapEffect::MapEffect(const MapEffect& effect) : Object("MapEffect", effect.parent(), effect.id()) { *this = effect; } -MapEffect::MapEffect(const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const Map* parent, const int id) : Object("MapEffect", parent, id), m_name(""), m_coordinate(0, 0), @@ -41,19 +41,19 @@ MapEffect::MapEffect(const Map* parent, const int id) : { } -MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : Object("MapEffect", parent, id) { *this = effect; } -MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : Object("MapEffect", parent, id) { load(xml, id); } -void MapEffect::validate() +void Pokemod::MapEffect::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -61,7 +61,7 @@ void MapEffect::validate() TEST(setSkin, skin); } -void MapEffect::load(const QDomElement& xml, int id) +void Pokemod::MapEffect::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -71,7 +71,7 @@ void MapEffect::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement MapEffect::save() const +QDomElement Pokemod::MapEffect::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -82,12 +82,12 @@ QDomElement MapEffect::save() const return xml; } -void MapEffect::setName(const QString& name) +void Pokemod::MapEffect::setName(const QString& name) { CHECK(name); } -void MapEffect::setCoordinate(const Point& coordinate) +void Pokemod::MapEffect::setCoordinate(const Point& coordinate) { if ((static_cast(parent())->width() <= coordinate.x()) || (static_cast(parent())->height() <= coordinate.y())) { @@ -97,7 +97,7 @@ void MapEffect::setCoordinate(const Point& coordinate) CHECK(coordinate); } -void MapEffect::setSkin(const QPixmap& skin) +void Pokemod::MapEffect::setSkin(const QPixmap& skin) { if (skin.size() != QSize(192, 128)) { @@ -108,42 +108,42 @@ void MapEffect::setSkin(const QPixmap& skin) emit(changed()); } -void MapEffect::setIsGhost(const bool isGhost) +void Pokemod::MapEffect::setIsGhost(const bool isGhost) { CHECK(isGhost); } -void MapEffect::setScript(const Script& script) +void Pokemod::MapEffect::setScript(const Script& script) { CHECK(script); } -QString MapEffect::name() const +QString Pokemod::MapEffect::name() const { return m_name; } -Point MapEffect::coordinate() const +Pokemod::Point Pokemod::MapEffect::coordinate() const { return m_coordinate; } -QPixmap MapEffect::skin() const +QPixmap Pokemod::MapEffect::skin() const { return m_skin; } -bool MapEffect::isGhost() const +bool Pokemod::MapEffect::isGhost() const { return m_isGhost; } -Script MapEffect::script() const +Pokemod::Script Pokemod::MapEffect::script() const { return m_script; } -MapEffect& MapEffect::operator=(const MapEffect& rhs) +Pokemod::MapEffect& Pokemod::MapEffect::operator=(const MapEffect& rhs) { if (this == &rhs) return *this; -- cgit