Rename Keyframes to KeyframeGroup

Change-Id: I3c31e2a3ab576e2293d1c8dd3d60b6d4550777e4
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>

9 files changed, 79 insertions, 79 deletions

diff --git a/src/imports/timeline/plugins.qmltypes b/src/imports/timeline/plugins.qmltypes
index bc58326..a795dd0 100644
--- a/src/imports/timeline/plugins.qmltypes
+++ b/src/imports/timeline/plugins.qmltypes
@@ -27,14 +27,14 @@ Module {
         Property { name: "startFrame"; type: "double" }
         Property { name: "endFrame"; type: "double" }
         Property { name: "currentFrame"; type: "double" }
-        Property { name: "keyframes"; type: "QQuickKeyframes"; isList: true; isReadonly: true }
+        Property { name: "keyframes"; type: "QQuickKeyframeGroup"; isList: true; isReadonly: true }
         Property { name: "enabled"; type: "bool" }
     }
     Component {
-        name: "QQuickKeyframes"
+        name: "QQuickKeyframeGroup"
         defaultProperty: "keyframes"
         prototype: "QObject"
-        exports: ["QtQuick.Timeline/Keyframes 1.0"]
+        exports: ["QtQuick.Timeline/KeyframeGroup 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp
index 3e98192..2fa7d86 100644
--- a/src/imports/timeline/qquickkeyframe.cpp
+++ b/src/imports/timeline/qquickkeyframe.cpp
@@ -32,11 +32,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickKeyframesPrivate : public QObjectPrivate
+class QQuickKeyframeGroupPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickKeyframes)
+    Q_DECLARE_PUBLIC(QQuickKeyframeGroup)
 public:
-    QQuickKeyframesPrivate()
+    QQuickKeyframeGroupPrivate()
         : target(nullptr),
           componentComplete(false)
     {
@@ -60,7 +60,7 @@ protected:
     QVariant originalValue;
 };
 
-void QQuickKeyframesPrivate::setupKeyframes()
+void QQuickKeyframeGroupPrivate::setupKeyframes()
 {
     sortedKeyframes = keyframes;
     std::sort(sortedKeyframes.begin(), sortedKeyframes.end(), [](const QQuickKeyframe *first, const QQuickKeyframe *second) {
@@ -68,29 +68,29 @@ void QQuickKeyframesPrivate::setupKeyframes()
     });
 }
 
-void QQuickKeyframesPrivate::append_keyframe(QQmlListProperty<QQuickKeyframe> *list, QQuickKeyframe *a)
+void QQuickKeyframeGroupPrivate::append_keyframe(QQmlListProperty<QQuickKeyframe> *list, QQuickKeyframe *a)
 {
-    QQuickKeyframes *q = static_cast<QQuickKeyframes *>(list->object);
+    QQuickKeyframeGroup *q = static_cast<QQuickKeyframeGroup *>(list->object);
     q->d_func()->keyframes.append(a);
     q->d_func()->setupKeyframes();
     q->reset();
 }
 
-int QQuickKeyframesPrivate::keyframe_count(QQmlListProperty<QQuickKeyframe> *list)
+int QQuickKeyframeGroupPrivate::keyframe_count(QQmlListProperty<QQuickKeyframe> *list)
 {
-    QQuickKeyframes *q = static_cast<QQuickKeyframes *>(list->object);
+    QQuickKeyframeGroup *q = static_cast<QQuickKeyframeGroup *>(list->object);
     return q->d_func()->keyframes.count();
 }
 
-QQuickKeyframe* QQuickKeyframesPrivate::keyframe_at(QQmlListProperty<QQuickKeyframe> *list, int pos)
+QQuickKeyframe* QQuickKeyframeGroupPrivate::keyframe_at(QQmlListProperty<QQuickKeyframe> *list, int pos)
 {
-    QQuickKeyframes *q = static_cast<QQuickKeyframes *>(list->object);
+    QQuickKeyframeGroup *q = static_cast<QQuickKeyframeGroup *>(list->object);
     return q->d_func()->keyframes.at(pos);
 }
 
-void QQuickKeyframesPrivate::clear_keyframes(QQmlListProperty<QQuickKeyframe> *list)
+void QQuickKeyframeGroupPrivate::clear_keyframes(QQmlListProperty<QQuickKeyframe> *list)
 {
-    QQuickKeyframes *q = static_cast<QQuickKeyframes *>(list->object);
+    QQuickKeyframeGroup *q = static_cast<QQuickKeyframeGroup *>(list->object);
     while (q->d_func()->keyframes.count()) {
         QQuickKeyframe *firstKeyframe = q->d_func()->keyframes.at(0);
         q->d_func()->keyframes.removeAll(firstKeyframe);
@@ -134,7 +134,7 @@ void QQuickKeyframe::setFrame(qreal f)
 
 void QQuickKeyframe::reset()
 {
-    QQuickKeyframes *keyframes = qobject_cast<QQuickKeyframes*>(parent());
+    QQuickKeyframeGroup *keyframes = qobject_cast<QQuickKeyframeGroup*>(parent());
     if (keyframes)
         keyframes->reset();
 }
@@ -145,31 +145,31 @@ QQuickKeyframe::QQuickKeyframe(QQuickKeyframePrivate &dd, QObject *parent)
 
 }
 
-QQuickKeyframes::QQuickKeyframes(QObject *parent)
-    : QObject(*(new QQuickKeyframesPrivate), parent)
+QQuickKeyframeGroup::QQuickKeyframeGroup(QObject *parent)
+    : QObject(*(new QQuickKeyframeGroupPrivate), parent)
 {
 
 }
 
-QQmlListProperty<QQuickKeyframe> QQuickKeyframes::keyframes()
+QQmlListProperty<QQuickKeyframe> QQuickKeyframeGroup::keyframes()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
 
-    return QQmlListProperty<QQuickKeyframe>(this, &d->keyframes, QQuickKeyframesPrivate::append_keyframe,
-                                            QQuickKeyframesPrivate::keyframe_count,
-                                            QQuickKeyframesPrivate::keyframe_at,
-                                            QQuickKeyframesPrivate::clear_keyframes);
+    return QQmlListProperty<QQuickKeyframe>(this, &d->keyframes, QQuickKeyframeGroupPrivate::append_keyframe,
+                                            QQuickKeyframeGroupPrivate::keyframe_count,
+                                            QQuickKeyframeGroupPrivate::keyframe_at,
+                                            QQuickKeyframeGroupPrivate::clear_keyframes);
 }
 
-QObject *QQuickKeyframes::target() const
+QObject *QQuickKeyframeGroup::target() const
 {
-    Q_D(const QQuickKeyframes);
+    Q_D(const QQuickKeyframeGroup);
     return d->target;
 }
 
-void QQuickKeyframes::setTargetObject(QObject *o)
+void QQuickKeyframeGroup::setTargetObject(QObject *o)
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     if (d->target == o)
         return;
     d->target = o;
@@ -180,15 +180,15 @@ void QQuickKeyframes::setTargetObject(QObject *o)
     emit targetChanged();
 }
 
