diff document/Document.cpp @ 137:006c90387f40

* Fix many compile warnings, remove some debug output
author Chris Cannam
date Mon, 30 Apr 2007 13:36:23 +0000
parents b4110b17bca8
children 107ca17594c8
line wrap: on
line diff
--- a/document/Document.cpp	Mon Apr 30 09:34:13 2007 +0000
+++ b/document/Document.cpp	Mon Apr 30 13:36:23 2007 +0000
@@ -240,12 +240,12 @@
 	Layer *layer = *i;
 	Model *model = layer->getModel();
 
-        std::cerr << "Document::setMainModel: inspecting model "
-                  << (model ? model->objectName().toStdString() : "(null)") << " in layer "
-                  << layer->objectName().toStdString() << std::endl;
+//        std::cerr << "Document::setMainModel: inspecting model "
+//                  << (model ? model->objectName().toStdString() : "(null)") << " in layer "
+//                  << layer->objectName().toStdString() << std::endl;
 
 	if (model == oldMainModel) {
-            std::cerr << "... it uses the old main model, replacing" << std::endl;
+//            std::cerr << "... it uses the old main model, replacing" << std::endl;
 	    LayerFactory::getInstance()->setModel(layer, m_mainModel);
 	    continue;
 	}
@@ -260,7 +260,7 @@
 	    
 	if (m_models[model].source == oldMainModel) {
 
-            std::cerr << "... it uses a model derived from the old main model, regenerating" << std::endl;
+//            std::cerr << "... it uses a model derived from the old main model, regenerating" << std::endl;
 
 	    // This model was derived from the previous main
 	    // model: regenerate it.
@@ -533,10 +533,10 @@
 {
     Model *model = layer->getModel();
     if (!model) {
-	std::cerr << "Document::addLayerToView: Layer (\""
-                  << layer->objectName().toStdString()
-                  << "\") with no model being added to view: "
-                  << "normally you want to set the model first" << std::endl;
+//	std::cerr << "Document::addLayerToView: Layer (\""
+//                  << layer->objectName().toStdString()
+//                  << "\") with no model being added to view: "
+//                  << "normally you want to set the model first" << std::endl;
     } else {
 	if (model != m_mainModel &&
 	    m_models.find(model) == m_models.end()) {