1 files changed, 22 insertions, 22 deletions

diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp
index b59737e7..4ddb2632 100644
--- a/pokemod/Tile.cpp
+++ b/pokemod/Tile.cpp
@@ -24,66 +24,66 @@
 // Qt includes
 #include <QBuffer>
 
-Tile::Tile(const Tile& tile) :
+Pokemod::Tile::Tile(const Tile& tile) :
         Object("Tile", tile.parent(), tile.id())
 {
     *this = tile;
 }
 
-Tile::Tile(const Pokemod* parent, const int id) :
+Pokemod::Tile::Tile(const Pokemod* parent, const int id) :
         Object("Tile", parent, id),
         m_name(""),
         m_sprite(64, 64),
         m_script("", "")
 {
-    for (int i = 0; i < Pokemod::D_End; ++i)
+    for (int i = 0; i < D_End; ++i)
         m_from[i] = false;
 }
 
-Tile::Tile(const Tile& tile, const Pokemod* parent, const int id) :
+Pokemod::Tile::Tile(const Tile& tile, const Pokemod* parent, const int id) :
         Object("Tile", parent, id)
 {
     *this = tile;
 }
 
-Tile::Tile(const QDomElement& xml, const Pokemod* parent, const int id) :
+Pokemod::Tile::Tile(const QDomElement& xml, const Pokemod* parent, const int id) :
         Object("Tile", parent, id)
 {
     load(xml, id);
 }
 
-void Tile::validate()
+void Pokemod::Tile::validate()
 {
     if (m_name.isEmpty())
         emit(error("Name is empty"));
     TEST(setSprite, sprite);
 }
 
-void Tile::load(const QDomElement& xml, int id)
+void Pokemod::Tile::load(const QDomElement& xml, int id)
 {
     LOAD_ID();
     LOAD(QString, name);
     LOAD(QPixmap, sprite);
-    LOAD_ARRAY(bool, from, Pokemod::D_End);
+    LOAD_ARRAY(bool, from, D_End);
     LOAD(Script, script);
 }
 
-QDomElement Tile::save() const
+QDomElement Pokemod::Tile::save() const
 {
     SAVE_CREATE();
     SAVE(QString, name);
     SAVE(QPixmap, sprite);
-    SAVE_ARRAY(bool, from, Pokemod::D_End);
+    SAVE_ARRAY(bool, from, D_End);
     SAVE(Script, script);
     return xml;
 }
 
-void Tile::setName(const QString& name)
+void Pokemod::Tile::setName(const QString& name)
 {
     CHECK(name);
 }
 
-void Tile::setSprite(const QPixmap& sprite)
+void Pokemod::Tile::setSprite(const QPixmap& sprite)
 {
     if (sprite.size() != QSize(64, 64))
     {
@@ -94,9 +94,9 @@ void Tile::setSprite(const QPixmap& sprite)
     emit(changed());
 }
 
-void Tile::setFrom(const int direction, const bool state)
+void Pokemod::Tile::setFrom(const int direction, const bool state)
 {
-    if (Pokemod::D_End <= direction)
+    if (D_End <= direction)
     {
         emit(error(bounds("direction")));
         return;
@@ -104,24 +104,24 @@ void Tile::setFrom(const int direction, const bool state)
     CHECK_ARRAY(from[direction], state);
 }
 
-void Tile::setScript(const Script& script)
+void Pokemod::Tile::setScript(const Script& script)
 {
     CHECK(script);
 }
 
-QString Tile::name() const
+QString Pokemod::Tile::name() const
 {
     return m_name;
 }
 
-QPixmap Tile::sprite() const
+QPixmap Pokemod::Tile::sprite() const
 {
     return m_sprite;
 }
 
-bool Tile::from(const int direction) const
+bool Pokemod::Tile::from(const int direction) const
 {
-    if (Pokemod::D_End <= direction)
+    if (D_End <= direction)
     {
         emit(warning(bounds("direction")));
         return false;
@@ -129,17 +129,17 @@ bool Tile::from(const int direction) const
     return m_from[direction];
 }
 
-Script Tile::script() const
+Pokemod::Script Pokemod::Tile::script() const
 {
     return m_script;
 }
 
-Tile& Tile::operator=(const Tile& rhs)
+Pokemod::Tile& Pokemod::Tile::operator=(const Tile& rhs)
 {
     if (this == &rhs)
         return *this;
     COPY(name);
-    COPY_ARRAY(from, Pokemod::D_End);
+    COPY_ARRAY(from, D_End);
     COPY(script);
     return *this;
 }