Rename State change elements.

SetProperties    -> PropertyChanges
RunScript        -> StateChangeScript
SetAnchors       -> AnchorChanges

8 files changed, 136 insertions, 138 deletions

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index f15d19e..c3bd1d2 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -17,6 +17,9 @@ FocusRealm       -> FocusScope
 FontFamily       -> FontLoader
 Palette          -> SystemPalette
 Bind             -> Binding
+SetProperties    -> PropertyChanges
+RunScript        -> StateChangeScript
+SetAnchors       -> AnchorChanges
 
 Renamed properties:
 MouseRegion: xmin      -> minimumX
@@ -51,9 +54,6 @@ Pending Changes
 Renamed elements:
 RunScriptAction    -> ScriptAction
 ParentChangeAction -> ParentAction
-SetProperties      -> PropertyChanges
-RunScript          -> StateChangeScript
-SetAnchors         -> AnchorChanges
 
 Renamed properties:
 Transition: fromState  -> from
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 7faddee..e5b7c47 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -851,10 +851,10 @@ void QmlRunScriptAction::transition(QmlStateActions &actions,
     for (int ii = 0; ii < actions.count(); ++ii) {
         Action &action = actions[ii];
 
-        if (action.event && action.event->typeName() == QLatin1String("RunScript")
-            && static_cast<QmlRunScript*>(action.event)->name() == d->name) {
+        if (action.event && action.event->typeName() == QLatin1String("StateChangeScript")
+            && static_cast<QmlStateChangeScript*>(action.event)->name() == d->name) {
             //### how should we handle reverse direction?
-            d->runScriptScript = static_cast<QmlRunScript*>(action.event)->script();
+            d->runScriptScript = static_cast<QmlStateChangeScript*>(action.event)->script();
             action.actionDone = true;
             break;  //assumes names are unique
         }
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 83804a5..6dca2d1 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -114,8 +114,6 @@ Connection {
     \class QmlConnection
     \brief The QmlConnection class describes generalized connections to signals.
 
-    QmlSetProperties is a mechanism for connecting a script to be run when
-    some object sends a signal.
 */
 QmlConnection::QmlConnection(QObject *parent) :
     QObject(*(new QmlConnectionPrivate), parent)
diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlpropertychanges.cpp
index e7be329..bece267 100644
--- a/src/declarative/util/qmlsetproperties.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -41,7 +41,7 @@
 
 #include "private/qobject_p.h"
 #include "qmlopenmetaobject.h"
-#include "qmlsetproperties.h"
+#include "qmlpropertychanges.h"
 #include <QtCore/qdebug.h>
 #include <QtDeclarative/qmlinfo.h>
 #include <private/qmlcustomparser_p.h>
@@ -53,14 +53,14 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass SetProperties QmlSetProperties
-    \brief The SetProperties element describes new property values for a state.
+    \qmlclass PropertyChanges QmlPropertyChanges
+    \brief The PropertyChanges element describes new property values for a state.
 
-    SetProperties changes the properties of an item. It allows you to specify the property
+    PropertyChanges changes the properties of an item. It allows you to specify the property
     names and values similar to how you normally would specify them for the actual item:
 
     \code
-    SetProperties {
+    PropertyChanges {
         target: myRect
         x: 52
         y: 300
@@ -71,20 +71,20 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \internal
-    \class QmlSetProperties
-    \brief The QmlSetProperties class describes new property values for a state.
+    \class QmlPropertyChanges
+    \brief The QmlPropertyChanges class describes new property values for a state.
 */
 
 /*!
-    \qmlproperty Object SetProperties::target
+    \qmlproperty Object PropertyChanges::target
     This property holds the object that the properties to change belong to
 */
 
-class QmlSetPropertiesPrivate : public QObjectPrivate
+class QmlPropertyChangesPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QmlSetProperties)
+    Q_DECLARE_PUBLIC(QmlPropertyChanges)
 public:
-    QmlSetPropertiesPrivate() : object(0), decoded(true), restore(true),
+    QmlPropertyChangesPrivate() : object(0), decoded(true), restore(true),
                                 isExplicit(false) {}
 
     QObject *object;
@@ -101,7 +101,7 @@ public:
     QmlMetaProperty property(const QByteArray &);
 };
 
-class QmlSetPropertiesParser : public QmlCustomParser
+class QmlPropertyChangesParser : public QmlCustomParser
 {
 public:
     void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QmlCustomParserProperty &prop);
@@ -111,7 +111,7 @@ public:
 };
 
 void
-QmlSetPropertiesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
+QmlPropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
                                      const QByteArray &pre,
                                      const QmlCustomParserProperty &prop)
 {
@@ -137,7 +137,7 @@ QmlSetPropertiesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
 }
 
 QByteArray
-QmlSetPropertiesParser::compile(const QList<QmlCustomParserProperty> &props,
+QmlPropertyChangesParser::compile(const QList<QmlCustomParserProperty> &props,
                                 bool *ok)
 {
     *ok = true;
@@ -176,9 +176,9 @@ QmlSetPropertiesParser::compile(const QList<QmlCustomParserProperty> &props,
     return rv;
 }
 
-void QmlSetPropertiesPrivate::decode()
+void QmlPropertyChangesPrivate::decode()
 {
-    Q_Q(QmlSetProperties);
+    Q_Q(QmlPropertyChanges);
     if (decoded)
         return;
 
@@ -207,55 +207,55 @@ void QmlSetPropertiesPrivate::decode()
     data.clear();
 }
 
-void QmlSetPropertiesParser::setCustomData(QObject *object,
+void QmlPropertyChangesParser::setCustomData(QObject *object,
                                             const QByteArray &data)
 {
-    QmlSetPropertiesPrivate *p =
-        static_cast<QmlSetPropertiesPrivate *>(QObjectPrivate::get(object));
+    QmlPropertyChangesPrivate *p =
+        static_cast<QmlPropertyChangesPrivate *>(QObjectPrivate::get(object));
     p->data = data;
     p->decoded = false;
 }
 
-QmlSetProperties::QmlSetProperties()
-: QmlStateOperation(*(new QmlSetPropertiesPrivate))
+QmlPropertyChanges::QmlPropertyChanges()
+: QmlStateOperation(*(new QmlPropertyChangesPrivate))
 {
 }
 
-QmlSetProperties::~QmlSetProperties()
+QmlPropertyChanges::~QmlPropertyChanges()
 {
-    Q_D(QmlSetProperties);
+    Q_D(QmlPropertyChanges);
     for(int ii = 0; ii < d->expressions.count(); ++ii)
         delete d->expressions.at(ii).second;
 }
 
-QObject *QmlSetProperties::object() const
+QObject *QmlPropertyChanges::object() const
 {
-    Q_D(const QmlSetProperties);
+    Q_D(const QmlPropertyChanges);
     return d->object;
 }
 
-void QmlSetProperties::setObject(QObject *o)
+void QmlPropertyChanges::setObject(QObject *o)
 {
-    Q_D(QmlSetProperties);
+    Q_D(QmlPropertyChanges);
     d->object = o;
 }
 
-bool QmlSetProperties::restoreEntryValues() const
+bool QmlPropertyChanges::restoreEntryValues() const
 {
-    Q_D(const QmlSetProperties);
+    Q_D(const QmlPropertyChanges);
     return d->restore;
 }
 
-void QmlSetProperties::setRestoreEntryValues(bool v)
+void QmlPropertyChanges::setRestoreEntryValues(bool v)
 {
-    Q_D(QmlSetProperties);
+    Q_D(QmlPropertyChanges);
     d->restore = v;
 }
 
 QmlMetaProperty
-QmlSetPropertiesPrivate::property(const QByteArray &property)
+QmlPropertyChangesPrivate::property(const QByteArray &property)
 {
-    Q_Q(QmlSetProperties);
+    Q_Q(QmlPropertyChanges);
     QmlMetaProperty prop = QmlMetaProperty::createProperty(object, QString::fromLatin1(property));
     if (!prop.isValid()) {
         qmlInfo(q) << "Cannot assign to non-existant property" << property;
@@ -267,9 +267,9 @@ QmlSetPropertiesPrivate::property(const QByteArray &property)
     return prop;
 }
 
-QmlSetProperties::ActionList QmlSetProperties::actions()
+QmlPropertyChanges::ActionList QmlPropertyChanges::actions()
 {
-    Q_D(QmlSetProperties);
+    Q_D(QmlPropertyChanges);
 
     d->decode();
 
@@ -322,18 +322,18 @@ QmlSetProperties::ActionList QmlSetProperties::actions()
     return list;
 }
 
-bool QmlSetProperties::isExplicit() const
+bool QmlPropertyChanges::isExplicit() const
 {
-    Q_D(const QmlSetProperties);
+    Q_D(const QmlPropertyChanges);
     return d->isExplicit;
 }
 
-void QmlSetProperties::setIsExplicit(bool e)
+void QmlPropertyChanges::setIsExplicit(bool e)
 {
-    Q_D(QmlSetProperties);
+    Q_D(QmlPropertyChanges);
     d->isExplicit = e;
 }
 
-QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, (QT_VERSION&0x00ff00)>>8, SetProperties, QmlSetProperties, QmlSetPropertiesParser)
+QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, (QT_VERSION&0x00ff00)>>8, PropertyChanges, QmlPropertyChanges, QmlPropertyChangesParser)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlsetproperties.h b/src/declarative/util/qmlpropertychanges.h
index 3632816..8d338f1 100644
--- a/src/declarative/util/qmlsetproperties.h
+++ b/src/declarative/util/qmlpropertychanges.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QMLSETPROPERTIES_H
-#define QMLSETPROPERTIES_H
+#ifndef QMLPROPERTYCHANGES_H
+#define QMLPROPERTYCHANGES_H
 
 #include <QtDeclarative/qmlstateoperations.h>
 
@@ -50,18 +50,18 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
     
-class QmlSetPropertiesPrivate;
-class Q_DECLARATIVE_EXPORT QmlSetProperties : public QmlStateOperation
+class QmlPropertyChangesPrivate;
+class Q_DECLARATIVE_EXPORT QmlPropertyChanges : public QmlStateOperation
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlSetProperties)
+    Q_DECLARE_PRIVATE(QmlPropertyChanges)
 
     Q_PROPERTY(QObject *target READ object WRITE setObject)
     Q_PROPERTY(bool restoreEntryValues READ restoreEntryValues WRITE setRestoreEntryValues)
     Q_PROPERTY(bool explicit READ isExplicit WRITE setIsExplicit); 
 public:
-    QmlSetProperties();
-    ~QmlSetProperties();
+    QmlPropertyChanges();
+    ~QmlPropertyChanges();
 
     QObject *object() const;
     void setObject(QObject *);
@@ -77,8 +77,8 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QmlSetProperties)
+QML_DECLARE_TYPE(QmlPropertyChanges)
 
 QT_END_HEADER
 
-#endif // QMLSETPROPERTIES_H
+#endif // QMLPROPERTYCHANGES_H
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 056912f..b17b80b 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -213,60 +213,60 @@ bool QmlParentChange::override(ActionEvent*other)
     return false;
 }
 
-class QmlRunScriptPrivate : public QObjectPrivate
+class QmlStateChangeScriptPrivate : public QObjectPrivate
 {
 public:
-    QmlRunScriptPrivate() {}
+    QmlStateChangeScriptPrivate() {}
 
     QString script;
     QString name;
 };
 
 /*!
-    \qmlclass RunScript QmlRunScript
-    \brief The RunScript element allows you to run a script in a state.
+    \qmlclass StateChangeScript QmlStateChangeScript
+    \brief The StateChangeScript element allows you to run a script in a state.
 */
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,RunScript,QmlRunScript)
-QmlRunScript::QmlRunScript(QObject *parent)
-: QmlStateOperation(*(new QmlRunScriptPrivate), parent)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,StateChangeScript,QmlStateChangeScript)
+QmlStateChangeScript::QmlStateChangeScript(QObject *parent)
+: QmlStateOperation(*(new QmlStateChangeScriptPrivate), parent)
 {
 }
 