-QString QQuickKeyframes::property() const
+QString QQuickKeyframeGroup::property() const
 {
-    Q_D(const QQuickKeyframes);
+    Q_D(const QQuickKeyframeGroup);
     return d->propertyName;
 }
 
-void QQuickKeyframes::setProperty(const QString &n)
+void QQuickKeyframeGroup::setProperty(const QString &n)
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     if (d->propertyName == n)
         return;
     d->propertyName = n;
@@ -199,9 +199,9 @@ void QQuickKeyframes::setProperty(const QString &n)
     emit propertyChanged();
 }
 
-QVariant QQuickKeyframes::evaluate(qreal frame) const
+QVariant QQuickKeyframeGroup::evaluate(qreal frame) const
 {
-    Q_D(const QQuickKeyframes);
+    Q_D(const QQuickKeyframeGroup);
 
     if (d->sortedKeyframes.isEmpty())
         return QVariant();
@@ -223,7 +223,7 @@ QVariant QQuickKeyframes::evaluate(qreal frame) const
     return lastFrame->value();
 }
 
-void QQuickKeyframes::setProperty(qreal frame)
+void QQuickKeyframeGroup::setProperty(qreal frame)
 {
     if (target()) {
         QQmlProperty qmlProperty(target(), property());
@@ -232,22 +232,22 @@ void QQuickKeyframes::setProperty(qreal frame)
     }
 }
 
