From cff9188caf4a9aace3c9702fa3a70822118c9e06 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 15 Jun 2007 16:08:33 +0000
Subject: [PATCH] Fixed namespace

---
 include/osgSim/OpenFlightOptimizer            |  2 +-
 src/osgSim/OpenFlightOptimizer.cpp            |  3 +--
 .../osgSim/OpenFlightOptimizer.cpp            | 20 +++++++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/osgSim/OpenFlightOptimizer b/include/osgSim/OpenFlightOptimizer
index 637827135..890789ef3 100644
--- a/include/osgSim/OpenFlightOptimizer
+++ b/include/osgSim/OpenFlightOptimizer
@@ -25,7 +25,7 @@
 
 #include <osgSim/Export>
 
-namespace osgFlightUtil {
+namespace osgSim {
 
 /** Flight optimizer
   */
diff --git a/src/osgSim/OpenFlightOptimizer.cpp b/src/osgSim/OpenFlightOptimizer.cpp
index 9c854a01a..a9671da2f 100644
--- a/src/osgSim/OpenFlightOptimizer.cpp
+++ b/src/osgSim/OpenFlightOptimizer.cpp
@@ -15,8 +15,7 @@
 #include <vector>
 #include <map>
 
-using namespace osgFlightUtil;
-
+using namespace osgSim;
 
 void Optimizer::optimize(osg::Node* node)
 {
diff --git a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
index c0833570d..ddad7e33b 100644
--- a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
+++ b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp
@@ -23,16 +23,16 @@
 #undef OUT
 #endif
 
-BEGIN_ENUM_REFLECTOR(osgFlightUtil::Optimizer::OptimizationOptions)
+BEGIN_ENUM_REFLECTOR(osgSim::Optimizer::OptimizationOptions)
 	I_DeclaringFile("osgSim/OpenFlightOptimizer");
-	I_EnumLabel(osgFlightUtil::Optimizer::TESSELLATE_POLYGON);
-	I_EnumLabel(osgFlightUtil::Optimizer::MERGE_GEODES);
-	I_EnumLabel(osgFlightUtil::Optimizer::MAKE_LIT);
-	I_EnumLabel(osgFlightUtil::Optimizer::DEFAULT_OPTIMIZATIONS);
-	I_EnumLabel(osgFlightUtil::Optimizer::ALL_OPTIMIZATIONS);
+	I_EnumLabel(osgSim::Optimizer::TESSELLATE_POLYGON);
+	I_EnumLabel(osgSim::Optimizer::MERGE_GEODES);
+	I_EnumLabel(osgSim::Optimizer::MAKE_LIT);
+	I_EnumLabel(osgSim::Optimizer::DEFAULT_OPTIMIZATIONS);
+	I_EnumLabel(osgSim::Optimizer::ALL_OPTIMIZATIONS);
 END_REFLECTOR
 
-BEGIN_VALUE_REFLECTOR(osgFlightUtil::Optimizer)
+BEGIN_VALUE_REFLECTOR(osgSim::Optimizer)
 	I_DeclaringFile("osgSim/OpenFlightOptimizer");
 	I_Constructor0(____Optimizer,
 	               "",
@@ -49,7 +49,7 @@ BEGIN_VALUE_REFLECTOR(osgFlightUtil::Optimizer)
 	          "");
 END_REFLECTOR
 
-BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MakeLitVisitor)
+BEGIN_OBJECT_REFLECTOR(osgSim::Optimizer::MakeLitVisitor)
 	I_DeclaringFile("osgSim/OpenFlightOptimizer");
 	I_BaseType(osg::NodeVisitor);
 	I_Constructor0(____MakeLitVisitor,
@@ -62,7 +62,7 @@ BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MakeLitVisitor)
 	          "");
 END_REFLECTOR
 
-BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor)
+BEGIN_OBJECT_REFLECTOR(osgSim::Optimizer::MergeGeodesVisitor)
 	I_DeclaringFile("osgSim/OpenFlightOptimizer");
 	I_BaseType(osg::NodeVisitor);
 	I_Constructor0(____MergeGeodesVisitor,
@@ -86,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor)
 	                   "");
 END_REFLECTOR
 
-BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::TessellateVisitor)
+BEGIN_OBJECT_REFLECTOR(osgSim::Optimizer::TessellateVisitor)
 	I_DeclaringFile("osgSim/OpenFlightOptimizer");
 	I_BaseType(osg::NodeVisitor);
 	I_Constructor0(____TessellateVisitor,