Mercurial > hg > svgui
changeset 938:2564d0865feb tonioni
Signal/slot compatibility fixes
| author | Chris Cannam |
|---|---|
| date | Mon, 30 Mar 2015 17:27:44 +0100 |
| parents | 5a978d540d55 |
| children | 8744bb5d9fd0 |
| files | widgets/ItemEditDialog.cpp widgets/ItemEditDialog.h widgets/LevelPanWidget.cpp |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/widgets/ItemEditDialog.cpp Mon Mar 30 14:28:37 2015 +0100 +++ b/widgets/ItemEditDialog.cpp Mon Mar 30 17:27:44 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);
--- a/widgets/ItemEditDialog.h Mon Mar 30 14:28:37 2015 +0100 +++ b/widgets/ItemEditDialog.h Mon Mar 30 17:27:44 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);
--- a/widgets/LevelPanWidget.cpp Mon Mar 30 14:28:37 2015 +0100 +++ b/widgets/LevelPanWidget.cpp Mon Mar 30 17:27:44 2015 +0100 @@ -266,7 +266,7 @@ QPen pen; double thin = thinLineWidth(rect); - + pen.setColor(QColor(127, 127, 127, 127)); pen.setWidthF(cellLightSize(rect).width() + thin); pen.setCapStyle(Qt::RoundCap);