1 files changed, 17 insertions, 17 deletions

diff --git a/pokemodr/models/MapModel.cpp b/pokemodr/models/MapModel.cpp
index 040f2871..67642346 100644
--- a/pokemodr/models/MapModel.cpp
+++ b/pokemodr/models/MapModel.cpp
@@ -24,7 +24,7 @@
 #include "MapWarpGroupModel.h"
 #include "MapWildListGroupModel.h"
 
-// PokeModr includes
+// Pokemodr includes
 #include "../MapUI.h"
 
 // Pokemod includes
@@ -36,43 +36,43 @@
 // KDE includes
 #include <KMenu>
 
-MapModel::MapModel(BaseModel* parent, Map* map) :
+Pokemodr::MapModel::MapModel(BaseModel* parent, Pokemod::Map* map) :
         GroupObjectModel(parent, map)
 {
     setupData();
 }
 
-MapModel::~MapModel()
+Pokemodr::MapModel::~MapModel()
 {
 }
 
-QVariant MapModel::data(int role) const
+QVariant Pokemodr::MapModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
-        return static_cast<Map*>(m_object)->name();
-    else if (role == BaseModel::XmlRole)
+        return static_cast<Pokemod::Map*>(m_object)->name();
+    else if (role == Pokemodr::BaseModel::XmlRole)
     {
         QDomDocument xml(m_object->className());
         xml.appendChild(m_object->save());
         return xml.toString();
     }
-    else if (role == BaseModel::WidgetRole)
+    else if (role == Pokemodr::BaseModel::WidgetRole)
     {
-        QWidget* widget = new MapUI(static_cast<Map*>(m_object), NULL);
+        QWidget* widget = new MapUI(static_cast<Pokemod::Map*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
-    else if (role == BaseModel::ContextMenuRole)
+    else if (role == Pokemodr::BaseModel::ContextMenuRole)
     {
         KMenu* menu = new KMenu;
         menu->addAction("Delete Map", this, SLOT(deleteSelf()));
         return QVariant::fromValue(static_cast<void*>(menu));
     }
-    return GroupObjectModel::data(role);
+    return Pokemodr::GroupObjectModel::data(role);
 }
 
-bool MapModel::setData(const QVariant& value, int role)
+bool Pokemodr::MapModel::setData(const QVariant& value, int role)
 {
-    if (role == BaseModel::XmlRole)
+    if (role == Pokemodr::BaseModel::XmlRole)
     {
         if (value.canConvert<QString>())
         {
@@ -94,22 +94,22 @@ bool MapModel::setData(const QVariant& value, int role)
     return false;
 }
 
-void MapModel::addObject(Object* /*object*/)
+void Pokemodr::MapModel::addObject(Pokemod::Object* /*object*/)
 {
 }
 
-void MapModel::deleteObject(BaseModel* /*model*/)
+void Pokemodr::MapModel::deleteObject(BaseModel* /*model*/)
 {
 }
 
-void MapModel::deleteSelf()
+void Pokemodr::MapModel::deleteSelf()
 {
 //     static_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void MapModel::setupData()
+void Pokemodr::MapModel::setupData()
 {
-    Map* map = static_cast<Map*>(m_object);
+    Pokemod::Map* map = static_cast<Pokemod::Map*>(m_object);
     m_objects.append(new MapEffectGroupModel(this, map));
     m_objects.append(new MapTrainerGroupModel(this, map));
     m_objects.append(new MapWarpGroupModel(this, map));