comparison data/model/AlignmentModel.cpp @ 1582:70e172e6cc59 fix-static-analysis

Use nullptr throughout
author Chris Cannam
date Mon, 26 Nov 2018 14:33:41 +0000
parents d3814e07b8aa
children 7a56bb85030f 901f37d32060
comparison
equal deleted inserted replaced
1581:ad5f892c0c4d 1582:70e172e6cc59
25 SparseTimeValueModel *path) : 25 SparseTimeValueModel *path) :
26 m_reference(reference), 26 m_reference(reference),
27 m_aligned(aligned), 27 m_aligned(aligned),
28 m_inputModel(inputModel), 28 m_inputModel(inputModel),
29 m_rawPath(path), 29 m_rawPath(path),
30 m_path(0), 30 m_path(nullptr),
31 m_reversePath(0), 31 m_reversePath(nullptr),
32 m_pathBegun(false), 32 m_pathBegun(false),
33 m_pathComplete(false) 33 m_pathComplete(false)
34 { 34 {
35 if (m_rawPath) { 35 if (m_rawPath) {
36 36
127 } 127 }
128 128
129 const ZoomConstraint * 129 const ZoomConstraint *
130 AlignmentModel::getZoomConstraint() const 130 AlignmentModel::getZoomConstraint() const
131 { 131 {
132 return 0; 132 return nullptr;
133 } 133 }
134 134
135 const Model * 135 const Model *
136 AlignmentModel::getReferenceModel() const 136 AlignmentModel::getReferenceModel() const
137 { 137 {
175 { 175 {
176 if (m_pathComplete) { 176 if (m_pathComplete) {
177 cerr << "AlignmentModel: deleting raw path model" << endl; 177 cerr << "AlignmentModel: deleting raw path model" << endl;
178 if (m_rawPath) m_rawPath->aboutToDelete(); 178 if (m_rawPath) m_rawPath->aboutToDelete();
179 delete m_rawPath; 179 delete m_rawPath;
180 m_rawPath = 0; 180 m_rawPath = nullptr;
181 } 181 }
182 } 182 }
183 183
184 void 184 void
185 AlignmentModel::pathChangedWithin(sv_frame_t, sv_frame_t) 185 AlignmentModel::pathChangedWithin(sv_frame_t, sv_frame_t)
212 constructPath(); 212 constructPath();
213 constructReversePath(); 213 constructReversePath();
214 214
215 if (m_inputModel) m_inputModel->aboutToDelete(); 215 if (m_inputModel) m_inputModel->aboutToDelete();
216 delete m_inputModel; 216 delete m_inputModel;
217 m_inputModel = 0; 217 m_inputModel = nullptr;
218 } 218 }
219 } 219 }
220 220
221 emit completionChanged(); 221 emit completionChanged();
222 } 222 }