diff layer/LayerFactory.cpp @ 684:917039d333bb tonioni

Merge from default branch

--- a/layer/LayerFactory.cpp	Fri Nov 22 10:40:51 2013 +0000
+++ b/layer/LayerFactory.cpp	Tue Nov 26 14:38:48 2013 +0000
@@ -486,7 +486,7 @@
     QString defaults = settings.value(getLayerTypeName(type), "").toString();
     if (defaults == "") return;
 
-//    std::cerr << "defaults=\"" << defaults << "\"" << std::endl;
+//    cerr << "defaults=\"" << defaults << "\"" << endl;
 
     QString xml = layer->toXmlString();
     QDomDocument docOld, docNew;
@@ -502,9 +502,9 @@
         for (unsigned int i = 0; i < attrNodes.length(); ++i) {
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
-//            std::cerr << "append \"" << attr.name().toStdString()
+//            cerr << "append \"" << attr.name()
 //                      << "\" -> \"" << attr.value() << "\""
-//                      << std::endl;
+//                      << endl;
             attrs.append(attr.name(), "", "", attr.value());
         }
         
@@ -514,9 +514,9 @@
             QDomAttr attr = attrNodes.item(i).toAttr();
             if (attr.isNull()) continue;
             if (attrs.value(attr.name()) == "") {
-//                std::cerr << "append \"" << attr.name().toStdString()
+//                cerr << "append \"" << attr.name()
 //                          << "\" -> \"" << attr.value() << "\""
-//                          << std::endl;
+//                          << endl;
                 attrs.append(attr.name(), "", "", attr.value());
             }
         }