Fixed namespacing in sigmodr tree

1 files changed, 17 insertions, 15 deletions

diff --git a/sigmodr/tree/BaseModel.cpp b/sigmodr/tree/BaseModel.cpp
index 32203dc9..92f530fe 100644
--- a/sigmodr/tree/BaseModel.cpp
+++ b/sigmodr/tree/BaseModel.cpp
@@ -31,24 +31,26 @@
 #include <QtCore/QFile>
 #include <QtXml/QDomDocument>
 
-const int Sigmodr::Tree::BaseModel::TypeRole = Qt::UserRole;
-const int Sigmodr::Tree::BaseModel::DropAcceptRole = Qt::UserRole + 1;
-const int Sigmodr::Tree::BaseModel::XmlRole = Qt::UserRole + 2;
-const int Sigmodr::Tree::BaseModel::WidgetRole = Qt::UserRole + 3;
-const int Sigmodr::Tree::BaseModel::ContextMenuRole = Qt::UserRole + 4;
+using namespace Sigmodr::Tree;
 
-Sigmodr::Tree::BaseModel::BaseModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
+const int BaseModel::TypeRole = Qt::UserRole;
+const int BaseModel::DropAcceptRole = Qt::UserRole + 1;
+const int BaseModel::XmlRole = Qt::UserRole + 2;
+const int BaseModel::WidgetRole = Qt::UserRole + 3;
+const int BaseModel::ContextMenuRole = Qt::UserRole + 4;
+
+BaseModel::BaseModel(BaseModel* parent, Sigmod::Object* object, const QString& name) :
         m_parent(parent),
         m_object(object),
         m_name(name)
 {
 }
 
-Sigmodr::Tree::BaseModel::~BaseModel()
+BaseModel::~BaseModel()
 {
 }
 
-QVariant Sigmodr::Tree::BaseModel::data(int role) const
+QVariant BaseModel::data(int role) const
 {
     if (role == TypeRole)
         return type();
@@ -57,29 +59,29 @@ QVariant Sigmodr::Tree::BaseModel::data(int role) const
     return QVariant();
 }
 
-Sigmodr::Tree::BaseModel* Sigmodr::Tree::BaseModel::parent()
+BaseModel* BaseModel::parent()
 {
     return m_parent;
 }
 
-int Sigmodr::Tree::BaseModel::indexNumber() const
+int BaseModel::indexNumber() const
 {
     if (m_parent)
         return m_parent->findChild(const_cast<BaseModel*>(this));
     return -1;
 }
 
-QString Sigmodr::Tree::BaseModel::type() const
+QString BaseModel::type() const
 {
     return "";
 }
 
-const Sigmod::Object* Sigmodr::Tree::BaseModel::object() const
+const Sigmod::Object* BaseModel::object() const
 {
     return m_object;
 }
 
-bool Sigmodr::Tree::BaseModel::loadFromData(const QString& data, QDomDocument* xml) const
+bool BaseModel::loadFromData(const QString& data, QDomDocument* xml) const
 {
     bool loaded = false;
     QString error;
@@ -125,14 +127,14 @@ bool Sigmodr::Tree::BaseModel::loadFromData(const QString& data, QDomDocument* x
     return loaded;
 }
 
-void Sigmodr::Tree::BaseModel::childRowChanged(const int row)
+void BaseModel::childRowChanged(const int row)
 {
     QList<int> indexes;
     indexes << indexNumber() << row;
     emit(rowsChanged(indexes));
 }
 
-void Sigmodr::Tree::BaseModel::childRowsChanged(const QList<int>& rows)
+void BaseModel::childRowsChanged(const QList<int>& rows)
 {
     QList<int> indexes;
     indexes << indexNumber() << rows;