From 60a2ed8ee8aa994c83d382af2ec477e171beb950 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 9 Jun 2008 00:50:59 +0000 Subject: [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 --- pokemodr/models/NatureModel.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pokemodr/models/NatureModel.cpp') diff --git a/pokemodr/models/NatureModel.cpp b/pokemodr/models/NatureModel.cpp index 1fe0227b..79098e4b 100644 --- a/pokemodr/models/NatureModel.cpp +++ b/pokemodr/models/NatureModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../NatureUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include -NatureModel::NatureModel(BaseModel* parent, Nature* nature) : +Pokemodr::NatureModel::NatureModel(BaseModel* parent, Pokemod::Nature* nature) : ObjectModel(parent, nature) { } -NatureModel::~NatureModel() +Pokemodr::NatureModel::~NatureModel() { } -QVariant NatureModel::data(int role) const +QVariant Pokemodr::NatureModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast(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 NatureUI(static_cast(m_object), NULL); + QWidget* widget = new NatureUI(static_cast(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 Nature", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool NatureModel::setData(const QVariant& value, int role) +bool Pokemodr::NatureModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert()) { @@ -89,7 +89,7 @@ bool NatureModel::setData(const QVariant& value, int role) return false; } -void NatureModel::deleteSelf() +void Pokemodr::NatureModel::deleteSelf() { // static_cast(m_parent)->deleteObject(this); } -- cgit