-QmlRunScript::~QmlRunScript()
+QmlStateChangeScript::~QmlStateChangeScript()
 {
 }
 
 /*!
-    \qmlproperty string RunScript::script
+    \qmlproperty string StateChangeScript::script
     This property holds the script to run when the state is current.
 */
-QString QmlRunScript::script() const
+QString QmlStateChangeScript::script() const
 {
-    Q_D(const QmlRunScript);
+    Q_D(const QmlStateChangeScript);
     return d->script;
 }
 
-void QmlRunScript::setScript(const QString &s)
+void QmlStateChangeScript::setScript(const QString &s)
 {
-    Q_D(QmlRunScript);
+    Q_D(QmlStateChangeScript);
     d->script = s;
 }
 
-QString QmlRunScript::name() const
+QString QmlStateChangeScript::name() const
 {
-    Q_D(const QmlRunScript);
+    Q_D(const QmlStateChangeScript);
     return d->name;
 }
 
-void QmlRunScript::setName(const QString &n)
+void QmlStateChangeScript::setName(const QString &n)
 {
-    Q_D(QmlRunScript);
+    Q_D(QmlStateChangeScript);
     d->name = n;
 }
 
-void QmlRunScript::execute()
+void QmlStateChangeScript::execute()
 {
-    Q_D(QmlRunScript);
+    Q_D(QmlStateChangeScript);
     if (!d->script.isEmpty()) {
         QmlExpression expr(qmlContext(this), d->script, this);
         expr.setTrackChange(false);
@@ -274,7 +274,7 @@ void QmlRunScript::execute()
     }
 }
 
