diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-05-08 17:47:36 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-05-09 16:19:25 +0000 |
commit | 55654fa836be9190b693fd9eb6383e1e8ad46665 (patch) | |
tree | d349625cf2dba5a14f4ffcab2cc0cdb647d060d5 | |
parent | a28cda6f99a05ef2e44a476ac1d35c21c6f1f61b (diff) |
Fix some style issues
Change-Id: Ia635d03f92834db55208dc38211d7892569040ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r-- | src/imports/timeline/qquickkeyframe.cpp | 2 | ||||
-rw-r--r-- | src/imports/timeline/qquicktimelineanimation.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp index b76c67e..1736dd2 100644 --- a/src/imports/timeline/qquickkeyframe.cpp +++ b/src/imports/timeline/qquickkeyframe.cpp @@ -159,7 +159,6 @@ public: QQuickKeyframe::QQuickKeyframe(QObject *parent) : QObject(*(new QQuickKeyframePrivate), parent) { - } qreal QQuickKeyframe::frame() const @@ -187,7 +186,6 @@ void QQuickKeyframe::reset() QQuickKeyframe::QQuickKeyframe(QQuickKeyframePrivate &dd, QObject *parent) : QObject(dd, parent) { - } /*! diff --git a/src/imports/timeline/qquicktimelineanimation.cpp b/src/imports/timeline/qquicktimelineanimation.cpp index 06da183..fcdace1 100644 --- a/src/imports/timeline/qquicktimelineanimation.cpp +++ b/src/imports/timeline/qquicktimelineanimation.cpp @@ -123,9 +123,8 @@ void QQuickTimelineAnimation::handleStopped() auto *privateObject = static_cast<QQuickPropertyAnimationPrivate*>(QObjectPrivate::get(this)); - if (m_reversed) { + if (m_reversed) m_currentLoop++; - } if (!(privateObject->animationInstance->currentTime() < privateObject->duration) && (m_currentLoop < m_originalLoop @@ -136,9 +135,9 @@ void QQuickTimelineAnimation::handleStopped() QQuickTimelineAnimation::start(); } else { - if (m_reversed) { + if (m_reversed) swapStartEnd(privateObject); - } + m_originalStart = true; m_reversed = false; privateObject->loopCount = m_originalLoop; |