From 1e3367bb83ff5c15241e80e00b31dbd70072523f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 8 May 2019 17:49:25 +0200
Subject: Rename keyframes of timeline to keyframeGroups

Change-Id: I11903e84be5736ee901a492cbe52331a6af8477a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/imports/timeline/qquicktimeline.cpp | 25 ++++++++++++-------------
 src/imports/timeline/qquicktimeline_p.h |  6 +++---
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp
index 5e3f409..b5ea9dd 100644
--- a/src/imports/timeline/qquicktimeline.cpp
+++ b/src/imports/timeline/qquicktimeline.cpp
@@ -64,13 +64,13 @@ protected:
     static QQuickTimelineAnimation* animation_at(QQmlListProperty<QQuickTimelineAnimation> *list, int pos);
     static void clear_animations(QQmlListProperty<QQuickTimelineAnimation> *list);
 
-    QList<QQuickKeyframeGroup *> keyframes;
+    QList<QQuickKeyframeGroup *> keyframeGroups;
     QList<QQuickTimelineAnimation *> animations;
 };
 
 void QQuickTimelinePrivate::init()
 {
-    for (auto keyFrames : keyframes) {
+    for (auto keyFrames : keyframeGroups) {
         keyFrames->init();
         keyFrames->setProperty(currentFrame);
     }
@@ -78,34 +78,34 @@ void QQuickTimelinePrivate::init()
 
 void QQuickTimelinePrivate::disable()
 {
-    for (auto keyFrames : keyframes)
+    for (auto keyFrames : keyframeGroups)
         keyFrames->resetDefaultValue();
 }
 
 void QQuickTimelinePrivate::append_keyframe(QQmlListProperty<QQuickKeyframeGroup> *list, QQuickKeyframeGroup *a)
 {
     auto q = static_cast<QQuickTimeline *>(list->object);
-    q->d_func()->keyframes.append(a);
+    q->d_func()->keyframeGroups.append(a);
 }
 
 int QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list)
 {
     auto q = static_cast<QQuickTimeline *>(list->object);
-    return q->d_func()->keyframes.count();
+    return q->d_func()->keyframeGroups.count();
 }
 
 QQuickKeyframeGroup* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos)
 {
     auto q = static_cast<QQuickTimeline *>(list->object);
-    return q->d_func()->keyframes.at(pos);
+    return q->d_func()->keyframeGroups.at(pos);
 }
 
 void QQuickTimelinePrivate::clear_keyframes(QQmlListProperty<QQuickKeyframeGroup> *list)
 {
     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);
+    while (q->d_func()->keyframeGroups.count()) {
+        QQuickKeyframeGroup *firstKeyframe = q->d_func()->keyframeGroups.at(0);
+        q->d_func()->keyframeGroups.removeAll(firstKeyframe);
     }
 }
 
@@ -207,14 +207,13 @@ void QQuickTimelinePrivate::clear_animations(QQmlListProperty<QQuickTimelineAnim
 
 QQuickTimeline::QQuickTimeline(QObject *parent) : QObject(*(new QQuickTimelinePrivate), parent)
 {
-
 }
 
-QQmlListProperty<QQuickKeyframeGroup> QQuickTimeline::keyframes()
+QQmlListProperty<QQuickKeyframeGroup> QQuickTimeline::keyframeGroups()
 {
     Q_D(QQuickTimeline);
 
-    return { this, &d->keyframes, QQuickTimelinePrivate::append_keyframe,
+    return { this, &d->keyframeGroups, QQuickTimelinePrivate::append_keyframe,
                 QQuickTimelinePrivate::keyframe_count,
                 QQuickTimelinePrivate::keyframe_at,
                 QQuickTimelinePrivate::clear_keyframes };
@@ -306,7 +305,7 @@ void QQuickTimeline::reevaulate()
     Q_D(QQuickTimeline);
 
     if (d->componentComplete && d->enabled)
-        for (auto keyFrames : d->keyframes)
+        for (auto keyFrames : d->keyframeGroups)
             keyFrames->setProperty(d->currentFrame);
 }
 
diff --git a/src/imports/timeline/qquicktimeline_p.h b/src/imports/timeline/qquicktimeline_p.h
index e73d0e0..9e7f3b3 100644
--- a/src/imports/timeline/qquicktimeline_p.h
+++ b/src/imports/timeline/qquicktimeline_p.h
@@ -60,16 +60,16 @@ class QQuickTimeline : public QObject, public QQmlParserStatus
     Q_PROPERTY(qreal startFrame READ startFrame WRITE setStartFrame  NOTIFY startFrameChanged)
     Q_PROPERTY(qreal endFrame READ endFrame WRITE setEndFrame  NOTIFY endFrameChanged)
     Q_PROPERTY(qreal currentFrame READ currentFrame WRITE setCurrentFrame  NOTIFY currentFrameChanged)
-    Q_PROPERTY(QQmlListProperty<QQuickKeyframeGroup> keyframes READ keyframes)
+    Q_PROPERTY(QQmlListProperty<QQuickKeyframeGroup> keyframeGroups READ keyframeGroups)
     Q_PROPERTY(QQmlListProperty<QQuickTimelineAnimation> animations READ animations)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
 
-    Q_CLASSINFO("DefaultProperty", "keyframes")
+    Q_CLASSINFO("DefaultProperty", "keyframeGroups")
 
 public:
     explicit QQuickTimeline(QObject *parent = nullptr);
 
-    QQmlListProperty<QQuickKeyframeGroup> keyframes();
+    QQmlListProperty<QQuickKeyframeGroup> keyframeGroups();
     QQmlListProperty<QQuickTimelineAnimation> animations();
 
     bool enabled() const;
-- 
cgit v1.2.3