-QmlRunScript::ActionList QmlRunScript::actions()
+QmlStateChangeScript::ActionList QmlStateChangeScript::actions()
 {
     ActionList rv;
     Action a;
@@ -284,16 +284,16 @@ QmlRunScript::ActionList QmlRunScript::actions()
 }
 
 /*!
-    \qmlclass SetAnchors
-    \brief The SetAnchors element allows you to change anchors in a state.
+    \qmlclass AnchorChanges
+    \brief The AnchorChanges element allows you to change anchors in a state.
 */
 
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SetAnchors,QmlSetAnchors)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,AnchorChanges,QmlAnchorChanges)
 
-class QmlSetAnchorsPrivate : public QObjectPrivate
+class QmlAnchorChangesPrivate : public QObjectPrivate
 {
 public:
-    QmlSetAnchorsPrivate() : target(0) {}
+    QmlAnchorChangesPrivate() : target(0) {}
 
     QString name;
     QFxItem *target;
@@ -313,98 +313,98 @@ public:
     qreal origHeight;
 };
 
-QmlSetAnchors::QmlSetAnchors(QObject *parent)
- : QmlStateOperation(*(new QmlSetAnchorsPrivate), parent)
+QmlAnchorChanges::QmlAnchorChanges(QObject *parent)
+ : QmlStateOperation(*(new QmlAnchorChangesPrivate), parent)
 {
 }
 
