diff options
Diffstat (limited to 'src/quick/util/qquicktimeline.cpp')
| -rw-r--r-- | src/quick/util/qquicktimeline.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/quick/util/qquicktimeline.cpp b/src/quick/util/qquicktimeline.cpp index d8cf9bd877..5305537d24 100644 --- a/src/quick/util/qquicktimeline.cpp +++ b/src/quick/util/qquicktimeline.cpp @@ -81,7 +81,7 @@ struct QQuickTimeLinePrivate Execute }; Op() {} - Op(Type t, int l, qreal v, qreal v2, int o, + Op(Type t, int l, qreal v, qreal v2, int o, const QQuickTimeLineCallback &ev = QQuickTimeLineCallback(), const QEasingCurve &es = QEasingCurve()) : type(t), length(l), value(v), value2(v2), order(o), event(ev), easing(es) {} @@ -89,8 +89,8 @@ struct QQuickTimeLinePrivate : type(o.type), length(o.length), value(o.value), value2(o.value2), order(o.order), event(o.event), easing(o.easing) {} Op &operator=(const Op &o) { - type = o.type; length = o.length; value = o.value; - value2 = o.value2; order = o.order; event = o.event; + type = o.type; length = o.length; value = o.value; + value2 = o.value2; order = o.order; event = o.event; easing = o.easing; return *this; } @@ -604,8 +604,8 @@ void QQuickTimeLine::sync(QQuickTimeLineValue &timeLineValue) d->syncPoint = d->length; }*/ -/*! - \internal +/*! + \internal Temporary hack. */ @@ -614,9 +614,9 @@ void QQuickTimeLine::setSyncPoint(int sp) d->syncPoint = sp; } -/*! - \internal - +/*! + \internal + Temporary hack. */ int QQuickTimeLine::syncPoint() const @@ -739,7 +739,7 @@ int QQuickTimeLinePrivate::advance(int t) TimeLine &tl = *iter; Op &op = tl.ops.first(); int length = op.length - tl.consumedOpLength; - + if (length < advanceTime) { advanceTime = length; if (advanceTime == 0) @@ -748,7 +748,7 @@ int QQuickTimeLinePrivate::advance(int t) } t -= advanceTime; - // Process until then. A zero length advance time will only process + // Process until then. A zero length advance time will only process // sets. QList<QPair<int, Update> > updates; @@ -762,8 +762,8 @@ int QQuickTimeLinePrivate::advance(int t) if (advanceTime == 0 && op.length != 0) continue; - if (tl.consumedOpLength == 0 && - op.type != Op::Pause && + if (tl.consumedOpLength == 0 && + op.type != Op::Pause && op.type != Op::Execute) tl.base = v->value(); |