diff base/PropertyContainer.cpp @ 689:573d45e9487b

Merge from debug-output branch

--- a/base/PropertyContainer.cpp	Tue Jun 14 13:43:03 2011 +0100
+++ b/base/PropertyContainer.cpp	Tue Jun 14 14:47:59 2011 +0100
@@ -68,7 +68,7 @@
 void
 PropertyContainer::setProperty(const PropertyName &name, int) 
 {
-    std::cerr << "WARNING: PropertyContainer[" << getPropertyContainerName().toStdString() << "]::setProperty(" << name.toStdString() << "): no implementation in subclass!" << std::endl;
+    std::cerr << "WARNING: PropertyContainer[" << getPropertyContainerName() << "]::setProperty(" << name << "): no implementation in subclass!" << std::endl;
 }
 
 Command *
@@ -86,7 +86,7 @@
     int value;
     if (!convertPropertyStrings(nameString, valueString, name, value)) {
         std::cerr << "WARNING: PropertyContainer::setProperty(\""
-                  << nameString.toStdString() << "\", \""
+                  << nameString << "\", \""
                   << valueString.toStdString()
                   << "\"): Name and value conversion failed" << std::endl;
         return;
@@ -101,7 +101,7 @@
     int value;
     if (!convertPropertyStrings(nameString, valueString, name, value)) {
         std::cerr << "WARNING: PropertyContainer::getSetPropertyCommand(\""
-                  << nameString.toStdString() << "\", \""
+                  << nameString << "\", \""
                   << valueString.toStdString()
                   << "\"): Name and value conversion failed" << std::endl;
         return 0;
@@ -135,7 +135,7 @@
     }
 
     if (name == "") {
-        std::cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString.toStdString() << "\"" << std::endl;
+        std::cerr << "PropertyContainer::convertPropertyStrings: Unable to match name string \"" << nameString << "\"" << std::endl;
         return false;
     }
 
@@ -192,7 +192,7 @@
         break;
 
     case InvalidProperty:
-        std::cerr << "PropertyContainer::convertPropertyStrings: Invalid property name \"" << name.toStdString() << "\"" << std::endl;
+        DEBUG << "PropertyContainer::convertPropertyStrings: Invalid property name \"" << name << "\"" << endl;
         return false;
     }
 
@@ -204,10 +204,10 @@
     bool ok = false;
     int i = valueString.toInt(&ok);
     if (!ok) {
-        std::cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString.toStdString() << "\"" << std::endl;
+        std::cerr << "PropertyContainer::convertPropertyStrings: Unable to parse value string \"" << valueString << "\"" << std::endl;
         return false;
     } else if (i < min || i > max) {
-        std::cerr << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << std::endl;
+        DEBUG << "PropertyContainer::convertPropertyStrings: Property value \"" << i << "\" outside valid range " << min << " to " << max << endl;
         return false;
     }