Mercurial > hg > svcore
comparison data/model/ModelDataTableModel.cpp @ 1770:dffc70996f54
Correct some erroneous signal signatures
author | Chris Cannam |
---|---|
date | Fri, 19 Jul 2019 16:10:00 +0100 |
parents | 91a194e2d80b |
children |
comparison
equal
deleted
inserted
replaced
1769:9a8327e7b2dc | 1770:dffc70996f54 |
---|---|
28 m_sortOrdering(Qt::AscendingOrder), | 28 m_sortOrdering(Qt::AscendingOrder), |
29 m_currentRow(0) | 29 m_currentRow(0) |
30 { | 30 { |
31 auto model = ModelById::get(m); | 31 auto model = ModelById::get(m); |
32 if (model) { | 32 if (model) { |
33 connect(model.get(), SIGNAL(modelChanged()), this, SLOT(modelChanged())); | 33 connect(model.get(), SIGNAL(modelChanged(ModelId)), |
34 connect(model.get(), SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)), | 34 this, SLOT(modelChanged(ModelId))); |
35 this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t))); | 35 connect(model.get(), SIGNAL(modelChangedWithin(ModelId, sv_frame_t, sv_frame_t)), |
36 this, SLOT(modelChangedWithin(ModelId, sv_frame_t, sv_frame_t))); | |
36 } | 37 } |
37 } | 38 } |
38 | 39 |
39 ModelDataTableModel::~ModelDataTableModel() | 40 ModelDataTableModel::~ModelDataTableModel() |
40 { | 41 { |
214 } | 215 } |
215 emit layoutChanged(); | 216 emit layoutChanged(); |
216 } | 217 } |
217 | 218 |
218 void | 219 void |
219 ModelDataTableModel::modelChanged() | 220 ModelDataTableModel::modelChanged(ModelId) |
220 { | 221 { |
221 SVDEBUG << "ModelDataTableModel::modelChanged" << endl; | 222 SVDEBUG << "ModelDataTableModel::modelChanged" << endl; |
222 QModelIndex ix0; | 223 QModelIndex ix0; |
223 QModelIndex ix1; | 224 QModelIndex ix1; |
224 if (rowCount() > 0) { | 225 if (rowCount() > 0) { |
232 clearSort(); | 233 clearSort(); |
233 emit layoutChanged(); | 234 emit layoutChanged(); |
234 } | 235 } |
235 | 236 |
236 void | 237 void |
237 ModelDataTableModel::modelChangedWithin(sv_frame_t f0, sv_frame_t f1) | 238 ModelDataTableModel::modelChangedWithin(ModelId, sv_frame_t f0, sv_frame_t f1) |
238 { | 239 { |
239 SVDEBUG << "ModelDataTableModel::modelChangedWithin(" << f0 << "," << f1 << ")" << endl; | 240 SVDEBUG << "ModelDataTableModel::modelChangedWithin(" << f0 << "," << f1 << ")" << endl; |
240 QModelIndex ix0 = getModelIndexForFrame(f0); | 241 QModelIndex ix0 = getModelIndexForFrame(f0); |
241 QModelIndex ix1 = getModelIndexForFrame(f1); | 242 QModelIndex ix1 = getModelIndexForFrame(f1); |
242 int row0 = ix0.row(); | 243 int row0 = ix0.row(); |