Mercurial > hg > svgui

diff layer/ImageLayer.h @ 810:b68af2be4545 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:25 +0100
parents 4c8ca536b54f
children b66fb15de477
line wrap: on
line diff
--- a/layer/ImageLayer.h	Mon Jun 16 12:50:27 2014 +0100
+++ b/layer/ImageLayer.h	Wed Jun 18 13:42:25 2014 +0100
@@ -43,7 +43,7 @@
     virtual QString getFeatureDescription(View *v, QPoint &) const;
 
     virtual bool snapToFeatureFrame(View *v, int &frame,
-				    size_t &resolution,
+				    int &resolution,
 				    SnapType snap) const;
 
     virtual void drawStart(View *v, QMouseEvent *);
@@ -54,7 +54,7 @@
     virtual void editDrag(View *v, QMouseEvent *);
     virtual void editEnd(View *v, QMouseEvent *);
 
-    virtual void moveSelection(Selection s, size_t newStartFrame);
+    virtual void moveSelection(Selection s, int newStartFrame);
     virtual void resizeSelection(Selection s, Selection newSize);
     virtual void deleteSelection(Selection s);
 
@@ -98,7 +98,7 @@
 
     void setProperties(const QXmlAttributes &attributes);
 
-    virtual bool addImage(long frame, QString url); // using a command
+    virtual bool addImage(int frame, QString url); // using a command
 
 protected slots:
     void checkAddSources();