comparison framework/Document.cpp @ 132:3b61a975b47e sv1-v1.3 sv1-v1.3rc1

* Updates for 1.3
author Chris Cannam
date Thu, 10 Jul 2008 12:50:56 +0000
parents e54dff673096
children 6d2e49c59b3b
comparison
equal deleted inserted replaced
131:883f7fc7fd34 132:3b61a975b47e
579 return; 579 return;
580 } 580 }
581 581
582 m_layers.erase(layer); 582 m_layers.erase(layer);
583 583
584 #ifdef DEBUG_DOCUMENT
584 std::cerr << "Document::deleteLayer: Removing, now have " 585 std::cerr << "Document::deleteLayer: Removing, now have "
585 << m_layers.size() << " layers" << std::endl; 586 << m_layers.size() << " layers" << std::endl;
587 #endif
586 588
587 releaseModel(layer->getModel()); 589 releaseModel(layer->getModel());
588 emit layerRemoved(layer); 590 emit layerRemoved(layer);
589 emit layerAboutToBeDeleted(layer); 591 emit layerAboutToBeDeleted(layer);
590 delete layer; 592 delete layer;
605 } 607 }
606 608
607 Model *previousModel = layer->getModel(); 609 Model *previousModel = layer->getModel();
608 610
609 if (previousModel == model) { 611 if (previousModel == model) {
610 std::cerr << "WARNING: Document::setModel: Layer " << layer << " (\"" 612 std::cerr << "NOTE: Document::setModel: Layer " << layer << " (\""
611 << layer->objectName().toStdString() 613 << layer->objectName().toStdString()
612 << "\") is already set to model " 614 << "\") is already set to model "
613 << model << " (\"" 615 << model << " (\""
614 << (model ? model->objectName().toStdString() : "(null)") 616 << (model ? model->objectName().toStdString() : "(null)")
615 << "\")" << std::endl; 617 << "\")" << std::endl;