From 6ff781b5b08b6f4dc2ec72cfc8df06875b97ca47 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 15 Dec 2005 15:50:17 +0000 Subject: [PATCH] Removed Switch::removedChild(Node*) as the Group::removeChild(Node*) implementation should be sufficient, as it calls the virtual removeChild(uint,uint). --- include/osg/Switch | 2 -- src/osg/Switch.cpp | 11 ----------- src/osgWrappers/osg/Switch.cpp | 1 - 3 files changed, 14 deletions(-) diff --git a/include/osg/Switch b/include/osg/Switch index 017663c04..4ca9e7052 100644 --- a/include/osg/Switch +++ b/include/osg/Switch @@ -49,8 +49,6 @@ class OSG_EXPORT Switch : public Group virtual bool insertChild( unsigned int index, Node *child, bool value ); - virtual bool removeChild( Node *child ); - virtual bool removeChild(unsigned int pos,unsigned int numChildrenToRemove=1); diff --git a/src/osg/Switch.cpp b/src/osg/Switch.cpp index b57bc2b19..c6be0de3c 100644 --- a/src/osg/Switch.cpp +++ b/src/osg/Switch.cpp @@ -99,17 +99,6 @@ bool Switch::insertChild( unsigned int index, Node *child, bool value ) return false; } -bool Switch::removeChild( Node *child ) -{ - // find the child's position. - unsigned int pos=getChildIndex(child); - if (pos>=_children.size()) return false; - - _values.erase(_values.begin()+pos); - - return Group::removeChild(child); -} - bool Switch::removeChild(unsigned int pos,unsigned int numChildrenToRemove) { if (pos>=_values.size() || numChildrenToRemove==0) return false; diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 4cfe09a78..fabd82a05 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -43,7 +43,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch) I_Method2(bool, addChild, IN, osg::Node *, child, IN, bool, value); I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); I_Method3(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child, IN, bool, value); - I_Method1(bool, removeChild, IN, osg::Node *, child); I_MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); I_Method2(void, setValue, IN, unsigned int, pos, IN, bool, value); I_Method1(bool, getValue, IN, unsigned int, pos);