comparison data/model/ModelDataTableModel.cpp @ 1050:5ad98be7f635 cxx11

Merge
author Chris Cannam
date Tue, 10 Mar 2015 20:03:08 +0000
parents 2f49be7d4264
children cbdd534f517a
comparison
equal deleted inserted replaced
1049:10055a284716 1050:5ad98be7f635
29 m_currentRow(0) 29 m_currentRow(0)
30 { 30 {
31 Model *baseModel = dynamic_cast<Model *>(m); 31 Model *baseModel = dynamic_cast<Model *>(m);
32 32
33 connect(baseModel, SIGNAL(modelChanged()), this, SLOT(modelChanged())); 33 connect(baseModel, SIGNAL(modelChanged()), this, SLOT(modelChanged()));
34 connect(baseModel, SIGNAL(modelChangedWithin(int, int)), 34 connect(baseModel, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)),
35 this, SLOT(modelChangedWithin(int, int))); 35 this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t)));
36 connect(baseModel, SIGNAL(aboutToBeDeleted()), 36 connect(baseModel, SIGNAL(aboutToBeDeleted()),
37 this, SLOT(modelAboutToBeDeleted())); 37 this, SLOT(modelAboutToBeDeleted()));
38 } 38 }
39 39
40 ModelDataTableModel::~ModelDataTableModel() 40 ModelDataTableModel::~ModelDataTableModel()
217 clearSort(); 217 clearSort();
218 emit layoutChanged(); 218 emit layoutChanged();
219 } 219 }
220 220
221 void 221 void
222 ModelDataTableModel::modelChangedWithin(int, int) 222 ModelDataTableModel::modelChangedWithin(sv_frame_t, sv_frame_t)
223 { 223 {
224 //!!! inefficient 224 //!!! inefficient
225 clearSort(); 225 clearSort();
226 emit layoutChanged(); 226 emit layoutChanged();
227 } 227 }