fixed compilation on gcc 4.

appleseedhq · Jun 29, 2011 · 23b32ab · 23b32ab
1 parent 9918f39
commit 23b32ab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/appleseed.studio/mainwindow/project/collectionitem.h b/src/appleseed.studio/mainwindow/project/collectionitem.h
@@ -85,6 +85,9 @@ class CollectionItem
     virtual void slot_create_accepted(foundation::Dictionary values);
 
     void create(const foundation::Dictionary& values);
+
+  private:
+    friend class EntityCreatorBase;
 };
 
 

diff --git a/src/appleseed.studio/mainwindow/project/entityitem.h b/src/appleseed.studio/mainwindow/project/entityitem.h
@@ -68,6 +68,9 @@ class EntityItem
     virtual void slot_delete();
 
     void edit(const foundation::Dictionary& values);
+
+  private:
+    friend class EntityCreatorBase;
 };
 
 
@@ -98,7 +101,7 @@ void EntityItem<Entity, ParentEntity>::slot_edit_accepted(foundation::Dictionary
 template <typename Entity, typename ParentEntity>
 void EntityItem<Entity, ParentEntity>::slot_delete()
 {
-    if (allows_deletion())
+    if (EntityItemBaseType::allows_deletion())
     {
         m_project_builder.remove_entity(EntityItemBaseType::m_entity, m_parent);
 

diff --git a/src/appleseed.studio/mainwindow/project/multimodelentityitem.h b/src/appleseed.studio/mainwindow/project/multimodelentityitem.h
@@ -89,7 +89,7 @@ MultiModelEntityItem<Entity, ParentEntity>::MultiModelEntityItem(
 template <typename Entity, typename ParentEntity>
 void MultiModelEntityItem<Entity, ParentEntity>::slot_edit()
 {
-    if (!allows_editing())
+    if (!EntityItemType::allows_editing())
         return;
 
     const std::string window_title =

diff --git a/src/appleseed.studio/mainwindow/project/singlemodelentityitem.h b/src/appleseed.studio/mainwindow/project/singlemodelentityitem.h
@@ -86,7 +86,7 @@ SingleModelEntityItem<Entity, ParentEntity>::SingleModelEntityItem(
 template <typename Entity, typename ParentEntity>
 void SingleModelEntityItem<Entity, ParentEntity>::slot_edit()
 {
-    if (!allows_editing())
+    if (!EntityItemType::allows_editing())
         return;
 
     const std::string window_title =