-void QQuickKeyframes::init()
+void QQuickKeyframeGroup::init()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     if (target())
         d->originalValue = QQmlProperty::read(target(), property());
 }
 
-void QQuickKeyframes::resetDefaultValue()
+void QQuickKeyframeGroup::resetDefaultValue()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     QQmlProperty::write(target(), property(), d->originalValue);
 }
 
-void QQuickKeyframes::reset()
+void QQuickKeyframeGroup::reset()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     if (!d->componentComplete)
         return;
 
@@ -256,23 +256,23 @@ void QQuickKeyframes::reset()
         setProperty(timeline->currentFrame());
 }
 
-void QQuickKeyframes::setupKeyframes()
+void QQuickKeyframeGroup::setupKeyframes()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
 
     if (d->componentComplete)
         d->setupKeyframes();
 }
 
-void QQuickKeyframes::classBegin()
+void QQuickKeyframeGroup::classBegin()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     d->componentComplete = false;
 }
 
-void QQuickKeyframes::componentComplete()
+void QQuickKeyframeGroup::componentComplete()
 {
-    Q_D(QQuickKeyframes);
+    Q_D(QQuickKeyframeGroup);
     d->componentComplete = true;
     setupKeyframes();
 }
diff --git a/src/imports/timeline/qquickkeyframe_p.h b/src/imports/timeline/qquickkeyframe_p.h
index fec1493..a1e282c 100644
--- a/src/imports/timeline/qquickkeyframe_p.h
+++ b/src/imports/timeline/qquickkeyframe_p.h
@@ -37,7 +37,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickKeyframesPrivate;
+class QQuickKeyframeGroupPrivate;
 class QQuickKeyframePrivate;
 class QQuickNumberKeyframePrivate;
 
@@ -74,10 +74,10 @@ Q_SIGNALS:
     void valueChanged();
 };
 
-class QQuickKeyframes : public QObject, public QQmlParserStatus
+class QQuickKeyframeGroup : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QQuickKeyframes)
+    Q_DECLARE_PRIVATE(QQuickKeyframeGroup)
 
     Q_INTERFACES(QQmlParserStatus)
 
@@ -88,7 +88,7 @@ class QQuickKeyframes : public QObject, public QQmlParserStatus
     Q_CLASSINFO("DefaultProperty", "keyframes")
 
 public:
-    explicit QQuickKeyframes(QObject *parent = nullptr);
+    explicit QQuickKeyframeGroup(QObject *parent = nullptr);
 
     QQmlListProperty<QQuickKeyframe> keyframes();
 
diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp
index 9f9c977..52f9a32 100644
--- a/src/imports/timeline/qquicktimeline.cpp
+++ b/src/imports/timeline/qquicktimeline.cpp
@@ -48,12 +48,12 @@ protected:
     void init();
     void disable();
 
-    static void append_keyframe(QQmlListProperty<QQuickKeyframes> *list, QQuickKeyframes *a);
-    static int keyframe_count(QQmlListProperty<QQuickKeyframes> *list);
-    static QQuickKeyframes* keyframe_at(QQmlListProperty<QQuickKeyframes> *list, int pos);
-    static void clear_keyframes(QQmlListProperty<QQuickKeyframes> *list);
+    static void append_keyframe(QQmlListProperty<QQuickKeyframeGroup> *list, QQuickKeyframeGroup *a);
+    static int keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list);
+    static QQuickKeyframeGroup* keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos);
+    static void clear_keyframes(QQmlListProperty<QQuickKeyframeGroup> *list);
 
