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/MapTrainerModel.cpp | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'pokemodr/models/MapTrainerModel.cpp') diff --git a/pokemodr/models/MapTrainerModel.cpp b/pokemodr/models/MapTrainerModel.cpp index 2a7154ea..45281b6e 100644 --- a/pokemodr/models/MapTrainerModel.cpp +++ b/pokemodr/models/MapTrainerModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "MapTrainerTeamMemberModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapTrainerUI.h" // Pokemod includes @@ -35,33 +35,33 @@ // KDE includes #include -MapTrainerModel::MapTrainerModel(BaseModel* parent, MapTrainer* trainer) : +Pokemodr::MapTrainerModel::MapTrainerModel(BaseModel* parent, Pokemod::MapTrainer* trainer) : GroupObjectModel(parent, trainer) { setupData(); } -MapTrainerModel::~MapTrainerModel() +Pokemodr::MapTrainerModel::~MapTrainerModel() { clearData(); } -QVariant MapTrainerModel::data(int role) const +QVariant Pokemodr::MapTrainerModel::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 MapTrainerUI(static_cast(m_object), NULL); + QWidget* widget = new MapTrainerUI(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("Add Team Member", this, SLOT(addObject())); @@ -69,36 +69,36 @@ QVariant MapTrainerModel::data(int role) const menu->addAction("Delete Trainer", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -void MapTrainerModel::addObject(Object* object) +void Pokemodr::MapTrainerModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast(m_object)->newTeamMember(); + object = static_cast(m_object)->newTeamMember(); if (object->className() == "MapTrainerTeamMember") - m_objects.append(new MapTrainerTeamMemberModel(this, static_cast(object))); + m_objects.append(new MapTrainerTeamMemberModel(this, static_cast(object))); } -void MapTrainerModel::deleteObject(BaseModel* model) +void Pokemodr::MapTrainerModel::deleteObject(BaseModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast(m_object)->deleteTeamMember(index); + static_cast(m_object)->deleteTeamMember(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } } -void MapTrainerModel::deleteSelf() +void Pokemodr::MapTrainerModel::deleteSelf() { // static_cast(m_parent)->deleteObject(this); } -bool MapTrainerModel::setData(const QVariant& value, int role) +bool Pokemodr::MapTrainerModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert()) { @@ -115,7 +115,7 @@ bool MapTrainerModel::setData(const QVariant& value, int role) } else if (xml.doctype().name() == "MapTrainerTeamMember") { - addObject(static_cast(m_object)->newTeamMember(xml.documentElement())); + addObject(static_cast(m_object)->newTeamMember(xml.documentElement())); return true; } file.close(); @@ -125,9 +125,9 @@ bool MapTrainerModel::setData(const QVariant& value, int role) return false; } -void MapTrainerModel::setupData() +void Pokemodr::MapTrainerModel::setupData() { - MapTrainer* trainer = static_cast(m_object); + Pokemod::MapTrainer* trainer = static_cast(m_object); for (int i = 0; i < trainer->teamMemberCount(); ++i) m_objects.append(new MapTrainerTeamMemberModel(this, trainer->teamMember(i))); } -- cgit