Mercurial > hg > svcore
diff data/model/Model.cpp @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | 70e172e6cc59 |
children | 1d1a16968f03 f9b6e99e0520 |
line wrap: on
line diff
--- a/data/model/Model.cpp Wed Jan 23 10:31:40 2019 +0000 +++ b/data/model/Model.cpp Wed Jan 23 14:43:43 2019 +0000 @@ -94,7 +94,7 @@ void Model::sourceModelAboutToBeDeleted() { - m_sourceModel = 0; + m_sourceModel = nullptr; } void @@ -124,7 +124,7 @@ { if (!m_alignment) { if (m_sourceModel) return m_sourceModel->getAlignmentReference(); - return 0; + return nullptr; } return m_alignment->getReferenceModel(); }