Mercurial > hg > svgui
comparison widgets/ItemEditDialog.cpp @ 860:4a5d144bd5d0 tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 16:36:21 +0100 |
parents | 44675ab217a3 |
children | e0f08e108064 |
comparison
equal
deleted
inserted
replaced
842:8432d2551fb2 | 860:4a5d144bd5d0 |
---|---|
30 | 30 |
31 ItemEditDialog::ItemEditDialog(int sampleRate, int options, | 31 ItemEditDialog::ItemEditDialog(int sampleRate, int options, |
32 QString valueUnits, QWidget *parent) : | 32 QString valueUnits, QWidget *parent) : |
33 QDialog(parent), | 33 QDialog(parent), |
34 m_sampleRate(sampleRate), | 34 m_sampleRate(sampleRate), |
35 m_defaultFrame(0), | |
36 m_defaultDuration(0), | |
37 m_defaultValue(0), | |
35 m_frameTimeSpinBox(0), | 38 m_frameTimeSpinBox(0), |
36 m_realTimeSecsSpinBox(0), | 39 m_realTimeSecsSpinBox(0), |
37 m_realTimeUSecsSpinBox(0), | 40 m_realTimeUSecsSpinBox(0), |
38 m_frameDurationSpinBox(0), | 41 m_frameDurationSpinBox(0), |
39 m_realDurationSecsSpinBox(0), | 42 m_realDurationSecsSpinBox(0), |