diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-05-08 17:15:58 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2019-05-09 13:03:35 +0000 |
commit | a28cda6f99a05ef2e44a476ac1d35c21c6f1f61b (patch) | |
tree | 6f3ef42cccadc774eaa733c23513b3f312c31b86 /src/imports/timeline/qquicktimeline.cpp | |
parent | 2c0a1eb6b6d723d687819ff4b9c2519c35d31f8b (diff) |
Sanitize the code base
Change-Id: I58c006a12e90ac05e2286c28f08be0dca6d78532
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/imports/timeline/qquicktimeline.cpp')
-rw-r--r-- | src/imports/timeline/qquicktimeline.cpp | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp index 0097a65..5e3f409 100644 --- a/src/imports/timeline/qquicktimeline.cpp +++ b/src/imports/timeline/qquicktimeline.cpp @@ -39,18 +39,13 @@ class QQuickTimelinePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQuickTimeline) public: - QQuickTimelinePrivate() - : startFrame(0), - endFrame(0), - currentFrame(0), - enabled(false), - componentComplete(true) + QQuickTimelinePrivate() : enabled(false), componentComplete(false) { } - qreal startFrame; - qreal endFrame; - qreal currentFrame; + qreal startFrame = 0; + qreal endFrame = 0; + qreal currentFrame = 0; bool enabled:1; bool componentComplete:1; @@ -69,7 +64,6 @@ protected: static QQuickTimelineAnimation* animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, int pos); static void clear_animations(QQmlListProperty<QQuickTimelineAnimation> *list); - QList<QQuickKeyframeGroup *> keyframes; QList<QQuickTimelineAnimation *> animations; }; @@ -90,25 +84,25 @@ void QQuickTimelinePrivate::disable() void QQuickTimelinePrivate::append_keyframe(QQmlListProperty<QQuickKeyframeGroup> *list, QQuickKeyframeGroup *a) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); q->d_func()->keyframes.append(a); } int QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); return q->d_func()->keyframes.count(); } QQuickKeyframeGroup* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); return q->d_func()->keyframes.at(pos); } void QQuickTimelinePrivate::clear_keyframes(QQmlListProperty<QQuickKeyframeGroup> *list) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); while (q->d_func()->keyframes.count()) { QQuickKeyframeGroup *firstKeyframe = q->d_func()->keyframes.at(0); q->d_func()->keyframes.removeAll(firstKeyframe); @@ -117,26 +111,26 @@ void QQuickTimelinePrivate::clear_keyframes(QQmlListProperty<QQuickKeyframeGroup void QQuickTimelinePrivate::append_animation(QQmlListProperty<QQuickTimelineAnimation> *list, QQuickTimelineAnimation *a) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); a->setTargetObject(q); q->d_func()->animations.append(a); } int QQuickTimelinePrivate::animation_count(QQmlListProperty<QQuickTimelineAnimation> *list) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); return q->d_func()->animations.count(); } QQuickTimelineAnimation* QQuickTimelinePrivate::animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, int pos) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); return q->d_func()->animations.at(pos); } void QQuickTimelinePrivate::clear_animations(QQmlListProperty<QQuickTimelineAnimation> *list) { - QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object); + auto q = static_cast<QQuickTimeline *>(list->object); while (q->d_func()->animations.count()) { QQuickTimelineAnimation *firstAnimation = q->d_func()->animations.at(0); q->d_func()->animations.removeAll(firstAnimation); @@ -220,20 +214,20 @@ QQmlListProperty<QQuickKeyframeGroup> QQuickTimeline::keyframes() { Q_D(QQuickTimeline); - return QQmlListProperty<QQuickKeyframeGroup>(this, &d->keyframes, QQuickTimelinePrivate::append_keyframe, - QQuickTimelinePrivate::keyframe_count, - QQuickTimelinePrivate::keyframe_at, - QQuickTimelinePrivate::clear_keyframes); + return { this, &d->keyframes, QQuickTimelinePrivate::append_keyframe, + QQuickTimelinePrivate::keyframe_count, + QQuickTimelinePrivate::keyframe_at, + QQuickTimelinePrivate::clear_keyframes }; } QQmlListProperty<QQuickTimelineAnimation> QQuickTimeline::animations() { Q_D(QQuickTimeline); - return QQmlListProperty<QQuickTimelineAnimation>(this, &d->animations, QQuickTimelinePrivate::append_animation, - QQuickTimelinePrivate::animation_count, - QQuickTimelinePrivate::animation_at, - QQuickTimelinePrivate::clear_animations); + return { this, &d->animations, QQuickTimelinePrivate::append_animation, + QQuickTimelinePrivate::animation_count, + QQuickTimelinePrivate::animation_at, + QQuickTimelinePrivate::clear_animations }; } bool QQuickTimeline::enabled() const |