Property changes after API review.

State:operations -> changes
Transition:operations -> animations

5 files changed, 23 insertions, 19 deletions

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index fe83d40..5129d60 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -17,10 +17,14 @@ FocusRealm       -> FocusScope
 FontFamily       -> FontLoader
 
 Renamed properties:
-MouseRegion: xmin    -> minimumX
-MouseRegion: xmax    -> maximumX
-MouseRegion: ymin    -> minimumY
-MouseRegion: ymin    -> maximumY
+MouseRegion: xmin      -> minimumX
+MouseRegion: xmax      -> maximumX
+MouseRegion: ymin      -> minimumY
+MouseRegion: ymin      -> maximumY
+Text elements: hAlign  -> horizontalAlignment
+Text elements: vAlign  -> verticalAlignment
+State: operations      -> changes
+Transition: operations -> animations
 
 Additions:
 MouseRegion: add "acceptedButtons" property
@@ -49,10 +53,8 @@ SetAnchors         -> AnchorChanges
 
 Renamed properties:
 Follow: followValue    -> value
-State: operations      -> changes
 Transition: fromState  -> from
 Trnasition: toState    -> to
-Transition: operations -> animations
 
 Removed Properties:
 PropertyAction::property
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index ce94aa8..e7149d5 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -227,7 +227,7 @@ void QmlState::setExtends(const QString &extends)
 }
 
 /*!
-    \qmlproperty list<StateOperation> State::operations
+    \qmlproperty list<Change> State::changes
     This property holds the changes to apply for this state
     \default
 
@@ -235,7 +235,7 @@ void QmlState::setExtends(const QString &extends)
     extends another state, then the changes are applied against the state being
     extended.
 */
-QmlList<QmlStateOperation *> *QmlState::operations()
+QmlList<QmlStateOperation *> *QmlState::changes()
 {
     Q_D(QmlState);
     return &d->operations;
diff --git a/src/declarative/util/qmlstate.h b/src/declarative/util/qmlstate.h
index 1b35295..d15bd4a 100644
--- a/src/declarative/util/qmlstate.h
+++ b/src/declarative/util/qmlstate.h
@@ -100,6 +100,7 @@ public:
     virtual bool override(ActionEvent*other);
 };
 
+//### rename to QmlStateChange?
 class QmlStateGroup;
 class Q_DECLARATIVE_EXPORT QmlStateOperation : public QObject
 {
@@ -126,8 +127,8 @@ class Q_DECLARATIVE_EXPORT QmlState : public QObject
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QmlBinding *when READ when WRITE setWhen)
     Q_PROPERTY(QString extends READ extends WRITE setExtends)
-    Q_PROPERTY(QmlList<QmlStateOperation *>* operations READ operations)
-    Q_CLASSINFO("DefaultProperty", "operations")
+    Q_PROPERTY(QmlList<QmlStateOperation *>* changes READ changes)
+    Q_CLASSINFO("DefaultProperty", "changes")
 
 public:
     QmlState(QObject *parent=0);
@@ -145,7 +146,7 @@ public:
     QString extends() const;
     void setExtends(const QString &);
 
-    QmlList<QmlStateOperation *> *operations();
+    QmlList<QmlStateOperation *> *changes();
     QmlState &operator<<(QmlStateOperation *);
 
     void apply(QmlStateGroup *, QmlTransition *, QmlState *revert);
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index fd22f6b..e70661d 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -241,15 +241,16 @@ void QmlTransition::setToState(const QString &t)
 }
 
 /*!
-    \qmlproperty list<Animation> Transition::operations
+    \qmlproperty list<Animation> Transition::animations
+    \default
     This property holds a list of the animations to be run for this transition.
 
-    The top-level animations in operations are run in parallel.
-    To run them sequentially, you can create a single SequentialAnimation
-    which contains all the animations, and assign that to operations.
+    The top-level animations are run in parallel. To run them sequentially,
+    you can create a single SequentialAnimation which contains all the animations,
+    and assign that to animations the animations property.
     \default
 */
-QmlList<QmlAbstractAnimation *>* QmlTransition::operations()
+QmlList<QmlAbstractAnimation *>* QmlTransition::animations()
 {
     Q_D(QmlTransition);
     return &d->operations;
diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h
index 8ccb0ec..39b35ba 100644
--- a/src/declarative/util/qmltransition.h
+++ b/src/declarative/util/qmltransition.h
@@ -64,8 +64,8 @@ class Q_DECLARATIVE_EXPORT QmlTransition : public QObject
     Q_PROPERTY(QString fromState READ fromState WRITE setFromState)
     Q_PROPERTY(QString toState READ toState WRITE setToState)
     Q_PROPERTY(bool reversible READ reversible WRITE setReversible)
-    Q_PROPERTY(QmlList<QmlAbstractAnimation *>* operations READ operations)
-    Q_CLASSINFO("DefaultProperty", "operations")
+    Q_PROPERTY(QmlList<QmlAbstractAnimation *>* animations READ animations)
+    Q_CLASSINFO("DefaultProperty", "animations")
 
 public:
     QmlTransition(QObject *parent=0);
@@ -80,7 +80,7 @@ public:
     bool reversible() const;
     void setReversible(bool);
 
-    QmlList<QmlAbstractAnimation *>* operations();
+    QmlList<QmlAbstractAnimation *>* animations();
 
     void prepare(QmlStateOperation::ActionList &actions,
                  QList<QmlMetaProperty> &after,