Mercurial > hg > svcore
diff base/PropertyContainer.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | 1424aa29ae95 |
children | f5cd33909744 |
line wrap: on
line diff
--- a/base/PropertyContainer.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/base/PropertyContainer.cpp Tue Nov 26 13:35:08 2013 +0000 @@ -68,7 +68,7 @@ void PropertyContainer::setProperty(const PropertyName &name, int) { - std::cerr << "WARNING: PropertyContainer[" << getPropertyContainerName() << "]::setProperty(" << name << "): no implementation in subclass!" << std::endl; + cerr << "WARNING: PropertyContainer[" << getPropertyContainerName() << "]::setProperty(" << name << "): no implementation in subclass!" << endl; } Command * @@ -85,10 +85,10 @@ PropertyName name; int value; if (!convertPropertyStrings(nameString, valueString, name, value)) { - std::cerr << "WARNING: PropertyContainer::setProperty(\"" + cerr << "WARNING: PropertyContainer::setProperty(\"" << nameString << "\", \"" << valueString.toStdString() - << "\"): Name and value conversion failed" << std::endl; + << "\"): Name and value conversion failed" << endl; return; } setProperty(name, value); @@ -100,10 +100,10 @@ PropertyName name; int value; if (!convertPropertyStrings(nameString, valueString, name, value)) { - std::cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\"" + cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\"" << nameString << "\", \"" << valueString.toStdString() - << "\"): Name and value conversion failed" << std::endl; + << "\"): Name and value conversion failed" << endl; return 0; } return getSetPropertyCommand(name, value); @@ -135,7 +135,7 @@ } if (name == "") { - std::cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString << "\"" << std::endl; + cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString << "\"" << endl; return false; } @@ -204,7 +204,7 @@ bool ok = false; int i = valueString.toInt(&ok); if (!ok) { - std::cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << std::endl; + cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << endl; return false; } else if (i < min || i > max) { SVDEBUG << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << endl;