Moved all references to osg::Cloner to osg::CopyOp.

src/osg/Billboard.cpp

@@ -14,8 +14,8 @@ Billboard::Billboard()
     setCachedMode();
 }
 
-Billboard::Billboard(const Billboard& billboard,const Cloner& cloner):
-        Geode(billboard,cloner),
+Billboard::Billboard(const Billboard& billboard,const CopyOp& copyop):
+        Geode(billboard,copyop),
         _mode(billboard._mode),
         _axis(billboard._axis),
         _positionList(billboard._positionList),

src/osg/GeoSet.cpp

@@ -50,8 +50,8 @@ GeoSet::GeoSet()
 }
 
 
-GeoSet::GeoSet(const GeoSet& geoset,const Cloner& cloner):
-    Drawable(geoset,cloner)
+GeoSet::GeoSet(const GeoSet& geoset,const CopyOp& copyop):
+    Drawable(geoset,copyop)
 {
     // ensure that the num of vertices etc have been set up before we copy.
     geoset.computeNumVerts();

src/osg/Geode.cpp

@@ -10,14 +10,14 @@ Geode::Geode()
 {
 }
 
-Geode::Geode(const Geode& geode,const Cloner& cloner):
-    Node(geode,cloner)
+Geode::Geode(const Geode& geode,const CopyOp& copyop):
+    Node(geode,copyop)
 {
     for(DrawableList::const_iterator itr=geode._drawables.begin();
         itr!=geode._drawables.end();
         ++itr)
     {
-        Drawable* drawable = cloner(itr->get());
+        Drawable* drawable = copyop(itr->get());
         if (drawable) addDrawable(drawable);
     }
 }

src/osg/Group.cpp

@@ -13,14 +13,14 @@ Group::Group()
 {
 }
 
-Group::Group(const Group& group,const Cloner& cloner):
-    Node(group,cloner)
+Group::Group(const Group& group,const CopyOp& copyop):
+    Node(group,copyop)
 {
     for(ChildList::const_iterator itr=group._children.begin();
         itr!=group._children.end();
         ++itr)
     {
-        Node* child = cloner(itr->get());
+        Node* child = copyop(itr->get());
         if (child) addChild(child);
     }
 }

src/osg/Image.cpp

@@ -26,8 +26,8 @@ Image::Image()
     _modifiedTag = 0;
 }
 
-Image::Image(const Image& image,const Cloner& cloner):
-    Object(image,cloner),
+Image::Image(const Image& image,const CopyOp& copyop):
+    Object(image,copyop),
     _fileName(image._fileName),
     _s(image._s), _t(image._t), _r(image._r),
     _internalFormat(image._internalFormat),

src/osg/LOD.cpp

@@ -4,8 +4,8 @@
 
 using namespace osg;
 
-LOD::LOD(const LOD& lod,const Cloner& cloner):
-        Group(lod,cloner),
+LOD::LOD(const LOD& lod,const CopyOp& copyop):
+        Group(lod,copyop),
         _rangeList(lod._rangeList),
         _rangeList2(lod._rangeList2),
         _center(lod._center)

src/osg/Node.cpp

@@ -20,8 +20,8 @@ Node::Node()
 
 }
 
-Node::Node(const Node& node,const Cloner& cloner):
-        Object(node,cloner),
+Node::Node(const Node& node,const CopyOp& copyop):
+        Object(node,copyop),
         _bsphere(_bsphere),
         _bsphere_computed(node._bsphere_computed),
         _name(node._name),
@@ -30,10 +30,10 @@ Node::Node(const Node& node,const Cloner& cloner):
         _numChildrenRequiringAppTraversal(0), // assume no children yet.
         _cullingActive(node._cullingActive),
         _numChildrenWithCullingDisabled(0), // assume no children yet.
-        _userData(cloner(node._userData.get())),
+        _userData(copyop(node._userData.get())),
         _nodeMask(node._nodeMask), 
         _descriptions(node._descriptions),
-        _dstate(cloner(node._dstate.get()))
+        _dstate(copyop(node._dstate.get()))
 {
 }
 

src/osg/Object.cpp

@@ -2,5 +2,5 @@
 
 using namespace osg;
 
-Object::Object(const Object&,const Cloner&): 
+Object::Object(const Object&,const CopyOp&): 
     Referenced() {}

src/osg/StateSet.cpp

@@ -21,7 +21,7 @@ StateSet::StateSet()
     setRendingBinToInherit();
 }
 
-StateSet::StateSet(const StateSet& rhs,const Cloner& cloner):Object(rhs,cloner)
+StateSet::StateSet(const StateSet& rhs,const CopyOp& copyop):Object(rhs,copyop)
 {
     _modeList = rhs._modeList;
 
@@ -31,7 +31,7 @@ StateSet::StateSet(const StateSet& rhs,const Cloner& cloner):Object(rhs,cloner)
     {
         StateAttribute::Type type = itr->first;
         const RefAttributePair& rap = itr->second;
-        StateAttribute* attr = cloner(rap.first.get());
+        StateAttribute* attr = copyop(rap.first.get());
         if (attr) _attributeList[type]=RefAttributePair(attr,rap.second);
     }
     

src/osg/Switch.cpp

@@ -13,8 +13,8 @@ Switch::Switch()
     _value = ALL_CHILDREN_OFF;
 }
 
-Switch::Switch(const Switch& sw,const Cloner& cloner):
-    Group(sw,cloner),
+Switch::Switch(const Switch& sw,const CopyOp& copyop):
+    Group(sw,copyop),
     _value(sw._value)
 {
 }

src/osg/Transform.cpp

@@ -16,8 +16,8 @@ Transform::Transform()
     _worldToLocalDirty = false;
 }
 
-Transform::Transform(const Transform& transform,const Cloner& cloner):
-    Group(transform,cloner),
+Transform::Transform(const Transform& transform,const CopyOp& copyop):
+    Group(transform,copyop),
     _type(transform._type),
     _mode(transform._mode),
     _localToWorldDirty(transform._localToWorldDirty),

src/osgText/Paragraph.cpp

@@ -8,11 +8,11 @@ Paragraph::Paragraph()
     _maxCharsPerLine = 80;
 }
 
-Paragraph::Paragraph(const Paragraph& paragraph,const osg::Cloner& cloner):
-    Geode(paragraph,cloner),
+Paragraph::Paragraph(const Paragraph& paragraph,const osg::CopyOp& copyop):
+    Geode(paragraph,copyop),
     _position(paragraph._position),
     _text(paragraph._text),
-    _font(dynamic_cast<Font*>(cloner(paragraph._font.get()))),
+    _font(dynamic_cast<Font*>(copyop(paragraph._font.get()))),
     _alignment(paragraph._alignment),
     _maxCharsPerLine(paragraph._maxCharsPerLine)
 {

src/osgText/Text.cpp

@@ -35,9 +35,9 @@ Text::Text()
     setDefaults();
 }
 
-Text::Text(const Text& text,const osg::Cloner& cloner):
-        Drawable(text,cloner),
-        _font(dynamic_cast<Font*>(cloner(text._font.get()))),
+Text::Text(const Text& text,const osg::CopyOp& copyop):
+        Drawable(text,copyop),
+        _font(dynamic_cast<Font*>(copyop(text._font.get()))),
         _init(text._init),
         _initAlignment(text._initAlignment),
         _text(text._text),