-    QList<QQuickKeyframes *> keyframes;
+    QList<QQuickKeyframeGroup *> keyframes;
 };
 
 void QQuickTimelinePrivate::init()
@@ -70,29 +70,29 @@ void QQuickTimelinePrivate::disable()
         keyFrames->resetDefaultValue();
 }
 
-void QQuickTimelinePrivate::append_keyframe(QQmlListProperty<QQuickKeyframes> *list, QQuickKeyframes *a)
+void QQuickTimelinePrivate::append_keyframe(QQmlListProperty<QQuickKeyframeGroup> *list, QQuickKeyframeGroup *a)
 {
     QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object);
     q->d_func()->keyframes.append(a);
 }
 
-int QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframes> *list)
+int QQuickTimelinePrivate::keyframe_count(QQmlListProperty<QQuickKeyframeGroup> *list)
 {
     QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object);
     return q->d_func()->keyframes.count();
 }
 
-QQuickKeyframes* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframes> *list, int pos)
+QQuickKeyframeGroup* QQuickTimelinePrivate::keyframe_at(QQmlListProperty<QQuickKeyframeGroup> *list, int pos)
 {
     QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object);
     return q->d_func()->keyframes.at(pos);
 }
 
-void QQuickTimelinePrivate::clear_keyframes(QQmlListProperty<QQuickKeyframes> *list)
+void QQuickTimelinePrivate::clear_keyframes(QQmlListProperty<QQuickKeyframeGroup> *list)
 {
     QQuickTimeline *q = static_cast<QQuickTimeline *>(list->object);
     while (q->d_func()->keyframes.count()) {
-        QQuickKeyframes *firstKeyframe = q->d_func()->keyframes.at(0);
+        QQuickKeyframeGroup *firstKeyframe = q->d_func()->keyframes.at(0);
         q->d_func()->keyframes.removeAll(firstKeyframe);
     }
 }
