diff options
Diffstat (limited to 'src/widgets/util/qscroller.cpp')
| -rw-r--r-- | src/widgets/util/qscroller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 38b104f9e9..5297c949a9 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -159,8 +159,8 @@ static qreal differentialForProgress(const QEasingCurve &curve, qreal pos) static qreal progressForValue(const QEasingCurve &curve, qreal value) { - if (curve.type() >= QEasingCurve::InElastic && - curve.type() < QEasingCurve::Custom) { + if (Q_UNLIKELY(curve.type() >= QEasingCurve::InElastic && + curve.type() < QEasingCurve::Custom)) { qWarning("progressForValue(): QEasingCurves of type %d do not have an inverse, since they are not injective.", curve.type()); return value; } @@ -1005,7 +1005,7 @@ bool QScroller::handleInput(Input input, const QPointF &position, qint64 timesta #if !defined(Q_DEAD_CODE_FROM_QT4_MAC) // the Mac version is implemented in qscroller_mac.mm -QPointF QScrollerPrivate::realDpi(int screen) +QPointF QScrollerPrivate::realDpi(int screen) const { # if defined(Q_DEAD_CODE_FROM_QT4_X11) && !defined(QT_NO_XRANDR) if (X11 && X11->use_xrandr && X11->ptrXRRSizes && X11->ptrXRRRootToScreen) { @@ -1176,9 +1176,9 @@ qreal QScrollerPrivate::scrollingSegmentsEndPos(Qt::Orientation orientation) con /*! \internal Checks if the scroller segment end in a valid position. */ -bool QScrollerPrivate::scrollingSegmentsValid(Qt::Orientation orientation) +bool QScrollerPrivate::scrollingSegmentsValid(Qt::Orientation orientation) const { - QQueue<ScrollSegment> *segments; + const QQueue<ScrollSegment> *segments; qreal minPos; qreal maxPos; @@ -1893,7 +1893,7 @@ void QScrollerPrivate::setContentPositionHelperScrolling() on a snap point. Returns the nearest snap position or NaN if no such point could be found. */ -qreal QScrollerPrivate::nextSnapPos(qreal p, int dir, Qt::Orientation orientation) +qreal QScrollerPrivate::nextSnapPos(qreal p, int dir, Qt::Orientation orientation) const { qreal bestSnapPos = Q_QNAN; qreal bestSnapPosDist = Q_INFINITY; |