comparison framework/Document.cpp @ 228:67cea66bd588 debug-output

Remove most toStdString calls (no longer needed, with debug header)

 
     LayerFactory::LayerTypeSet types =
 	LayerFactory::getInstance()->getValidLayerTypes(newModel);
 
     if (types.empty()) {
-	std::cerr << "WARNING: Document::createLayerForTransformer: no valid display layer for output of transform " << transform.getIdentifier().toStdString() << std::endl;
+	std::cerr << "WARNING: Document::createLayerForTransformer: no valid display layer for output of transform " << transform.getIdentifier() << std::endl;
         newModel->aboutToDelete();
         emit modelAboutToBeDeleted(newModel);
         m_models.erase(newModel);
 	delete newModel;
 	return 0;

 	Model *model = layer->getModel();
 
 #ifdef DEBUG_DOCUMENT
         std::cerr << "Document::setMainModel: inspecting model "
                   << (model ? model->objectName().toStdString() : "(null)") << " in layer "
-                  << layer->objectName().toStdString() << std::endl;
+                  << layer->objectName() << std::endl;
 #endif
 
 	if (model == oldMainModel) {
 #ifdef DEBUG_DOCUMENT
             std::cerr << "... it uses the old main model, replacing" << std::endl;

                                 (m_mainModel, m_models[model].channel),
                                 message);
 	    
 	    if (!replacementModel) {
 		std::cerr << "WARNING: Document::setMainModel: Failed to regenerate model for transform \""
-			  << transformId.toStdString() << "\"" << " in layer " << layer << std::endl;
+			  << transformId << "\"" << " in layer " << layer << std::endl;
                 if (failedTransformers.find(transformId)
                     == failedTransformers.end()) {
                     emit modelRegenerationFailed(layer->objectName(),
                                                  transformId,
                                                  message);

 #ifdef DEBUG_DOCUMENT
                 std::cerr << "Replacing model " << model << " (type "
                           << typeid(*model).name() << ") with model "
                           << replacementModel << " (type "
                           << typeid(*replacementModel).name() << ") in layer "
-                          << layer << " (name " << layer->objectName().toStdString() << ")"
+                          << layer << " (name " << layer->objectName() << ")"
                           << std::endl;
 #endif
                 RangeSummarisableTimeValueModel *rm =
                     dynamic_cast<RangeSummarisableTimeValueModel *>(replacementModel);
 #ifdef DEBUG_DOCUMENT

 
         Model *m = i->first;
 
 #ifdef DEBUG_DOCUMENT
         std::cerr << "considering alignment for model " << m << " (name \""
-                  << m->objectName().toStdString() << "\")" << std::endl;
+                  << m->objectName() << "\")" << std::endl;
 #endif
 
         if (m_autoAlignment) {
 
             alignModel(m);

 		  << std::endl;
 	return;
     }
 
 #ifdef DEBUG_DOCUMENT
-    std::cerr << "Document::addDerivedModel: source is " << input.getModel() << " \"" << input.getModel()->objectName().toStdString() << "\"" << std::endl;
+    std::cerr << "Document::addDerivedModel: source is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << std::endl;
 #endif
 
     ModelRecord rec;
     rec.source = input.getModel();
     rec.channel = input.getChannel();

          getDefaultTransformFor(transform.getIdentifier(),
                                 lrintf(transform.getSampleRate()))
          .getPluginVersion());
 
     if (!model) {
-	std::cerr << "WARNING: Document::addDerivedModel: no output model for transform " << transform.getIdentifier().toStdString() << std::endl;
+	std::cerr << "WARNING: Document::addDerivedModel: no output model for transform " << transform.getIdentifier() << std::endl;
     } else {
 	addDerivedModel(applied, input, model);
     }
 
     return model;

 {
     if (m_layerViewMap.find(layer) != m_layerViewMap.end() &&
 	m_layerViewMap[layer].size() > 0) {
 
 	std::cerr << "WARNING: Document::deleteLayer: Layer "
-		  << layer << " [" << layer->objectName().toStdString() << "]"
+		  << layer << " [" << layer->objectName() << "]"
 		  << " is still used in " << m_layerViewMap[layer].size()
 		  << " views!" << std::endl;
 
 	if (force) {
 

 QString
 Document::AddLayerCommand::getName() const
 {
 #ifdef DEBUG_DOCUMENT
     std::cerr << "Document::AddLayerCommand::getName(): Name is "
-              << m_name.toStdString() << std::endl;
+              << m_name << std::endl;
 #endif
     return m_name;
 }
 
 void

 QString
 Document::RemoveLayerCommand::getName() const
 {
 #ifdef DEBUG_DOCUMENT
     std::cerr << "Document::RemoveLayerCommand::getName(): Name is "
-              << m_name.toStdString() << std::endl;
+              << m_name << std::endl;
 #endif
     return m_name;
 }
 
 void