Don't collide with ItemType from Sigmod

2 files changed, 6 insertions, 6 deletions

diff --git a/sigmodr/tree/TreeItem.cpp b/sigmodr/tree/TreeItem.cpp
index f8e39f54..e608b700 100644
--- a/sigmodr/tree/TreeItem.cpp
+++ b/sigmodr/tree/TreeItem.cpp
@@ -24,7 +24,7 @@
 using namespace Sigmod;
 using namespace Sigmodr::Tree;
 
-TreeItem::TreeItem(const ItemType type, Object* object, TreeItem* parent) :
+TreeItem::TreeItem(const TreeItemType type, Object* object, TreeItem* parent) :
         m_type(type),
         m_object(object),
         m_parent(parent)
@@ -37,7 +37,7 @@ TreeItem::~TreeItem()
         delete item;
 }
 
-TreeItem* TreeItem::newTreeItem(ItemType type, Sigmod::Object* object, TreeItem* parent)
+TreeItem* TreeItem::newTreeItem(const TreeItemType type, Sigmod::Object* object, TreeItem* parent)
 {
     return new TreeItem(type, object, parent);
 }
diff --git a/sigmodr/tree/TreeItem.h b/sigmodr/tree/TreeItem.h
index 6ea27f63..59d5dbd0 100644
--- a/sigmodr/tree/TreeItem.h
+++ b/sigmodr/tree/TreeItem.h
@@ -67,7 +67,7 @@ class SIGMODRTREE_NO_EXPORT TreeItem
         QDomElement copyData() const;
         bool dropData(const QDomElement& element);
     protected:
-        enum ItemType
+        enum TreeItemType
         {
             GroupGame = 0,
             GroupAbility = 1,
@@ -131,12 +131,12 @@ class SIGMODRTREE_NO_EXPORT TreeItem
             EntryWeather = 131
         };
         
-        TreeItem(const ItemType type, Sigmod::Object* object, TreeItem* parent);
+        TreeItem(const TreeItemType type, Sigmod::Object* object, TreeItem* parent);
         virtual ~TreeItem();
         
-        TreeItem* newTreeItem(const ItemType type, Sigmod::Object* object, TreeItem* parent);
+        TreeItem* newTreeItem(const TreeItemType type, Sigmod::Object* object, TreeItem* parent);
         
-        const ItemType m_type;
+        const TreeItemType m_type;
         Sigmod::Object* m_object;
         TreeItem* m_parent;
         QList<TreeItem*> m_children;