From 83a276a16a2b380384ea25fab7ef06393699d051 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 26 Jul 2002 18:46:18 +0000 Subject: [PATCH] Added missing osg:: from various references to osg::Objectf --- src/osgPlugins/iv/atrfloat.h | 2 +- src/osgPlugins/iv/atrstring.h | 2 +- src/osgPlugins/iv/atrvec.h | 2 +- src/osgPlugins/iv/attribute.h | 4 ++-- src/osgPlugins/iv/mynode.h | 4 ++-- src/osgPlugins/iv/mynodevisitor.h | 4 ++-- src/osgPlugins/iv/osgvisitor.h | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/osgPlugins/iv/atrfloat.h b/src/osgPlugins/iv/atrfloat.h index e767d5933..90a726ef0 100644 --- a/src/osgPlugins/iv/atrfloat.h +++ b/src/osgPlugins/iv/atrfloat.h @@ -29,7 +29,7 @@ public: virtual char *type() { return "AtrFloat"; } float getValue() { return value; } /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const { return new AtrFloat(name,value); } + virtual osg::Object* cloneType() const { return new AtrFloat(name,value); } }; #endif diff --git a/src/osgPlugins/iv/atrstring.h b/src/osgPlugins/iv/atrstring.h index ca4c2d4af..b6037edb5 100644 --- a/src/osgPlugins/iv/atrstring.h +++ b/src/osgPlugins/iv/atrstring.h @@ -30,7 +30,7 @@ public: virtual char *type() { return "AtrString"; } char *getValue() { return value; } /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const { return new AtrString(name,value); } + virtual osg::Object* cloneType() const { return new AtrString(name,value); } }; #endif diff --git a/src/osgPlugins/iv/atrvec.h b/src/osgPlugins/iv/atrvec.h index 40f7bc3fa..5f7823a04 100644 --- a/src/osgPlugins/iv/atrvec.h +++ b/src/osgPlugins/iv/atrvec.h @@ -49,7 +49,7 @@ public: virtual char *type() { return "AtrVec"; } /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const { return new AtrVec(name); } + virtual osg::Object* cloneType() const { return new AtrVec(name); } }; diff --git a/src/osgPlugins/iv/attribute.h b/src/osgPlugins/iv/attribute.h index 7c90bd523..3003233e0 100644 --- a/src/osgPlugins/iv/attribute.h +++ b/src/osgPlugins/iv/attribute.h @@ -31,9 +31,9 @@ public: // OSG Object API /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const =0; + virtual osg::Object* cloneType() const =0; /** return a clone of a node, with Object* return type.*/ - virtual Object* clone(const osg::CopyOp& copyop) const { return cloneType(); } + virtual osg::Object* clone(const osg::CopyOp& copyop) const { return cloneType(); } /** return the name of the node's library.*/ virtual const char* libraryName() const { return "osgdb_wrl"; } /** return the name of the node's class type.*/ diff --git a/src/osgPlugins/iv/mynode.h b/src/osgPlugins/iv/mynode.h index bd59442d8..4cc769d90 100644 --- a/src/osgPlugins/iv/mynode.h +++ b/src/osgPlugins/iv/mynode.h @@ -73,9 +73,9 @@ public: // OSG Object API /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const { return new MyNode(); } + virtual osg::Object* cloneType() const { return new MyNode(); } /** return a clone of a node, with Object* return type.*/ - virtual Object* clone(const osg::CopyOp& copyop) const { return new MyNode(this); } + virtual osg::Object* clone(const osg::CopyOp& copyop) const { return new MyNode(this); } /** return the name of the node's library.*/ virtual const char* libraryName() const { return "osgdb_wrl"; } /** return the name of the node's class type.*/ diff --git a/src/osgPlugins/iv/mynodevisitor.h b/src/osgPlugins/iv/mynodevisitor.h index eb1bb75ab..87c56b94f 100644 --- a/src/osgPlugins/iv/mynodevisitor.h +++ b/src/osgPlugins/iv/mynodevisitor.h @@ -45,9 +45,9 @@ public: virtual void applyTransform(Transform *trans)=0; /** clone the an object of the same type as the node.*/ - virtual Object* cloneType() const = 0; + virtual osg::Object* cloneType() const = 0; /** return a clone of a node, with Object* return type.*/ - virtual Object* clone(const osg::CopyOp& copyop) const { return cloneType(); } + virtual osg::Object* clone(const osg::CopyOp& copyop) const { return cloneType(); } /** return the name of the node's library.*/ virtual const char* libraryName() const { return "osgdb_wrl"; } /** return the name of the node's class type.*/ diff --git a/src/osgPlugins/iv/osgvisitor.h b/src/osgPlugins/iv/osgvisitor.h index 0e08fd56c..04d0037aa 100644 --- a/src/osgPlugins/iv/osgvisitor.h +++ b/src/osgPlugins/iv/osgvisitor.h @@ -46,7 +46,7 @@ public: virtual void applyTransform(Transform *trans); osg::Node* getRoot(); - virtual Object* cloneType() const { return new OSGVisitor(0); } + virtual osg::Object* cloneType() const { return new OSGVisitor(0); } };