diff options
Diffstat (limited to 'src/templates/qquickprogressbar.cpp')
-rw-r--r-- | src/templates/qquickprogressbar.cpp | 75 |
1 files changed, 40 insertions, 35 deletions
diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index 972654ad..8596128f 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \instantiates QQuickProgressBar \inqmlmodule Qt.labs.controls \ingroup qtlabscontrols-indicators - \brief A progress bar control. + \brief Indicates the progress of an operation. ProgressBar indicates the progress of an operation. @@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate : public QQuickControlPrivate { public: - QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false), indicator(Q_NULLPTR) + QQuickProgressBarPrivate() : from(0), to(1.0), value(0), indeterminate(false), indicator(nullptr) { } @@ -102,14 +102,15 @@ qreal QQuickProgressBar::from() const void QQuickProgressBar::setFrom(qreal from) { Q_D(QQuickProgressBar); - if (!qFuzzyCompare(d->from, from)) { - d->from = from; - emit fromChanged(); - emit positionChanged(); - emit visualPositionChanged(); - if (isComponentComplete()) - setValue(d->value); - } + if (qFuzzyCompare(d->from, from)) + return; + + d->from = from; + emit fromChanged(); + emit positionChanged(); + emit visualPositionChanged(); + if (isComponentComplete()) + setValue(d->value); } /*! @@ -128,14 +129,15 @@ qreal QQuickProgressBar::to() const void QQuickProgressBar::setTo(qreal to) { Q_D(QQuickProgressBar); - if (!qFuzzyCompare(d->to, to)) { - d->to = to; - emit toChanged(); - emit positionChanged(); - emit visualPositionChanged(); - if (isComponentComplete()) - setValue(d->value); - } + if (qFuzzyCompare(d->to, to)) + return; + + d->to = to; + emit toChanged(); + emit positionChanged(); + emit visualPositionChanged(); + if (isComponentComplete()) + setValue(d->value); } /*! @@ -157,12 +159,13 @@ void QQuickProgressBar::setValue(qreal value) if (isComponentComplete()) value = d->from > d->to ? qBound(d->to, value, d->from) : qBound(d->from, value, d->to); - if (!qFuzzyCompare(d->value, value)) { - d->value = value; - emit valueChanged(); - emit positionChanged(); - emit visualPositionChanged(); - } + if (qFuzzyCompare(d->value, value)) + return; + + d->value = value; + emit valueChanged(); + emit positionChanged(); + emit visualPositionChanged(); } /*! @@ -219,10 +222,11 @@ bool QQuickProgressBar::isIndeterminate() const void QQuickProgressBar::setIndeterminate(bool indeterminate) { Q_D(QQuickProgressBar); - if (d->indeterminate != indeterminate) { - d->indeterminate = indeterminate; - emit indeterminateChanged(); - } + if (d->indeterminate == indeterminate) + return; + + d->indeterminate = indeterminate; + emit indeterminateChanged(); } /*! @@ -241,13 +245,14 @@ QQuickItem *QQuickProgressBar::indicator() const void QQuickProgressBar::setIndicator(QQuickItem *indicator) { Q_D(QQuickProgressBar); - if (d->indicator != indicator) { - delete d->indicator; - d->indicator = indicator; - if (indicator && !indicator->parentItem()) - indicator->setParentItem(this); - emit indicatorChanged(); - } + if (d->indicator == indicator) + return; + + delete d->indicator; + d->indicator = indicator; + if (indicator && !indicator->parentItem()) + indicator->setParentItem(this); + emit indicatorChanged(); } void QQuickProgressBar::mirrorChange() |