From d23525889e85f96e8cc8b61b523878fead75b3e4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 28 May 2010 16:04:56 +0000
Subject: [PATCH] Convertex osg::notify to OSG_INFO etc.

---
 src/osgFX/AnisotropicLighting.cpp | 2 +-
 src/osgFX/BumpMapping.cpp         | 2 +-
 src/osgFX/Effect.cpp              | 4 ++--
 src/osgFX/SpecularHighlights.cpp  | 2 +-
 src/osgFX/Validator.cpp           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/osgFX/AnisotropicLighting.cpp b/src/osgFX/AnisotropicLighting.cpp
index a6ef53359..337a3bf98 100644
--- a/src/osgFX/AnisotropicLighting.cpp
+++ b/src/osgFX/AnisotropicLighting.cpp
@@ -219,7 +219,7 @@ namespace
             #if !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)
                 ss->setMode( GL_ALPHA_TEST, osg::StateAttribute::OFF );
             #else
-                osg::notify(osg::NOTICE)<<"Warning: osgFX::AnisotropicLighting unable to disable GL_ALPHA_TEST."<<std::endl;
+                OSG_NOTICE<<"Warning: osgFX::AnisotropicLighting unable to disable GL_ALPHA_TEST."<<std::endl;
             #endif
 
             addPass(ss.get());
diff --git a/src/osgFX/BumpMapping.cpp b/src/osgFX/BumpMapping.cpp
index da10a6bd0..65c183f7b 100644
--- a/src/osgFX/BumpMapping.cpp
+++ b/src/osgFX/BumpMapping.cpp
@@ -440,7 +440,7 @@ namespace
         void define_passes()
         {
             if (_diffuse_unit != (_normal_unit + 1)) {
-                osg::notify(osg::WARN) << "Warning: osgFX::BumpMapping: this technique (ArbVpTechnique) requires that _diffuse_unit == (_normal_unit + 1). Effect may not show up properly.\n";
+                OSG_WARN << "Warning: osgFX::BumpMapping: this technique (ArbVpTechnique) requires that _diffuse_unit == (_normal_unit + 1). Effect may not show up properly.\n";
             }
 
             // first pass, diffuse bump
diff --git a/src/osgFX/Effect.cpp b/src/osgFX/Effect.cpp
index a18e9128e..9192320dd 100644
--- a/src/osgFX/Effect.cpp
+++ b/src/osgFX/Effect.cpp
@@ -68,13 +68,13 @@ void Effect::traverse(osg::NodeVisitor& nv)
 
         // check for errors, return on failure
         if (!_techs_defined) {
-            osg::notify(osg::WARN) << "Warning: osgFX::Effect: could not define techniques for effect " << className() << std::endl;
+            OSG_WARN << "Warning: osgFX::Effect: could not define techniques for effect " << className() << std::endl;
             return;
         }
 
         // ensure that at least one technique has been defined
         if (_techs.empty()) {
-            osg::notify(osg::WARN) << "Warning: osgFX::Effect: no techniques defined for effect " << className() << std::endl;
+            OSG_WARN << "Warning: osgFX::Effect: no techniques defined for effect " << className() << std::endl;
             return;
         }
     }
diff --git a/src/osgFX/SpecularHighlights.cpp b/src/osgFX/SpecularHighlights.cpp
index 41ad9e7be..4b14ad001 100644
--- a/src/osgFX/SpecularHighlights.cpp
+++ b/src/osgFX/SpecularHighlights.cpp
@@ -77,7 +77,7 @@ namespace
 
             glMatrixMode(GL_MODELVIEW);
         #else
-            osg::notify(osg::NOTICE)<<"Warning: osgFX::SpecualHighlights unable to set texture matrix."<<std::endl;
+            OSG_NOTICE<<"Warning: osgFX::SpecualHighlights unable to set texture matrix."<<std::endl;
         #endif
         }
 
diff --git a/src/osgFX/Validator.cpp b/src/osgFX/Validator.cpp
index 0887c2020..b9901d539 100644
--- a/src/osgFX/Validator.cpp
+++ b/src/osgFX/Validator.cpp
@@ -42,6 +42,6 @@ void Validator::apply(osg::State& state) const
                 return;
             }
         }
-        osg::notify(osg::WARN) << "Warning: osgFX::Validator: could not find any techniques compatible with the current OpenGL context" << std::endl;
+        OSG_WARN << "Warning: osgFX::Validator: could not find any techniques compatible with the current OpenGL context" << std::endl;
     }
 }