-QmlSetAnchors::~QmlSetAnchors()
+QmlAnchorChanges::~QmlAnchorChanges()
 {
 }
 
-QmlSetAnchors::ActionList QmlSetAnchors::actions()
+QmlAnchorChanges::ActionList QmlAnchorChanges::actions()
 {
     Action a;
     a.event = this;
     return ActionList() << a;
 }
 
-QFxItem *QmlSetAnchors::object() const
+QFxItem *QmlAnchorChanges::object() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->target;
 }
 
-void QmlSetAnchors::setObject(QFxItem *target)
+void QmlAnchorChanges::setObject(QFxItem *target)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->target = target;
 }
 
-QString QmlSetAnchors::reset() const
+QString QmlAnchorChanges::reset() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->resetString;
 }
 
-void QmlSetAnchors::setReset(const QString &reset)
+void QmlAnchorChanges::setReset(const QString &reset)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->resetString = reset;
     d->resetList = d->resetString.split(QLatin1Char(','));
 }
 
-QFxAnchorLine QmlSetAnchors::left() const
+QFxAnchorLine QmlAnchorChanges::left() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->left;
 }
 
-void QmlSetAnchors::setLeft(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setLeft(const QFxAnchorLine &edge)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->left = edge;
 }
 
-QFxAnchorLine QmlSetAnchors::right() const
+QFxAnchorLine QmlAnchorChanges::right() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->right;
 }
 
-void QmlSetAnchors::setRight(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setRight(const QFxAnchorLine &edge)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->right = edge;
 }
 
-QFxAnchorLine QmlSetAnchors::top() const
+QFxAnchorLine QmlAnchorChanges::top() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->top;
 }
 
-void QmlSetAnchors::setTop(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setTop(const QFxAnchorLine &edge)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->top = edge;
 }
 
-QFxAnchorLine QmlSetAnchors::bottom() const
+QFxAnchorLine QmlAnchorChanges::bottom() const
 {
-    Q_D(const QmlSetAnchors);
+    Q_D(const QmlAnchorChanges);
     return d->bottom;
 }
 
-void QmlSetAnchors::setBottom(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setBottom(const QFxAnchorLine &edge)
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->bottom = edge;
 }
 
-void QmlSetAnchors::execute()
+void QmlAnchorChanges::execute()
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     if (!d->target)
         return;
 
@@ -419,14 +419,14 @@ void QmlSetAnchors::execute()
         d->target->anchors()->setBottom(d->bottom);
 }
 
-bool QmlSetAnchors::isReversable()
+bool QmlAnchorChanges::isReversable()
 {
     return true;
 }
 
-void QmlSetAnchors::reverse()
+void QmlAnchorChanges::reverse()
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     if (!d->target)
         return;
 
@@ -442,14 +442,14 @@ void QmlSetAnchors::reverse()
 
 }
 
