diff layer/LayerFactory.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

--- a/layer/LayerFactory.cpp	Thu Apr 14 15:21:21 2011 +0100
+++ b/layer/LayerFactory.cpp	Tue Jun 14 14:48:29 2011 +0100
@@ -442,11 +442,11 @@
     }
 
     if (!layer) {
-	std::cerr << "LayerFactory::createLayer: Unknown layer type " 
-		  << type << std::endl;
+	DEBUG << "LayerFactory::createLayer: Unknown layer type " 
+		  << type << endl;
     } else {
-//	std::cerr << "LayerFactory::createLayer: Setting object name "
-//		  << getLayerPresentationName(type).toStdString() << " on " << layer << std::endl;
+//	DEBUG << "LayerFactory::createLayer: Setting object name "
+//		  << getLayerPresentationName(type) << " on " << layer << endl;
 	layer->setObjectName(getLayerPresentationName(type));
         setLayerDefaultProperties(type, layer);
     }
@@ -457,14 +457,14 @@
 void
 LayerFactory::setLayerDefaultProperties(LayerType type, Layer *layer)
 {
-//    std::cerr << "LayerFactory::setLayerDefaultProperties: type " << type << " (name \"" << getLayerTypeName(type).toStdString() << "\")" << std::endl;
+//    DEBUG << "LayerFactory::setLayerDefaultProperties: type " << type << " (name \"" << getLayerTypeName(type) << "\")" << endl;
 
     QSettings settings;
     settings.beginGroup("LayerDefaults");
     QString defaults = settings.value(getLayerTypeName(type), "").toString();
     if (defaults == "") return;
 
-//    std::cerr << "defaults=\"" << defaults.toStdString() << "\"" << std::endl;
+//    std::cerr << "defaults=\"" << defaults << "\"" << std::endl;
 
     QString xml = layer->toXmlString();
     QDomDocument docOld, docNew;
@@ -481,7 +481,7 @@
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
 //            std::cerr << "append \"" << attr.name().toStdString()
-//                      << "\" -> \"" << attr.value().toStdString() << "\""
+//                      << "\" -> \"" << attr.value() << "\""
 //                      << std::endl;
             attrs.append(attr.name(), "", "", attr.value());
         }
@@ -493,7 +493,7 @@
             if (attr.isNull()) continue;
             if (attrs.value(attr.name()) == "") {
 //                std::cerr << "append \"" << attr.name().toStdString()
-//                          << "\" -> \"" << attr.value().toStdString() << "\""
+//                          << "\" -> \"" << attr.value() << "\""
 //                          << std::endl;
                 attrs.append(attr.name(), "", "", attr.value());
             }