diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-10-21 15:22:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-22 12:34:05 +0200 |
| commit | 7dd2deb44b65bf3447d8688d24140175af17f06d (patch) | |
| tree | f86f715f0ad95cb59fa03bc11c492e02bd3a84dc /src/quick/items/qquickflickable.cpp | |
| parent | c7e7a650cd0a3cdcfd48b83c8d80c9d210a2662f (diff) | |
Remove ancient and unused leftovers
Change-Id: Ia3a2aa2244748c2f3f2df8853f5bddfbbc4bc19f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index b94d8dd4b0..f0a68b184a 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -948,16 +948,15 @@ void QQuickFlickable::setPixelAligned(bool align) qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event) { - if (0 != event->timestamp() && QQuickItemPrivate::consistentTime == -1) + if (0 != event->timestamp()) return event->timestamp(); - - return QQuickItemPrivate::elapsed(timer); + return timer.elapsed(); } void QQuickFlickablePrivate::handleMousePressEvent(QMouseEvent *event) { Q_Q(QQuickFlickable); - QQuickItemPrivate::start(timer); + timer.start(); if (interactive && timeline.isActive() && ((qAbs(hData.smoothVelocity.value()) > RetainGrabVelocity && !hData.fixingUp && !hData.inOvershoot) || (qAbs(vData.smoothVelocity.value()) > RetainGrabVelocity && !vData.fixingUp && !vData.inOvershoot))) { @@ -1016,8 +1015,8 @@ void QQuickFlickablePrivate::handleMousePressEvent(QMouseEvent *event) if (wasFlicking) emit q->flickingChanged(); lastPosTime = lastPressTime = computeCurrentTime(event); - QQuickItemPrivate::start(vData.velocityTime); - QQuickItemPrivate::start(hData.velocityTime); + vData.velocityTime.start(); + hData.velocityTime.start(); } void QQuickFlickablePrivate::handleMouseMoveEvent(QMouseEvent *event) @@ -1466,7 +1465,7 @@ void QQuickFlickablePrivate::viewportAxisMoved(AxisData &data, qreal minExtent, QQuickTimeLineCallback::Callback fixupCallback) { if (pressed || calcVelocity) { - int elapsed = QQuickItemPrivate::restart(data.velocityTime); + int elapsed = data.velocityTime.restart(); if (elapsed > 0) { qreal velocity = (data.lastPos - data.move.value()) * 1000 / elapsed; if (qAbs(velocity) > 0) { |