comparison layer/Layer.cpp @ 805:1d526ba11a24 warnfix_no_size_t

Remove size_t's and fix warnings in layer/
author Chris Cannam
date Tue, 17 Jun 2014 15:18:06 +0100
parents 1a0dfcbffaf1
children 4c8ca536b54f
comparison
equal deleted inserted replaced
782:ddae586bc47b 805:1d526ba11a24
49 Layer::connectSignals(const Model *model) 49 Layer::connectSignals(const Model *model)
50 { 50 {
51 connect(model, SIGNAL(modelChanged()), 51 connect(model, SIGNAL(modelChanged()),
52 this, SIGNAL(modelChanged())); 52 this, SIGNAL(modelChanged()));
53 53
54 connect(model, SIGNAL(modelChanged(size_t, size_t)), 54 connect(model, SIGNAL(modelChanged(int, int)),
55 this, SIGNAL(modelChanged(size_t, size_t))); 55 this, SIGNAL(modelChanged(int, int)));
56 56
57 connect(model, SIGNAL(completionChanged()), 57 connect(model, SIGNAL(completionChanged()),
58 this, SIGNAL(modelCompletionChanged())); 58 this, SIGNAL(modelCompletionChanged()));
59 59
60 connect(model, SIGNAL(alignmentCompletionChanged()), 60 connect(model, SIGNAL(alignmentCompletionChanged()),
163 } 163 }
164 diff = fabsf(v1 - v0); 164 diff = fabsf(v1 - v0);
165 return true; 165 return true;
166 } 166 }
167 167
168 size_t 168 int
169 Layer::alignToReference(View *v, size_t frame) const 169 Layer::alignToReference(View *v, int frame) const
170 { 170 {
171 const Model *m = getModel(); 171 const Model *m = getModel();
172 SVDEBUG << "Layer::alignToReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl; 172 SVDEBUG << "Layer::alignToReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl;
173 if (m && m->getAlignmentReference()) { 173 if (m && m->getAlignmentReference()) {
174 return m->alignToReference(frame); 174 return m->alignToReference(frame);
175 } else { 175 } else {
176 return v->alignToReference(frame); 176 return v->alignToReference(frame);
177 } 177 }
178 } 178 }
179 179
180 size_t 180 int
181 Layer::alignFromReference(View *v, size_t frame) const 181 Layer::alignFromReference(View *v, int frame) const
182 { 182 {
183 const Model *m = getModel(); 183 const Model *m = getModel();
184 SVDEBUG << "Layer::alignFromReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl; 184 SVDEBUG << "Layer::alignFromReference(" << frame << "): model = " << m << ", alignment reference = " << (m ? m->getAlignmentReference() : 0) << endl;
185 if (m && m->getAlignmentReference()) { 185 if (m && m->getAlignmentReference()) {
186 return m->alignFromReference(frame); 186 return m->alignFromReference(frame);
403 403
404 m_haveDraggingRect = false; 404 m_haveDraggingRect = false;
405 } 405 }
406 406
407 void 407 void
408 Layer::measureDoubleClick(View *v, QMouseEvent *e) 408 Layer::measureDoubleClick(View *, QMouseEvent *)
409 { 409 {
410 // nothing, in the base class 410 // nothing, in the base class
411 } 411 }
412 412
413 void 413 void