summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-08-14 23:18:23 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-08-14 23:18:23 (GMT)
commitaa09d4f9c2d47348e6eac76e66500f4807b132a3 (patch)
tree5f8e8dd9c373b0c4901cd7f08fb6d4e895dfbe2f /src/3rdparty
parentef682d7d0043d5054818908ffe1ba573ef6cb01b (diff)
downloadQt-aa09d4f9c2d47348e6eac76e66500f4807b132a3.zip
Qt-aa09d4f9c2d47348e6eac76e66500f4807b132a3.tar.gz
Qt-aa09d4f9c2d47348e6eac76e66500f4807b132a3.tar.bz2
Fixed compile.
Put EffectParameter::userType back to EffectParameter::type.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/phonon/effectwidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/phonon/effectwidget.cpp b/src/3rdparty/phonon/phonon/effectwidget.cpp
index 8f105f2..fb9cf6e 100644
--- a/src/3rdparty/phonon/phonon/effectwidget.cpp
+++ b/src/3rdparty/phonon/phonon/effectwidget.cpp
@@ -111,7 +111,7 @@ void EffectWidgetPrivate::autogenerateUi()
#endif
QWidget *control = 0;
- switch (para.userType()) {
+ switch (para.type()) {
case QVariant::String:
{
QComboBox *cb = new QComboBox(q);
@@ -161,9 +161,9 @@ void EffectWidgetPrivate::autogenerateUi()
case QVariant::Double:
{
const qreal minValue = para.minimumValue().canConvert(QVariant::Double) ?
- para.minimumValue().toReal(&ok) : DEFAULT_MIN;
+ para.minimumValue().toReal() : DEFAULT_MIN;
const qreal maxValue = para.maximumValue().canConvert(QVariant::Double) ?
- para.maximumValue().toReal(&ok) : DEFAULT_MAX;
+ para.maximumValue().toReal() : DEFAULT_MAX;
if (minValue == -1. && maxValue == 1.) {
//Special case values between -1 and 1.0 to use a slider for improved usability