From e16268ca76d4b999cf2c7b4a470b4a232dffa950 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 28 May 2010 17:07:01 +0000 Subject: [PATCH] Converted osg::notify to OSG_INFO etc. --- src/osgPlugins/rot/ReaderWriterROT.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/osgPlugins/rot/ReaderWriterROT.cpp b/src/osgPlugins/rot/ReaderWriterROT.cpp index 4bf8940f3..8d2cb3b89 100644 --- a/src/osgPlugins/rot/ReaderWriterROT.cpp +++ b/src/osgPlugins/rot/ReaderWriterROT.cpp @@ -50,7 +50,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename params = input.substr(pos+1, std::string::npos ); if( params.empty() ) { - osg::notify(osg::WARN) << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl; + OSG_WARN << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl; return false; } @@ -106,7 +106,7 @@ public: if( !acceptsExtension(ext) ) return ReadResult::FILE_NOT_HANDLED; - osg::notify(osg::INFO) << "ReaderWriterROT( \"" << fileName << "\" )" << std::endl; + OSG_INFO << "ReaderWriterROT( \"" << fileName << "\" )" << std::endl; // strip the pseudo-loader extension std::string tmpName = osgDB::getNameLessExtension( fileName ); @@ -123,18 +123,18 @@ public: if( subFileName.empty()) { - osg::notify(osg::WARN) << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl; + OSG_WARN << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl; return ReadResult::FILE_NOT_HANDLED; } - osg::notify(osg::INFO) << " params = \"" << params << "\"" << std::endl; - osg::notify(osg::INFO) << " subFileName = \"" << subFileName << "\"" << std::endl; + OSG_INFO << " params = \"" << params << "\"" << std::endl; + OSG_INFO << " subFileName = \"" << subFileName << "\"" << std::endl; float rx, ry, rz; int count = sscanf( params.c_str(), "%f,%f,%f", &rx, &ry, &rz ); if( count != 3 ) { - osg::notify(osg::WARN) << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl; + OSG_WARN << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl; return ReadResult::FILE_NOT_HANDLED; } @@ -143,7 +143,7 @@ public: if( !node ) { // propagate the read failure upwards - osg::notify(osg::WARN) << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl; + OSG_WARN << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl; return ReadResult::FILE_NOT_HANDLED; }