Removed include <iostream> where possible, replacing with istream or ostream and changing

std::cout/cerr to osg::notify().

src/osg/CullingSet.cpp

@@ -25,20 +25,8 @@ CullingSet::~CullingSet()
 {
 }
 
-void PrintNodePath(const NodePath& nodePath)
-{
-    for(NodePath::const_iterator itr=nodePath.begin();
-        itr!=nodePath.end();
-        ++itr)
-    {
-        std::cout<<*itr<<"  ";
-    }
-}
-
-
 void CullingSet::disableAndPushOccludersCurrentMask(NodePath& nodePath)
 {
-    //std::cout<<"  trying to disable occluder ";PrintNodePath(nodePath);std::cout<<std::endl;
     for(OccluderList::iterator itr=_occluderList.begin();
         itr!=_occluderList.end();
         ++itr)

src/osg/Image.cpp

@@ -401,8 +401,6 @@ void Image::readImageFromCurrentTexture(unsigned int contextID)
 
             allocateImage(width,height,1,internalformat,internalformat);
             
-            std::cout << "width="<<width<<" height="<<height<<" internalFormat="<<internalformat<<" _internalFormat="<<_internalTextureFormat<<std::endl;
-            
             extensions->glGetCompressedTexImage(GL_TEXTURE_2D, 0, _data);
             
             _internalTextureFormat = internalformat;

src/osg/Notify.cpp

@@ -12,6 +12,7 @@
 */
 #include <osg/Notify>
 #include <string>
+#include <iostream>
 
 using namespace std;
 

src/osg/PagedLOD.cpp

@@ -64,7 +64,6 @@ void PagedLOD::traverse(NodeVisitor& nv)
                     {
                         if (updateTimeStamp) _perRangeDataList[i]._timeStamp=timeStamp;
 
-                        //std::cout<<"PagedLOD::traverse() - Selecting child "<<i<<std::endl;
                         _children[i]->accept(nv);
                         lastChildTraversed = (int)i;
                     }
@@ -79,11 +78,9 @@ void PagedLOD::traverse(NodeVisitor& nv)
             {
                 unsigned int numChildren = _children.size();
                 
-                //std::cout<<"PagedLOD::traverse() - falling back "<<std::endl;
                 // select the last valid child.
                 if (numChildren>0 && ((int)numChildren-1)!=lastChildTraversed)
                 {
-                    //std::cout<<"    to child "<<numChildren-1<<std::endl;
                     if (updateTimeStamp) _perRangeDataList[numChildren-1]._timeStamp=timeStamp;
                     _children[numChildren-1]->accept(nv);
                 }
@@ -97,7 +94,6 @@ void PagedLOD::traverse(NodeVisitor& nv)
                     // modify the priority according to the child's priority offset and scale.
                     priority = _perRangeDataList[numChildren]._priorityOffset + priority * _perRangeDataList[numChildren]._priorityScale;
 
-                    //std::cout<<"    requesting child "<<_fileNameList[numChildren]<<" priotity = "<<priority<<std::endl;
                     nv.getDatabaseRequestHandler()->requestNodeFile(_perRangeDataList[numChildren]._filename,this,priority,nv.getFrameStamp());
                 }
                 
@@ -131,25 +127,21 @@ bool PagedLOD::computeBound() const
 void PagedLOD::childRemoved(unsigned int pos, unsigned int numChildrenToRemove)
 {
     LOD::childRemoved(pos, numChildrenToRemove);
-    //std::cout<<"PagedLOD::childRemoved("<<pos<<","<<numChildrenToRemove<<")"<<std::endl;
 }
 
 void PagedLOD::childInserted(unsigned int pos)
 {
     LOD::childInserted(pos);
-    //std::cout<<"PagedLOD::childInserted("<<pos<<")"<<std::endl;
 }
 
 void PagedLOD::rangeRemoved(unsigned int pos, unsigned int numChildrenToRemove)
 {
     LOD::rangeRemoved(pos, numChildrenToRemove);
-    std::cout<<"PagedLOD::rangeRemoved("<<pos<<","<<numChildrenToRemove<<")"<<std::endl;
 }
 
 void PagedLOD::rangeInserted(unsigned int pos)
 {
     LOD::rangeInserted(pos);
-    std::cout<<"PagedLOD::rangeInserted("<<pos<<")"<<std::endl;
     expandPerRangeDataTo(pos);
 }
 
@@ -209,6 +201,7 @@ void PagedLOD::removeExpiredChildren(double expiryTime,NodeList& removedChildren
     {
         if (!_perRangeDataList[_children.size()-1]._filename.empty() && _perRangeDataList[_children.size()-1]._timeStamp<expiryTime)
         {
+            //removedChildren.push_back(_children[_children.size()-1].get());
             Group::removeChild(_children[_children.size()-1].get());
         }
     }

src/osg/ShapeDrawable.cpp

@@ -827,9 +827,9 @@ void DrawShapeVisitor::apply(const Capsule& capsule)
     glPopMatrix();
 }
 
-void DrawShapeVisitor::apply(const InfinitePlane& plane)
+void DrawShapeVisitor::apply(const InfinitePlane&)
 {
-    std::cout << "draw a Plane ("<<plane<<") "<<std::endl;
+    notify(NOTICE)<<"Warning: DrawShapeVisitor::apply(const InfinitePlane& plane) not yet implementated. "<<std::endl;
 }
 
 void DrawShapeVisitor::apply(const TriangleMesh& mesh)
@@ -1661,9 +1661,9 @@ void PrimitiveShapeVisitor::apply(const Capsule& /*capsule*/)
 #endif   
 }
 
-void PrimitiveShapeVisitor::apply(const InfinitePlane& plane)
+void PrimitiveShapeVisitor::apply(const InfinitePlane&)
 {
-    std::cout << "Primitive a Plane ("<<plane<<") "<<std::endl;
+    notify(NOTICE)<<"Warning: PrimitiveShapeVisitor::apply(const InfinitePlane& plane) not yet implementated. "<<std::endl;
 }
 
 void PrimitiveShapeVisitor::apply(const TriangleMesh& mesh)

src/osg/UnitTestFramework.cpp

@@ -385,7 +385,7 @@ bool TestSuite::accept( Test::Visitor& v )
 
 bool QualifiedTestPrinter::visit( TestCase* pTest )
 {
-    std::cout << currentPath() + pTest->name() << std::endl;
+    osg::notify(osg::NOTICE) << currentPath() + pTest->name() << std::endl;
     return true;
 }