From 72d699e2b30032f84ac333c3611b01bd9b8764dc Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 26 May 2010 08:34:15 +0000
Subject: [PATCH] Fixed warnings

---
 src/osgGA/NodeTrackerManipulator.cpp | 29 +++++++++++++++-------------
 src/osgGA/TerrainManipulator.cpp     |  4 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/osgGA/NodeTrackerManipulator.cpp b/src/osgGA/NodeTrackerManipulator.cpp
index 722fce6e5..71b648d9b 100644
--- a/src/osgGA/NodeTrackerManipulator.cpp
+++ b/src/osgGA/NodeTrackerManipulator.cpp
@@ -21,17 +21,17 @@ using namespace osgGA;
 
 
 NodeTrackerManipulator::NodeTrackerManipulator( int flags )
-   : inherited( flags ),
-    _trackerMode(NODE_CENTER_AND_ROTATION)
+    : inherited( flags ),
+      _trackerMode(NODE_CENTER_AND_ROTATION)
 {
     setVerticalAxisFixed(false);
 }
 
 
 NodeTrackerManipulator::NodeTrackerManipulator( const NodeTrackerManipulator& m, const CopyOp& copyOp )
-   : inherited( m, copyOp ),
-     _trackNodePath( m._trackNodePath ),
-     _trackerMode( m._trackerMode )
+    : inherited( m, copyOp ),
+      _trackNodePath( m._trackNodePath ),
+      _trackerMode( m._trackerMode )
 {
 }
 
@@ -94,15 +94,18 @@ NodeTrackerManipulator::RotationMode NodeTrackerManipulator::getRotationMode() c
 
 void NodeTrackerManipulator::setNode(Node* node)
 {
-   inherited::setNode( node );
+    inherited::setNode( node );
 
-   // update model size
-   if (_flags & UPDATE_MODEL_SIZE)
-      if (_node.get()) {
-         setMinimumDistance(clampBetween(_modelSize*0.001, 0.00001, 1.0));
-         notify(INFO) << "NodeTrackerManipulator: setting minimum distance to "
-                      << _minimumDistance << std::endl;
-      }
+    // update model size
+    if (_flags & UPDATE_MODEL_SIZE)
+    {
+        if (_node.valid())
+        {
+            setMinimumDistance(clampBetween(_modelSize*0.001, 0.00001, 1.0));
+            notify(INFO) << "NodeTrackerManipulator: setting minimum distance to "
+                         << _minimumDistance << std::endl;
+        }
+    }
 }
 
 void NodeTrackerManipulator::setTrackNode(osg::Node* node)
diff --git a/src/osgGA/TerrainManipulator.cpp b/src/osgGA/TerrainManipulator.cpp
index eb730af12..ee0d9a097 100644
--- a/src/osgGA/TerrainManipulator.cpp
+++ b/src/osgGA/TerrainManipulator.cpp
@@ -54,11 +54,11 @@ void TerrainManipulator::setNode( Node* node )
     // update model size
     if( _flags & UPDATE_MODEL_SIZE )
     {
-        if( _node.get() )
+        if( _node.valid() )
         {
             setMinimumDistance( clampBetween( _modelSize * 0.001, 0.00001, 1.0 ) );
             notify( INFO ) << "TerrainManipulator: setting _minimumDistance to "
-                        << _minimumDistance << std::endl;
+                           << _minimumDistance << std::endl;
         }
     }
 }