Fixed namespacing in sigmodr tree

1 files changed, 13 insertions, 10 deletions

diff --git a/sigmodr/tree/GameModel.cpp b/sigmodr/tree/GameModel.cpp
index 5d9b75ac..196ab87b 100644
--- a/sigmodr/tree/GameModel.cpp
+++ b/sigmodr/tree/GameModel.cpp
@@ -52,18 +52,21 @@
 // KDE includes
 #include <KMenu>
 
-Sigmodr::Tree::GameModel::GameModel(BaseModel* parent, Sigmod::Game* game) :
+using namespace Sigmodr::Widgets;
+using namespace Sigmodr::Tree;
+
+GameModel::GameModel(BaseModel* parent, Sigmod::Game* game) :
         GroupObjectModel(parent, game)
 {
     setupData();
 }
 
-Sigmodr::Tree::GameModel::~GameModel()
+GameModel::~GameModel()
 {
     clearData();
 }
 
-QVariant Sigmodr::Tree::GameModel::data(int role) const
+QVariant GameModel::data(int role) const
 {
     if (role == Qt::DisplayRole)
         return qobject_cast<Sigmod::Game*>(m_object)->title();
@@ -75,7 +78,7 @@ QVariant Sigmodr::Tree::GameModel::data(int role) const
     }
     else if (role == BaseModel::WidgetRole)
     {
-        QWidget* widget = new SigmodUI(qobject_cast<Sigmod::Game*>(m_object), NULL);
+        QWidget* widget = new GameUI(qobject_cast<Sigmod::Game*>(m_object), NULL);
         return QVariant::fromValue(widget);
     }
     else if (role == BaseModel::ContextMenuRole)
@@ -86,7 +89,7 @@ QVariant Sigmodr::Tree::GameModel::data(int role) const
     return GroupObjectModel::data(role);
 }
 
-bool Sigmodr::Tree::GameModel::setData(const QVariant& value, int role)
+bool GameModel::setData(const QVariant& value, int role)
 {
     if (role == BaseModel::XmlRole)
     {
@@ -115,26 +118,26 @@ bool Sigmodr::Tree::GameModel::setData(const QVariant& value, int role)
     return false;
 }
 
-QString Sigmodr::Tree::GameModel::types() const
+QString GameModel::types() const
 {
     return type().append(QString(";Rules;Ability;Author;Badge;CoinList;EggGroup;GlobalScript;Item;ItemType;Map;Move;Nature;Skin;Sound;Species;Sprite;Status;Store;Tile;Time;Trainer;Type;Weather"));
 }
 
-void Sigmodr::Tree::GameModel::addObject(Sigmod::Object* object)
+void GameModel::addObject(Sigmod::Object* object)
 {
     Q_UNUSED(object)
 }
 
-void Sigmodr::Tree::GameModel::deleteObject(BaseModel* model)
+void GameModel::deleteObject(BaseModel* model)
 {
     Q_UNUSED(model)
 }
 
-void Sigmodr::Tree::GameModel::deleteSelf()
+void GameModel::deleteSelf()
 {
 }
 
-void Sigmodr::Tree::GameModel::setupData()
+void GameModel::setupData()
 {
     Sigmod::Game* game = qobject_cast<Sigmod::Game*>(m_object);
     addChild(new RulesModel(this, game->rules()));