Mercurial > hg > svcore
comparison data/model/Model.cpp @ 847:2d53205f70cd tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 14:37:01 +0000 |
parents | e802e550a1f2 |
children | 59e7fe1b1003 |
comparison
equal
deleted
inserted
replaced
841:226733f3cf3f | 847:2d53205f70cd |
---|---|
57 } | 57 } |
58 | 58 |
59 void | 59 void |
60 Model::aboutToDelete() | 60 Model::aboutToDelete() |
61 { | 61 { |
62 // std::cerr << "Model(" << this << ")::aboutToDelete()" << std::endl; | 62 // cerr << "Model(" << this << ")::aboutToDelete()" << endl; |
63 | 63 |
64 if (m_aboutToDelete) { | 64 if (m_aboutToDelete) { |
65 std::cerr << "WARNING: Model(" << this << ", \"" | 65 cerr << "WARNING: Model(" << this << ", \"" |
66 << objectName() << "\")::aboutToDelete: " | 66 << objectName() << "\")::aboutToDelete: " |
67 << "aboutToDelete called more than once for the same model" | 67 << "aboutToDelete called more than once for the same model" |
68 << std::endl; | 68 << endl; |
69 } | 69 } |
70 | 70 |
71 emit aboutToBeDeleted(); | 71 emit aboutToBeDeleted(); |
72 m_aboutToDelete = true; | 72 m_aboutToDelete = true; |
73 } | 73 } |
139 if (m_sourceModel) return m_sourceModel->getAlignmentCompletion(); | 139 if (m_sourceModel) return m_sourceModel->getAlignmentCompletion(); |
140 else return 100; | 140 else return 100; |
141 } | 141 } |
142 int completion = 0; | 142 int completion = 0; |
143 (void)m_alignment->isReady(&completion); | 143 (void)m_alignment->isReady(&completion); |
144 // std::cerr << " -> " << completion << std::endl; | 144 // cerr << " -> " << completion << endl; |
145 return completion; | 145 return completion; |
146 } | 146 } |
147 | 147 |
148 QString | 148 QString |
149 Model::getTitle() const | 149 Model::getTitle() const |