comparison layer/Layer.h @ 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 dd64efa0dac8
children 4c8ca536b54f
comparison
equal deleted inserted replaced
782:ddae586bc47b 805:1d526ba11a24
148 148
149 virtual QString getFeatureDescription(View *, QPoint &) const { 149 virtual QString getFeatureDescription(View *, QPoint &) const {
150 return ""; 150 return "";
151 } 151 }
152 152
153 virtual QString getLabelPreceding(size_t /* frame */) const { 153 virtual QString getLabelPreceding(int /* frame */) const {
154 return ""; 154 return "";
155 } 155 }
156 156
157 enum SnapType { 157 enum SnapType {
158 SnapLeft, 158 SnapLeft,
180 * (and leave frame unmodified). If returning true, also return 180 * (and leave frame unmodified). If returning true, also return
181 * the resolution of the model in this layer in sample frames. 181 * the resolution of the model in this layer in sample frames.
182 */ 182 */
183 virtual bool snapToFeatureFrame(View * /* v */, 183 virtual bool snapToFeatureFrame(View * /* v */,
184 int & /* frame */, 184 int & /* frame */,
185 size_t &resolution, 185 int &resolution,
186 SnapType /* snap */) const { 186 SnapType /* snap */) const {
187 resolution = 1; 187 resolution = 1;
188 return false; 188 return false;
189 } 189 }
190 190
204 * (and leave frame unmodified). If returning true, also return 204 * (and leave frame unmodified). If returning true, also return
205 * the resolution of the model in this layer in sample frames. 205 * the resolution of the model in this layer in sample frames.
206 */ 206 */
207 virtual bool snapToSimilarFeature(View * /* v */, 207 virtual bool snapToSimilarFeature(View * /* v */,
208 int & /* source frame */, 208 int & /* source frame */,
209 size_t &resolution, 209 int &resolution,
210 SnapType /* snap */) const { 210 SnapType /* snap */) const {
211 resolution = 1; 211 resolution = 1;
212 return false; 212 return false;
213 } 213 }
214 214
252 * double-click). If there is no item or editing is not 252 * double-click). If there is no item or editing is not
253 * supported, return false. 253 * supported, return false.
254 */ 254 */
255 virtual bool editOpen(View *, QMouseEvent *) { return false; } 255 virtual bool editOpen(View *, QMouseEvent *) { return false; }
256 256
257 virtual void moveSelection(Selection, size_t /* newStartFrame */) { } 257 virtual void moveSelection(Selection, int /* newStartFrame */) { }
258 virtual void resizeSelection(Selection, Selection /* newSize */) { } 258 virtual void resizeSelection(Selection, Selection /* newSize */) { }
259 virtual void deleteSelection(Selection) { } 259 virtual void deleteSelection(Selection) { }
260 260
261 virtual void copy(View *, Selection, Clipboard & /* to */) { } 261 virtual void copy(View *, Selection, Clipboard & /* to */) { }
262 262
523 523
524 signals: 524 signals:
525 void modelChanged(); 525 void modelChanged();
526 void modelCompletionChanged(); 526 void modelCompletionChanged();
527 void modelAlignmentCompletionChanged(); 527 void modelAlignmentCompletionChanged();
528 void modelChanged(size_t startFrame, size_t endFrame); 528 void modelChanged(int startFrame, int endFrame);
529 void modelReplaced(); 529 void modelReplaced();
530 530
531 void layerParametersChanged(); 531 void layerParametersChanged();
532 void layerParameterRangesChanged(); 532 void layerParameterRangesChanged();
533 void layerMeasurementRectsChanged(); 533 void layerMeasurementRectsChanged();
536 void verticalZoomChanged(); 536 void verticalZoomChanged();
537 537
538 protected: 538 protected:
539 void connectSignals(const Model *); 539 void connectSignals(const Model *);
540 540
541 virtual size_t alignToReference(View *v, size_t frame) const; 541 virtual int alignToReference(View *v, int frame) const;
542 virtual size_t alignFromReference(View *v, size_t frame) const; 542 virtual int alignFromReference(View *v, int frame) const;
543 bool clipboardHasDifferentAlignment(View *v, const Clipboard &clip) const; 543 bool clipboardHasDifferentAlignment(View *v, const Clipboard &clip) const;
544 544
545 struct MeasureRect { 545 struct MeasureRect {
546 546
547 mutable QRect pixrect; 547 mutable QRect pixrect;