[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

1 files changed, 14 insertions, 13 deletions

diff --git a/pokemodr/models/MapTrainerTeamMemberModel.cpp b/pokemodr/models/MapTrainerTeamMemberModel.cpp
index fa6844d9..92e7910c 100644
--- a/pokemodr/models/MapTrainerTeamMemberModel.cpp
+++ b/pokemodr/models/MapTrainerTeamMemberModel.cpp
@@ -21,12 +21,13 @@
 // Model includes
 #include "GroupObjectModel.h"
 
-// PokeModr includes
+// Pokemodr includes
 #include "../MapTrainerTeamMemberUI.h"
 
 // Pokemod includes
 #include "../../pokemod/MapTrainer.h"
 #include "../../pokemod/MapTrainerTeamMember.h"
+#include "../../pokemod/Pokemod.h"
 #include "../../pokemod/Species.h"
 
 // Qt includes
@@ -35,47 +36,47 @@
 // KDE includes
 #include <KMenu>
 
-MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, MapTrainerTeamMember* teamMember) :
+Pokemodr::MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, Pokemod::MapTrainerTeamMember* teamMember) :
         ObjectModel(parent, teamMember)
 {
 }
 
-MapTrainerTeamMemberModel::~MapTrainerTeamMemberModel()
+Pokemodr::MapTrainerTeamMemberModel::~MapTrainerTeamMemberModel()
 {
 }
 
-QVariant MapTrainerTeamMemberModel::data(int role) const
+QVariant Pokemodr::MapTrainerTeamMemberModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
     {
-        const Species* species = static_cast<const Pokemod*>(m_object->pokemod())->speciesById(static_cast<MapTrainerTeamMember*>(m_object)->species());
+        const Pokemod::Species* species = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->speciesById(static_cast<Pokemod::MapTrainerTeamMember*>(m_object)->species());
         if (species)
             return species->name();
         return "";
     }
-    else if (role == BaseModel::XmlRole)
+    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 MapTrainerTeamMemberUI(static_cast<MapTrainerTeamMember*>(m_object), NULL);
+        QWidget* widget = new MapTrainerTeamMemberUI(static_cast<Pokemod::MapTrainerTeamMember*>(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 Team Member", this, SLOT(deleteSelf()));
         return QVariant::fromValue(static_cast<void*>(menu));
     }
-    return ObjectModel::data(role);
+    return Pokemodr::ObjectModel::data(role);
 }
 
-bool MapTrainerTeamMemberModel::setData(const QVariant& value, int role)
+bool Pokemodr::MapTrainerTeamMemberModel::setData(const QVariant& value, int role)
 {
-    if (role == BaseModel::XmlRole)
+    if (role == Pokemodr::BaseModel::XmlRole)
     {
         if (value.canConvert<QString>())
         {
@@ -95,7 +96,7 @@ bool MapTrainerTeamMemberModel::setData(const QVariant& value, int role)
     return false;
 }
 
-void MapTrainerTeamMemberModel::deleteSelf()
+void Pokemodr::MapTrainerTeamMemberModel::deleteSelf()
 {
 //     static_cast<GroupObjectModel*>(m_parent)->deleteObject(this);
 }