Mercurial > hg > svcore

comparison data/model/Model.cpp @ 1027:ce1077bd663a cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 09 Feb 2015 10:31:07 +0000
parents 4a2c150ecd67
children cc27f35aa75c
comparison
equal deleted inserted replaced
1011:dbb7f0ab011e 1027:ce1077bd663a
83 { 83 {
84 if (m_alignment) { 84 if (m_alignment) {
85 m_alignment->aboutToDelete(); 85 m_alignment->aboutToDelete();
86 delete m_alignment; 86 delete m_alignment;
87 } 87 }
88
88 m_alignment = alignment; 89 m_alignment = alignment;
89 connect(m_alignment, SIGNAL(completionChanged()), 90
90 this, SIGNAL(alignmentCompletionChanged())); 91 if (m_alignment) {
92 connect(m_alignment, SIGNAL(completionChanged()),
93 this, SIGNAL(alignmentCompletionChanged()));
94 }
91 } 95 }
92 96
93 const AlignmentModel * 97 const AlignmentModel *
94 Model::getAlignment() const 98 Model::getAlignment() const
95 { 99 {