From 5aa1234fa491dc0f858b9383074db4c824d08f6f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 24 Jan 2013 18:48:34 +0000 Subject: [PATCH] Fixed usage of META_NodeVisitor so it doesn't include "" --- include/osg/CollectOccludersVisitor | 2 +- include/osg/ComputeBoundsVisitor | 2 +- include/osg/KdTree | 2 +- include/osg/NodeVisitor | 2 +- include/osgAnimation/BoneMapVisitor | 2 +- include/osgAnimation/LinkVisitor | 2 +- include/osgDB/SharedStateManager | 2 +- include/osgGA/EventVisitor | 2 +- include/osgSim/InsertImpostorsVisitor | 2 +- include/osgUtil/CullVisitor | 2 +- include/osgUtil/DisplayRequirementsVisitor | 2 +- include/osgUtil/DrawElementTypeSimplifier | 2 +- include/osgUtil/GLObjectsVisitor | 2 +- include/osgUtil/IntersectVisitor | 2 +- include/osgUtil/IntersectionVisitor | 2 +- include/osgUtil/Simplifier | 2 +- include/osgUtil/Statistics | 2 +- include/osgUtil/UpdateVisitor | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/osg/CollectOccludersVisitor b/include/osg/CollectOccludersVisitor index de50e1338..8ab96499c 100644 --- a/include/osg/CollectOccludersVisitor +++ b/include/osg/CollectOccludersVisitor @@ -31,7 +31,7 @@ class OSG_EXPORT CollectOccludersVisitor : public osg::NodeVisitor, public osg:: CollectOccludersVisitor(); virtual ~CollectOccludersVisitor(); - META_NodeVisitor("osg","CollectOccludersVisitor") + META_NodeVisitor(osg, CollectOccludersVisitor) virtual CollectOccludersVisitor* cloneType() const { return new CollectOccludersVisitor(); } diff --git a/include/osg/ComputeBoundsVisitor b/include/osg/ComputeBoundsVisitor index da61f0afe..1efd859c2 100644 --- a/include/osg/ComputeBoundsVisitor +++ b/include/osg/ComputeBoundsVisitor @@ -26,7 +26,7 @@ public: ComputeBoundsVisitor(TraversalMode traversalMode = TRAVERSE_ALL_CHILDREN); - META_NodeVisitor("osg","ComputeBoundsVisitor") + META_NodeVisitor(osg, ComputeBoundsVisitor) virtual void reset(); diff --git a/include/osg/KdTree b/include/osg/KdTree index 4f35d50cc..86dee7302 100644 --- a/include/osg/KdTree +++ b/include/osg/KdTree @@ -175,7 +175,7 @@ class OSG_EXPORT KdTreeBuilder : public osg::NodeVisitor KdTreeBuilder(const KdTreeBuilder& rhs); - META_NodeVisitor("osg","KdTreeBuilder") + META_NodeVisitor(osg, KdTreeBuilder) virtual KdTreeBuilder* clone() { return new KdTreeBuilder(*this); } diff --git a/include/osg/NodeVisitor b/include/osg/NodeVisitor index 191db4ada..d0b7e8fd9 100644 --- a/include/osg/NodeVisitor +++ b/include/osg/NodeVisitor @@ -44,7 +44,7 @@ class CameraView; const unsigned int UNINITIALIZED_FRAME_NUMBER=0xffffffff; -#define META_NodeVisitor(library,name) \ +#define META_NodeVisitor(library, name) \ virtual const char* libraryName() const { return #library; }\ virtual const char* className() const { return #name; } diff --git a/include/osgAnimation/BoneMapVisitor b/include/osgAnimation/BoneMapVisitor index a9540e1a9..6095517bc 100644 --- a/include/osgAnimation/BoneMapVisitor +++ b/include/osgAnimation/BoneMapVisitor @@ -27,7 +27,7 @@ namespace osgAnimation class OSGANIMATION_EXPORT BoneMapVisitor : public osg::NodeVisitor { public: - META_NodeVisitor("osgAnimation","BoneMapVisitor") + META_NodeVisitor(osgAnimation, BoneMapVisitor) BoneMapVisitor(); void apply(osg::Node&); diff --git a/include/osgAnimation/LinkVisitor b/include/osgAnimation/LinkVisitor index 05f86b689..e392aa44b 100644 --- a/include/osgAnimation/LinkVisitor +++ b/include/osgAnimation/LinkVisitor @@ -30,7 +30,7 @@ namespace osgAnimation public: LinkVisitor(); - META_NodeVisitor("osgAnimation","LinkVisitor"); + META_NodeVisitor(osgAnimation, LinkVisitor); void apply(osg::Node& node); void apply(osg::Geode& node); diff --git a/include/osgDB/SharedStateManager b/include/osgDB/SharedStateManager index dbae47010..08c30df81 100644 --- a/include/osgDB/SharedStateManager +++ b/include/osgDB/SharedStateManager @@ -48,7 +48,7 @@ namespace osgDB { SharedStateManager(unsigned int mode = SHARE_ALL); - META_NodeVisitor("osgDB","SharedStateManager") + META_NodeVisitor(osgDB, SharedStateManager) void setShareMode(unsigned int mode); diff --git a/include/osgGA/EventVisitor b/include/osgGA/EventVisitor index 06de662e8..83cfc7c56 100644 --- a/include/osgGA/EventVisitor +++ b/include/osgGA/EventVisitor @@ -43,7 +43,7 @@ class OSGGA_EXPORT EventVisitor : public osg::NodeVisitor EventVisitor(); virtual ~EventVisitor(); - META_NodeVisitor("osgGA","EventVisitor") + META_NodeVisitor(osgGA, EventVisitor) void setActionAdapter(osgGA::GUIActionAdapter* actionAdapter) { _actionAdapter=actionAdapter; } diff --git a/include/osgSim/InsertImpostorsVisitor b/include/osgSim/InsertImpostorsVisitor index 6f9e6461b..dec84b42c 100644 --- a/include/osgSim/InsertImpostorsVisitor +++ b/include/osgSim/InsertImpostorsVisitor @@ -29,7 +29,7 @@ class OSGSIM_EXPORT InsertImpostorsVisitor : public osg::NodeVisitor /** Default to traversing all children. */ InsertImpostorsVisitor(); - META_NodeVisitor("osgSim","InsertImpostorsVisitor") + META_NodeVisitor(osgSim, InsertImpostorsVisitor) void setImpostorThresholdRatio(float ratio) { _impostorThresholdRatio = ratio; } float getImpostorThresholdRatio() const { return _impostorThresholdRatio; } diff --git a/include/osgUtil/CullVisitor b/include/osgUtil/CullVisitor index e9dd2a468..f75e1cf11 100644 --- a/include/osgUtil/CullVisitor +++ b/include/osgUtil/CullVisitor @@ -57,7 +57,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStac /// Copy constructor that does a shallow copy. CullVisitor(const CullVisitor&); - META_NodeVisitor("osgUtil","CullVisitor") + META_NodeVisitor(osgUtil, CullVisitor) /** Create a shallow copy of the CullVisitor, used by CullVisitor::create() to clone the prototype. */ virtual CullVisitor* clone() const { return new CullVisitor(*this); } diff --git a/include/osgUtil/DisplayRequirementsVisitor b/include/osgUtil/DisplayRequirementsVisitor index cbd590780..f29d277d7 100644 --- a/include/osgUtil/DisplayRequirementsVisitor +++ b/include/osgUtil/DisplayRequirementsVisitor @@ -36,7 +36,7 @@ class OSGUTIL_EXPORT DisplayRequirementsVisitor : public osg::NodeVisitor * alpha and stencil off.*/ DisplayRequirementsVisitor(); - META_NodeVisitor("osgUtil","DisplayRequirementsVisitor") + META_NodeVisitor(osgUtil, DisplayRequirementsVisitor) /** Set the DisplaySettings. */ inline void setDisplaySettings(osg::DisplaySettings* ds) { _ds = ds; } diff --git a/include/osgUtil/DrawElementTypeSimplifier b/include/osgUtil/DrawElementTypeSimplifier index 752def10d..0af5b5db4 100644 --- a/include/osgUtil/DrawElementTypeSimplifier +++ b/include/osgUtil/DrawElementTypeSimplifier @@ -32,7 +32,7 @@ class OSGUTIL_EXPORT DrawElementTypeSimplifierVisitor : public osg::NodeVisitor { public: - META_NodeVisitor("osgUtil","DrawElementTypeSimplifierVisitor"); + META_NodeVisitor(osgUtil, DrawElementTypeSimplifierVisitor); void apply(osg::Geode& node); }; diff --git a/include/osgUtil/GLObjectsVisitor b/include/osgUtil/GLObjectsVisitor index 751b45657..e2a075145 100644 --- a/include/osgUtil/GLObjectsVisitor +++ b/include/osgUtil/GLObjectsVisitor @@ -54,7 +54,7 @@ class OSGUTIL_EXPORT GLObjectsVisitor : public osg::NodeVisitor */ GLObjectsVisitor(Mode mode=COMPILE_DISPLAY_LISTS|COMPILE_STATE_ATTRIBUTES|CHECK_BLACK_LISTED_MODES); - META_NodeVisitor("osg","GLObjectsVisitor") + META_NodeVisitor(osgUtil, GLObjectsVisitor) virtual void reset() { diff --git a/include/osgUtil/IntersectVisitor b/include/osgUtil/IntersectVisitor index 2c826d3de..98197ebdf 100644 --- a/include/osgUtil/IntersectVisitor +++ b/include/osgUtil/IntersectVisitor @@ -97,7 +97,7 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor IntersectVisitor(); virtual ~IntersectVisitor(); - META_NodeVisitor("osgUtil","IntersectVisitor") + META_NodeVisitor(osgUtil, IntersectVisitor) void reset(); diff --git a/include/osgUtil/IntersectionVisitor b/include/osgUtil/IntersectionVisitor index eb0a12c1b..8ebec6567 100644 --- a/include/osgUtil/IntersectionVisitor +++ b/include/osgUtil/IntersectionVisitor @@ -152,7 +152,7 @@ class OSGUTIL_EXPORT IntersectionVisitor : public osg::NodeVisitor IntersectionVisitor(Intersector* intersector=0, ReadCallback* readCallback=0); - META_NodeVisitor("osgUtil","IntersectionVisitor") + META_NodeVisitor(osgUtil, IntersectionVisitor) virtual void reset(); diff --git a/include/osgUtil/Simplifier b/include/osgUtil/Simplifier index 05a555608..ea7a14038 100644 --- a/include/osgUtil/Simplifier +++ b/include/osgUtil/Simplifier @@ -30,7 +30,7 @@ class OSGUTIL_EXPORT Simplifier : public osg::NodeVisitor Simplifier(double sampleRatio=1.0, double maximumError=FLT_MAX, double maximumLength=0.0); - META_NodeVisitor("osgUtil","Simplifier") + META_NodeVisitor(osgUtil, Simplifier) void setSampleRatio(float sampleRatio) { _sampleRatio = sampleRatio; } float getSampleRatio() const { return _sampleRatio; } diff --git a/include/osgUtil/Statistics b/include/osgUtil/Statistics index 9bea7bc92..bfbb5ac1a 100644 --- a/include/osgUtil/Statistics +++ b/include/osgUtil/Statistics @@ -181,7 +181,7 @@ public: StatsVisitor(); - META_NodeVisitor("osgUtil","StatsVisitor") + META_NodeVisitor(osgUtil, StatsVisitor) virtual void reset(); diff --git a/include/osgUtil/UpdateVisitor b/include/osgUtil/UpdateVisitor index 5d60fcf4c..de26cb1f4 100644 --- a/include/osgUtil/UpdateVisitor +++ b/include/osgUtil/UpdateVisitor @@ -41,7 +41,7 @@ class OSGUTIL_EXPORT UpdateVisitor : public osg::NodeVisitor UpdateVisitor(); virtual ~UpdateVisitor(); - META_NodeVisitor("osgUtil","UpdateVisitor") + META_NodeVisitor(osgUtil, UpdateVisitor) virtual void reset();