-QString QmlSetAnchors::typeName() const
+QString QmlAnchorChanges::typeName() const
 {
-    return QLatin1String("SetAnchors");
+    return QLatin1String("AnchorChanges");
 }
 
-QList<Action> QmlSetAnchors::extraActions()
+QList<Action> QmlAnchorChanges::extraActions()
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     QList<Action> extra;
 
     //### try to be smarter about which ones we add.
@@ -477,14 +477,14 @@ QList<Action> QmlSetAnchors::extraActions()
     return extra;
 }
 
-bool QmlSetAnchors::changesBindings()
+bool QmlAnchorChanges::changesBindings()
 {
     return true;
 }
 
-void QmlSetAnchors::clearForwardBindings()
+void QmlAnchorChanges::clearForwardBindings()
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->origLeft = d->target->anchors()->left();
     d->origRight = d->target->anchors()->right();
     d->origTop = d->target->anchors()->top();
@@ -505,9 +505,9 @@ void QmlSetAnchors::clearForwardBindings()
         d->target->anchors()->resetBottom();
 }
 
-void QmlSetAnchors::clearReverseBindings()
+void QmlAnchorChanges::clearReverseBindings()
 {
-    Q_D(QmlSetAnchors);
+    Q_D(QmlAnchorChanges);
     d->origX = d->target->x();
     d->origY = d->target->y();
     d->origWidth = d->target->width();
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 4bd17a0..3018b44 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -79,18 +79,18 @@ public:
     virtual bool override(ActionEvent*other);
 };
 
-class QmlRunScriptPrivate;
-class Q_DECLARATIVE_EXPORT QmlRunScript : public QmlStateOperation, public ActionEvent
+class QmlStateChangeScriptPrivate;
+class Q_DECLARATIVE_EXPORT QmlStateChangeScript : public QmlStateOperation, public ActionEvent
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlRunScript)
+    Q_DECLARE_PRIVATE(QmlStateChangeScript)
 
     Q_PROPERTY(QString script READ script WRITE setScript)
     Q_PROPERTY(QString name READ name WRITE setName)
 
 public:
-    QmlRunScript(QObject *parent=0);
-    ~QmlRunScript();
+    QmlStateChangeScript(QObject *parent=0);
+    ~QmlStateChangeScript();
 
     virtual ActionList actions();
 
@@ -103,11 +103,11 @@ public:
     virtual void execute();
 };
 
-class QmlSetAnchorsPrivate;
-class Q_DECLARATIVE_EXPORT QmlSetAnchors : public QmlStateOperation, public ActionEvent
+class QmlAnchorChangesPrivate;
+class Q_DECLARATIVE_EXPORT QmlAnchorChanges : public QmlStateOperation, public ActionEvent
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlSetAnchors)
+    Q_DECLARE_PRIVATE(QmlAnchorChanges)
 
     Q_PROPERTY(QFxItem *target READ object WRITE setObject)
     Q_PROPERTY(QString reset READ reset WRITE setReset)
@@ -117,8 +117,8 @@ class Q_DECLARATIVE_EXPORT QmlSetAnchors : public QmlStateOperation, public Acti
     Q_PROPERTY(QFxAnchorLine bottom READ bottom WRITE setBottom)
 
 public:
-    QmlSetAnchors(QObject *parent=0);
-    ~QmlSetAnchors();
+    QmlAnchorChanges(QObject *parent=0);
+    ~QmlAnchorChanges();
 
     virtual ActionList actions();
 
@@ -153,8 +153,8 @@ public:
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QmlParentChange)
-QML_DECLARE_TYPE(QmlRunScript)
-QML_DECLARE_TYPE(QmlSetAnchors)
+QML_DECLARE_TYPE(QmlStateChangeScript)
+QML_DECLARE_TYPE(QmlAnchorChanges)
 
 QT_END_HEADER
 
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 1a0d402..f1b599f 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -11,7 +11,7 @@ SOURCES += \
            util/qmlstate.cpp\
            util/qmltransitionmanager.cpp \
            util/qmlstateoperations.cpp \
-           util/qmlsetproperties.cpp \
+           util/qmlpropertychanges.cpp \
            util/qmlstategroup.cpp \
            util/qmltransition.cpp \
            util/qmllistmodel.cpp\
@@ -35,7 +35,7 @@ HEADERS += \
            util/qmlfollow.h \
            util/qmlstate.h\
            util/qmlstateoperations.h \
-           util/qmlsetproperties.h \
+           util/qmlpropertychanges.h \
            util/qmlstate_p.h\
            util/qmltransitionmanager_p.h \
            util/qmlstategroup.h \