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