From b90f2dc771801bcfadef322cea8ddc402283d4eb Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 25 Feb 2009 01:38:27 -0500 Subject: Fixed namespacing in sigmodr tree --- sigmodr/tree/MapModel.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'sigmodr/tree/MapModel.cpp') diff --git a/sigmodr/tree/MapModel.cpp b/sigmodr/tree/MapModel.cpp index e662400b..2a328007 100644 --- a/sigmodr/tree/MapModel.cpp +++ b/sigmodr/tree/MapModel.cpp @@ -33,18 +33,21 @@ // KDE includes #include -Sigmodr::Tree::MapModel::MapModel(BaseModel* parent, Sigmod::Map* map) : +using namespace Sigmodr::Widgets; +using namespace Sigmodr::Tree; + +MapModel::MapModel(BaseModel* parent, Sigmod::Map* map) : GroupObjectModel(parent, map) { setupData(); } -Sigmodr::Tree::MapModel::~MapModel() +MapModel::~MapModel() { clearData(); } -QVariant Sigmodr::Tree::MapModel::data(int role) const +QVariant MapModel::data(int role) const { if (role == Qt::DisplayRole) return qobject_cast(m_object)->name(); @@ -68,7 +71,7 @@ QVariant Sigmodr::Tree::MapModel::data(int role) const return GroupObjectModel::data(role); } -bool Sigmodr::Tree::MapModel::setData(const QVariant& value, int role) +bool MapModel::setData(const QVariant& value, int role) { if (role == BaseModel::XmlRole) { @@ -97,27 +100,27 @@ bool Sigmodr::Tree::MapModel::setData(const QVariant& value, int role) return false; } -QString Sigmodr::Tree::MapModel::types() const +QString MapModel::types() const { return type().append(QString(";MapEffect;MapTrainer;MapWarp;MapWildList")); } -void Sigmodr::Tree::MapModel::addObject(Sigmod::Object* object) +void MapModel::addObject(Sigmod::Object* object) { Q_UNUSED(object) } -void Sigmodr::Tree::MapModel::deleteObject(BaseModel* model) +void MapModel::deleteObject(BaseModel* model) { Q_UNUSED(model) } -void Sigmodr::Tree::MapModel::deleteSelf() +void MapModel::deleteSelf() { qobject_cast(m_parent)->deleteObject(this); } -void Sigmodr::Tree::MapModel::setupData() +void MapModel::setupData() { Sigmod::Map* map = qobject_cast(m_object); addChild(new MapEffectGroupModel(this, map)); -- cgit