1 files changed, 21 insertions, 21 deletions

diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp
index e206bc15..3e3677b7 100644
--- a/pokemod/MapWarp.cpp
+++ b/pokemod/MapWarp.cpp
@@ -22,15 +22,15 @@
 #include "Map.h"
 #include "Pokemod.h"
 
-const QStringList MapWarp::TypeStr = QStringList() << "Door/Stair" << "Warp Pad" << "Hole" << "Boundary";
+const QStringList Pokemod::MapWarp::TypeStr = QStringList() << "Door/Stair" << "Warp Pad" << "Hole" << "Boundary";
 
-MapWarp::MapWarp(const MapWarp& warp) :
+Pokemod::MapWarp::MapWarp(const MapWarp& warp) :
         Object("MapWarp", warp.parent(), warp.id())
 {
     *this = warp;
 }
 
-MapWarp::MapWarp(const Map* parent, const int id) :
+Pokemod::MapWarp::MapWarp(const Map* parent, const int id) :
         Object("MapWarp", parent, id),
         m_name(""),
         m_coordinate(0, 0),
@@ -41,19 +41,19 @@ MapWarp::MapWarp(const Map* parent, const int id) :
 {
 }
 
-MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) :
+Pokemod::MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) :
         Object("MapWarp", parent, id)
 {
     *this = warp;
 }
 
-MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) :
+Pokemod::MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) :
         Object("MapWarp", parent, id)
 {
     load(xml, id);
 }
 
-void MapWarp::validate()
+void Pokemod::MapWarp::validate()
 {
     if (m_name.isEmpty())
         emit(error("Name is empty"));
@@ -62,7 +62,7 @@ void MapWarp::validate()
     TEST(setToWarp, toWarp);
 }
 
-void MapWarp::load(const QDomElement& xml, int id)
+void Pokemod::MapWarp::load(const QDomElement& xml, int id)
 {
     LOAD_ID();
     LOAD(QString, name);
@@ -73,7 +73,7 @@ void MapWarp::load(const QDomElement& xml, int id)
     LOAD(Script, script);
 }
 
-QDomElement MapWarp::save() const
+QDomElement Pokemod::MapWarp::save() const
 {
     SAVE_CREATE();
     SAVE(QString, name);
@@ -85,12 +85,12 @@ QDomElement MapWarp::save() const
     return xml;
 }
 
-void MapWarp::setName(const QString& name)
+void Pokemod::MapWarp::setName(const QString& name)
 {
     CHECK(name);
 }
 
-void MapWarp::setCoordinate(const Point& coordinate)
+void Pokemod::MapWarp::setCoordinate(const Point& coordinate)
 {
     if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y()))
     {
@@ -100,7 +100,7 @@ void MapWarp::setCoordinate(const Point& coordinate)
     CHECK(coordinate);
 }
 
-void MapWarp::setType(const int type)
+void Pokemod::MapWarp::setType(const int type)
 {
     if (End <= type)
     {
@@ -110,7 +110,7 @@ void MapWarp::setType(const int type)
     CHECK(type);
 }
 
-void MapWarp::setToMap(const int toMap)
+void Pokemod::MapWarp::setToMap(const int toMap)
 {
     if (static_cast<const Pokemod*>(pokemod())->mapIndex(toMap) == INT_MAX)
     {
@@ -120,7 +120,7 @@ void MapWarp::setToMap(const int toMap)
     CHECK(toMap);
 }
 
-void MapWarp::setToWarp(const int toWarp)
+void Pokemod::MapWarp::setToWarp(const int toWarp)
 {
     if (static_cast<const Pokemod*>(pokemod())->mapIndex(m_toMap) == INT_MAX)
     {
@@ -135,42 +135,42 @@ void MapWarp::setToWarp(const int toWarp)
     CHECK(toWarp);
 }
 
-void MapWarp::setScript(const Script& script)
+void Pokemod::MapWarp::setScript(const Script& script)
 {
     CHECK(script);
 }
 
-QString MapWarp::name() const
+QString Pokemod::MapWarp::name() const
 {
     return m_name;
 }
 
-Point MapWarp::coordinate() const
+Pokemod::Point Pokemod::MapWarp::coordinate() const
 {
     return m_coordinate;
 }
 
-int MapWarp::type() const
+int Pokemod::MapWarp::type() const
 {
     return m_type;
 }
 
-int MapWarp::toMap() const
+int Pokemod::MapWarp::toMap() const
 {
     return m_toMap;
 }
 
-int MapWarp::toWarp() const
+int Pokemod::MapWarp::toWarp() const
 {
     return m_toWarp;
 }
 
-Script MapWarp::script() const
+Pokemod::Script Pokemod::MapWarp::script() const
 {
     return m_script;
 }
 
-MapWarp& MapWarp::operator=(const MapWarp& rhs)
+Pokemod::MapWarp& Pokemod::MapWarp::operator=(const MapWarp& rhs)
 {
     if (this == &rhs)
         return *this;