@@ -102,11 +102,11 @@ QQuickTimeline::QQuickTimeline(QObject *parent) : QObject(*(new QQuickTimelinePr
 
 }
 
-QQmlListProperty<QQuickKeyframes> QQuickTimeline::keyframes()
+QQmlListProperty<QQuickKeyframeGroup> QQuickTimeline::keyframes()
 {
     Q_D(QQuickTimeline);
 
-    return QQmlListProperty<QQuickKeyframes>(this, &d->keyframes, QQuickTimelinePrivate::append_keyframe,
+    return QQmlListProperty<QQuickKeyframeGroup>(this, &d->keyframes, QQuickTimelinePrivate::append_keyframe,
                                              QQuickTimelinePrivate::keyframe_count,
                                              QQuickTimelinePrivate::keyframe_at,
                                              QQuickTimelinePrivate::clear_keyframes);
diff --git a/src/imports/timeline/qquicktimeline_p.h b/src/imports/timeline/qquicktimeline_p.h
index e54e450..b4c2567 100644
--- a/src/imports/timeline/qquicktimeline_p.h
+++ b/src/imports/timeline/qquicktimeline_p.h
@@ -48,7 +48,7 @@ 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<QQuickKeyframes> keyframes READ keyframes)
+    Q_PROPERTY(QQmlListProperty<QQuickKeyframeGroup> keyframes READ keyframes)
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
 
     Q_CLASSINFO("DefaultProperty", "keyframes")
@@ -56,7 +56,7 @@ class QQuickTimeline : public QObject, public QQmlParserStatus
 public:
     explicit QQuickTimeline(QObject *parent = nullptr);
 
-    QQmlListProperty<QQuickKeyframes> keyframes();
+    QQmlListProperty<QQuickKeyframeGroup> keyframes();
 
     bool enabled() const;
     void setEnabled(bool enabled);
diff --git a/src/imports/timeline/qtquicktimelineplugin.cpp b/src/imports/timeline/qtquicktimelineplugin.cpp
index df9659e..b1cb0dc 100644
--- a/src/imports/timeline/qtquicktimelineplugin.cpp
+++ b/src/imports/timeline/qtquicktimelineplugin.cpp
@@ -51,7 +51,7 @@ void QtQuickTimelinePlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QQuickTimeline>(uri, 1, 0, "Timeline");
     qmlRegisterType<QQuickKeyframe>(uri, 1, 0, "Keyframe");
-    qmlRegisterType<QQuickKeyframes>(uri, 1, 0, "Keyframes");
+    qmlRegisterType<QQuickKeyframeGroup>(uri, 1, 0, "KeyframeGroup");
 }
 
 void QtQuickTimelinePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
diff --git a/tests/manual/timelineTestApp/test01.qml b/tests/manual/timelineTestApp/test01.qml
index 09df989..d0810aa 100644
--- a/tests/manual/timelineTestApp/test01.qml
+++ b/tests/manual/timelineTestApp/test01.qml
@@ -65,7 +65,7 @@ Item {
 
             enabled: true
 
-            Keyframes {
+            KeyframeGroup {
                 target: rectangle
                 property: "x"
 
@@ -85,7 +85,7 @@ Item {
                 }
             }
 
-            Keyframes {
+            KeyframeGroup {
                 target: rectangle
                 property: "y"
 
@@ -106,7 +106,7 @@ Item {
                 }
             }
 
-            Keyframes {
+            KeyframeGroup {
                 target: rectangle
                 property: "color"
 
diff --git a/tests/manual/timelineTestApp/test02.qml b/tests/manual/timelineTestApp/test02.qml
index e0574f7..861fe45 100644
--- a/tests/manual/timelineTestApp/test02.qml
+++ b/tests/manual/timelineTestApp/test02.qml
@@ -82,7 +82,7 @@ Item {
         startFrame: 0
         endFrame: 1000
 
-        Keyframes {
+        KeyframeGroup {
             target: leftGauge
             property: "x"
             Keyframe {
@@ -101,7 +101,7 @@ Item {
                 easing.type: Easing.OutQuad
             }
         }
-        Keyframes {
+        KeyframeGroup {
             target: leftGauge
             property: "y"
             Keyframe {
@@ -120,7 +120,7 @@ Item {
                 easing.type: Easing.OutQuad
             }
         }
-        Keyframes {
+        KeyframeGroup {
             target: leftGauge
             property: "opacity"
             Keyframe {
@@ -139,7 +139,7 @@ Item {
             }
         }
 
-        Keyframes {
+        KeyframeGroup {
             target: rightGauge
             property: "x"
             Keyframe {
@@ -157,7 +157,7 @@ Item {
                 easing.type: Easing.OutQuad
             }
         }
-        Keyframes {
+        KeyframeGroup {
             target: rightGauge
             property: "y"
             Keyframe {
@@ -175,7 +175,7 @@ Item {
                 easing.type: Easing.OutQuad
             }
         }
-        Keyframes {
+        KeyframeGroup {
             target: rightGauge
             property: "opacity"
             Keyframe {
@@ -194,7 +194,7 @@ Item {
             }
         }
 
-        Keyframes {
+        KeyframeGroup {
             target: bottomPane
             property: "y"
 
@@ -214,7 +214,7 @@ Item {
                 easing.type: Easing.OutQuad
             }
         }
-        Keyframes {
+        KeyframeGroup {
             target: bottomPane
             property: "opacity"
             Keyframe {
diff --git a/tests/manual/timelineTestApp/test03.qml b/tests/manual/timelineTestApp/test03.qml
index 1b346bb..10c3e16 100644
--- a/tests/manual/timelineTestApp/test03.qml
+++ b/tests/manual/timelineTestApp/test03.qml
@@ -29,7 +29,7 @@ Item {
         startFrame: 0
         endFrame: 200
         currentFrame: input.text
-        Keyframes {
+        KeyframeGroup {
             target: needle
             property: "rotation"
             Keyframe {
@@ -47,7 +47,7 @@ Item {
             }
         }
 
-        Keyframes {
+        KeyframeGroup {
             target: needle
             property: "color"
             Keyframe {