[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, 18 insertions, 18 deletions

diff --git a/pokemodr/models/PokemodModel.cpp b/pokemodr/models/PokemodModel.cpp
index dab58947..1e035db9 100644
--- a/pokemodr/models/PokemodModel.cpp
+++ b/pokemodr/models/PokemodModel.cpp
@@ -42,7 +42,7 @@
 #include "TypeGroupModel.h"
 #include "WeatherGroupModel.h"
 
-// PokeModr includes
+// Pokemodr includes
 #include "../PokemodUI.h"
 
 // Pokemod includes
@@ -54,43 +54,43 @@
 // KDE includes
 #include <KMenu>
 
-PokemodModel::PokemodModel(BaseModel* parent, Pokemod* pokemod) :
+Pokemodr::PokemodModel::PokemodModel(BaseModel* parent, Pokemod::Pokemod* pokemod) :
         GroupObjectModel(parent, pokemod)
 {
     setupData();
 }
 
-PokemodModel::~PokemodModel()
+Pokemodr::PokemodModel::~PokemodModel()
 {
     clearData();
 }
 
-QVariant PokemodModel::data(int role) const
+QVariant Pokemodr::PokemodModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
-        return static_cast<Pokemod*>(m_object)->title();
-    else if (role == BaseModel::XmlRole)
+        return static_cast<Pokemod::Pokemod*>(m_object)->title();
+    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 PokemodUI(static_cast<Pokemod*>(m_object), NULL);
+        QWidget* widget = new PokemodUI(static_cast<Pokemod::Pokemod*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
-    else if (role == BaseModel::ContextMenuRole)
+    else if (role == Pokemodr::BaseModel::ContextMenuRole)
     {
         KMenu* menu = new KMenu;
         return QVariant::fromValue(static_cast<void*>(menu));
     }
-    return GroupObjectModel::data(role);
+    return Pokemodr::GroupObjectModel::data(role);
 }
 
-bool PokemodModel::setData(const QVariant& value, int role)
+bool Pokemodr::PokemodModel::setData(const QVariant& value, int role)
 {
-    if (role == BaseModel::XmlRole)
+    if (role == Pokemodr::BaseModel::XmlRole)
     {
         if (value.canConvert<QString>())
         {
@@ -107,7 +107,7 @@ bool PokemodModel::setData(const QVariant& value, int role)
                 }
                 else if (xml.doctype().name() == "Rules")
                 {
-                    static_cast<Pokemod*>(m_object)->setRules(xml.documentElement());
+                    static_cast<Pokemod::Pokemod*>(m_object)->setRules(xml.documentElement());
                     return true;
                 }
                 file.close();
@@ -117,21 +117,21 @@ bool PokemodModel::setData(const QVariant& value, int role)
     return false;
 }
 
-void PokemodModel::addObject(Object* /*object*/)
+void Pokemodr::PokemodModel::addObject(Pokemod::Object* /*object*/)
 {
 }
 
-void PokemodModel::deleteObject(BaseModel* /*model*/)
+void Pokemodr::PokemodModel::deleteObject(BaseModel* /*model*/)
 {
 }
 
-void PokemodModel::deleteSelf()
+void Pokemodr::PokemodModel::deleteSelf()
 {
 }
 
-void PokemodModel::setupData()
+void Pokemodr::PokemodModel::setupData()
 {
-    Pokemod* pokemod = static_cast<Pokemod*>(m_object);
+    Pokemod::Pokemod* pokemod = static_cast<Pokemod::Pokemod*>(m_object);
     m_objects.append(new RulesModel(this, pokemod->rules()));
     m_objects.append(new AbilityGroupModel(this, pokemod));
     m_objects.append(new AuthorGroupModel(this, pokemod));