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/SpriteModel.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pokemodr/models/SpriteModel.cpp') diff --git a/pokemodr/models/SpriteModel.cpp b/pokemodr/models/SpriteModel.cpp index 1a2a66f4..492c4718 100644 --- a/pokemodr/models/SpriteModel.cpp +++ b/pokemodr/models/SpriteModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpriteUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include -SpriteModel::SpriteModel(BaseModel* parent, Sprite* sprite) : +Pokemodr::SpriteModel::SpriteModel(BaseModel* parent, Pokemod::Sprite* sprite) : ObjectModel(parent, sprite) { } -SpriteModel::~SpriteModel() +Pokemodr::SpriteModel::~SpriteModel() { } -QVariant SpriteModel::data(int role) const +QVariant Pokemodr::SpriteModel::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 SpriteUI(static_cast(m_object), NULL); + QWidget* widget = new SpriteUI(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 Sprite", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SpriteModel::setData(const QVariant& value, int role) +bool Pokemodr::SpriteModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert()) { @@ -88,7 +88,7 @@ bool SpriteModel::setData(const QVariant& value, int role) return false; } -void SpriteModel::deleteSelf() +void Pokemodr::SpriteModel::deleteSelf() { // static_cast(m_parent)->deleteObject(this); } -- cgit