diff widgets/ItemEditDialog.h @ 945:bb80983c9e61 osx-retina

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:18:55 +0100
parents 2564d0865feb
children 05d614f6e46d
line wrap: on
line diff
--- a/widgets/ItemEditDialog.h	Wed Mar 18 15:10:36 2015 +0000
+++ b/widgets/ItemEditDialog.h	Mon Apr 20 09:18:55 2015 +0100
@@ -59,10 +59,10 @@
     QString getText() const;
 
 protected slots:
-    void frameTimeChanged(sv_frame_t);
+    void frameTimeChanged(int); // must be int as invoked from int signal
     void realTimeSecsChanged(int);
     void realTimeUSecsChanged(int);
-    void frameDurationChanged(sv_frame_t);
+    void frameDurationChanged(int); // must be int as invoked from int signal
     void realDurationSecsChanged(int);
     void realDurationUSecsChanged(int);
     void valueChanged(double);