Mercurial > hg > svgui
comparison widgets/ItemEditDialog.cpp @ 1417:2487521e857b
Merge
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:44:16 +0000 |
parents | c8a6fd3f9dff |
children | 0fa49a6ce64f |
comparison
equal
deleted
inserted
replaced
1416:d794630429a7 | 1417:2487521e857b |
---|---|
33 QDialog(parent), | 33 QDialog(parent), |
34 m_sampleRate(sampleRate), | 34 m_sampleRate(sampleRate), |
35 m_defaultFrame(0), | 35 m_defaultFrame(0), |
36 m_defaultDuration(0), | 36 m_defaultDuration(0), |
37 m_defaultValue(0), | 37 m_defaultValue(0), |
38 m_frameTimeSpinBox(0), | 38 m_frameTimeSpinBox(nullptr), |
39 m_realTimeSecsSpinBox(0), | 39 m_realTimeSecsSpinBox(nullptr), |
40 m_realTimeUSecsSpinBox(0), | 40 m_realTimeUSecsSpinBox(nullptr), |
41 m_frameDurationSpinBox(0), | 41 m_frameDurationSpinBox(nullptr), |
42 m_realDurationSecsSpinBox(0), | 42 m_realDurationSecsSpinBox(nullptr), |
43 m_realDurationUSecsSpinBox(0), | 43 m_realDurationUSecsSpinBox(nullptr), |
44 m_valueSpinBox(0), | 44 m_valueSpinBox(nullptr), |
45 m_textField(0) | 45 m_textField(nullptr) |
46 { | 46 { |
47 QGridLayout *grid = new QGridLayout; | 47 QGridLayout *grid = new QGridLayout; |
48 setLayout(grid); | 48 setLayout(grid); |
49 | 49 |
50 QGroupBox *timeBox = 0; | 50 QGroupBox *timeBox = nullptr; |
51 QGroupBox *valueBox = 0; | 51 QGroupBox *valueBox = nullptr; |
52 QGridLayout *subgrid = 0; | 52 QGridLayout *subgrid = nullptr; |
53 | 53 |
54 int row = 0, subrow = 0; | 54 int row = 0, subrow = 0; |
55 | 55 |
56 int singleStep = RealTime::frame2RealTime(2, sampleRate).usec() - 1; | 56 int singleStep = RealTime::frame2RealTime(2, sampleRate).usec() - 1; |
57 | 57 |