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

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:18:55 +0100
parents 2564d0865feb
children c8a6fd3f9dff
line wrap: on
line diff
--- a/widgets/ItemEditDialog.cpp	Wed Mar 18 15:10:36 2015 +0000
+++ b/widgets/ItemEditDialog.cpp	Mon Apr 20 09:18:55 2015 +0100
@@ -76,7 +76,7 @@
         m_frameTimeSpinBox->setSuffix(tr(" frames"));
         subgrid->addWidget(m_frameTimeSpinBox, subrow, 1, 1, 2);
         connect(m_frameTimeSpinBox, SIGNAL(valueChanged(int)),
-                this, SLOT(frameTimeChanged(sv_frame_t)));
+                this, SLOT(frameTimeChanged(int)));
 
         ++subrow;
 
@@ -107,7 +107,7 @@
         m_frameDurationSpinBox->setSuffix(tr(" frames"));
         subgrid->addWidget(m_frameDurationSpinBox, subrow, 1, 1, 2);
         connect(m_frameDurationSpinBox, SIGNAL(valueChanged(int)),
-                this, SLOT(frameDurationChanged(sv_frame_t)));
+                this, SLOT(frameDurationChanged(int)));
 
         ++subrow;
 
@@ -287,7 +287,7 @@
 }
 
 void
-ItemEditDialog::frameTimeChanged(sv_frame_t i)
+ItemEditDialog::frameTimeChanged(int i)
 {
     m_realTimeSecsSpinBox->blockSignals(true);
     m_realTimeUSecsSpinBox->blockSignals(true);
@@ -322,7 +322,7 @@
 }
 
 void
-ItemEditDialog::frameDurationChanged(sv_frame_t i)
+ItemEditDialog::frameDurationChanged(int i)
 {
     m_realDurationSecsSpinBox->blockSignals(true);
     m_realDurationUSecsSpinBox->blockSignals(true);