comparison layer/TextLayer.h @ 811:c4ef666721bf

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:51:27 +0100
parents 1d526ba11a24
children b66fb15de477
comparison
equal deleted inserted replaced
782:ddae586bc47b 811:c4ef666721bf
35 virtual void paint(View *v, QPainter &paint, QRect rect) const; 35 virtual void paint(View *v, QPainter &paint, QRect rect) const;
36 36
37 virtual QString getFeatureDescription(View *v, QPoint &) const; 37 virtual QString getFeatureDescription(View *v, QPoint &) const;
38 38
39 virtual bool snapToFeatureFrame(View *v, int &frame, 39 virtual bool snapToFeatureFrame(View *v, int &frame,
40 size_t &resolution, 40 int &resolution,
41 SnapType snap) const; 41 SnapType snap) const;
42 42
43 virtual void drawStart(View *v, QMouseEvent *); 43 virtual void drawStart(View *v, QMouseEvent *);
44 virtual void drawDrag(View *v, QMouseEvent *); 44 virtual void drawDrag(View *v, QMouseEvent *);
45 virtual void drawEnd(View *v, QMouseEvent *); 45 virtual void drawEnd(View *v, QMouseEvent *);
50 50
51 virtual void editStart(View *v, QMouseEvent *); 51 virtual void editStart(View *v, QMouseEvent *);
52 virtual void editDrag(View *v, QMouseEvent *); 52 virtual void editDrag(View *v, QMouseEvent *);
53 virtual void editEnd(View *v, QMouseEvent *); 53 virtual void editEnd(View *v, QMouseEvent *);
54 54
55 virtual void moveSelection(Selection s, size_t newStartFrame); 55 virtual void moveSelection(Selection s, int newStartFrame);
56 virtual void resizeSelection(Selection s, Selection newSize); 56 virtual void resizeSelection(Selection s, Selection newSize);
57 virtual void deleteSelection(Selection s); 57 virtual void deleteSelection(Selection s);
58 58
59 virtual void copy(View *v, Selection s, Clipboard &to); 59 virtual void copy(View *v, Selection s, Clipboard &to);
60 virtual bool paste(View *v, const Clipboard &from, int frameOffset, 60 virtual bool paste(View *v, const Clipboard &from, int frameOffset,