Mercurial > hg > svcore
diff data/model/Model.cpp @ 1754:8529763e2258 by-id
Tidy
author | Chris Cannam |
---|---|
date | Fri, 05 Jul 2019 16:55:27 +0100 |
parents | 6d09d68165a4 |
children | 83178b4bb698 |
line wrap: on
line diff
--- a/data/model/Model.cpp Fri Jul 05 16:55:20 2019 +0100 +++ b/data/model/Model.cpp Fri Jul 05 16:55:27 2019 +0100 @@ -25,15 +25,6 @@ Model::~Model() { SVDEBUG << "Model::~Model: " << this << " with id " << getId() << endl; -/*!!! - if (!m_aboutToDelete) { - SVDEBUG << "NOTE: Model(" << this << ", \"" - << objectName() << "\", type uri <" - << m_typeUri << ">)::~Model(): Model deleted " - << "with no aboutToDelete notification" - << endl; - } -*/ //!!! see notes in header - sort this out /* if (!m_alignmentModel.isNone()) { @@ -45,13 +36,6 @@ void Model::setSourceModel(ModelId modelId) { -/*!!! - if (m_sourceModel) { - disconnect(m_sourceModel, SIGNAL(aboutToBeDeleted()), - this, SLOT(sourceModelAboutToBeDeleted())); - } -*/ - m_sourceModel = modelId; auto model = ModelById::get(m_sourceModel); @@ -59,45 +43,9 @@ connect(model.get(), SIGNAL(alignmentCompletionChanged(ModelId)), this, SIGNAL(alignmentCompletionChanged(ModelId))); } - - -/* - if (m_sourceModel) { - connect(m_sourceModel, SIGNAL(alignmentCompletionChanged()), - this, SIGNAL(alignmentCompletionChanged())); - connect(m_sourceModel, SIGNAL(aboutToBeDeleted()), - this, SLOT(sourceModelAboutToBeDeleted())); - } -*/ -} -/*!!! -void -Model::aboutToDelete() -{ - SVDEBUG << "Model(" << this << ", \"" - << objectName() << "\", type name \"" - << getTypeName() << "\", type uri <" - << m_typeUri << ">)::aboutToDelete()" << endl; - - if (m_aboutToDelete) { - SVDEBUG << "WARNING: Model(" << this << ", \"" - << objectName() << "\", type uri <" - << m_typeUri << ">)::aboutToDelete: " - << "aboutToDelete called more than once for the same model" - << endl; - } - - emit aboutToBeDeleted(); - m_aboutToDelete = true; } void -Model::sourceModelAboutToBeDeleted() -{ - m_sourceModel = nullptr; -} -*/ -void Model::setAlignment(ModelId alignmentModel) { SVDEBUG << "Model(" << this << "): accepting alignment model "