Fixed namespacing in sigmodr tree

1 files changed, 12 insertions, 9 deletions

diff --git a/sigmodr/tree/MapTrainerModel.cpp b/sigmodr/tree/MapTrainerModel.cpp
index 3baac436..3154cfe5 100644
--- a/sigmodr/tree/MapTrainerModel.cpp
+++ b/sigmodr/tree/MapTrainerModel.cpp
@@ -33,18 +33,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::MapTrainerModel::MapTrainerModel(BaseModel* parent, Sigmod::MapTrainer* trainer) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+MapTrainerModel::MapTrainerModel(BaseModel* parent, Sigmod::MapTrainer* trainer) :
         GroupObjectModel(parent, trainer)
 {
     setupData();
 }
 
-Sigmodr::Tree::MapTrainerModel::~MapTrainerModel()
+MapTrainerModel::~MapTrainerModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::MapTrainerModel::data(int role) const
+QVariant MapTrainerModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::MapTrainer*>(m_object)->name();
@@ -70,7 +73,7 @@ QVariant Sigmodr::Tree::MapTrainerModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::MapTrainerModel::setData(const QVariant& value, int role)
+bool MapTrainerModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -98,12 +101,12 @@ bool Sigmodr::Tree::MapTrainerModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::MapTrainerModel::types() const
+QString MapTrainerModel::types() const
 {
     return type().append(QString(";MapTrainerTeamMember"));
 }
 
-void Sigmodr::Tree::MapTrainerModel::addObject(Sigmod::Object* object)
+void MapTrainerModel::addObject(Sigmod::Object* object)
 {
     if (!object)
         object = qobject_cast<Sigmod::MapTrainer*>(m_object)->newTeamMember();
@@ -111,7 +114,7 @@ void Sigmodr::Tree::MapTrainerModel::addObject(Sigmod::Object* object)
         addChild(new MapTrainerTeamMemberModel(this, qobject_cast<Sigmod::MapTrainerTeamMember*>(object)));
 }
 
-void Sigmodr::Tree::MapTrainerModel::deleteObject(BaseModel* model)
+void MapTrainerModel::deleteObject(BaseModel* model)
 {
     const int index = find(model);
     if (0 <= index)
@@ -123,12 +126,12 @@ void Sigmodr::Tree::MapTrainerModel::deleteObject(BaseModel* model)
     }
 }
 
-void Sigmodr::Tree::MapTrainerModel::deleteSelf()
+void MapTrainerModel::deleteSelf()
 {
     qobject_cast<GroupModel*>(m_parent)->deleteObject(this);
 }
 
-void Sigmodr::Tree::MapTrainerModel::setupData()
+void MapTrainerModel::setupData()
 {
     Sigmod::MapTrainer* trainer = qobject_cast<Sigmod::MapTrainer*>(m_object);
     for (int i = 0; i < trainer->teamMemberCount(); ++i)