Rename QFx classes to QmlGraphics

12 files changed, 160 insertions, 160 deletions

diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h
index 9b4aee1..67eff6c 100644
--- a/src/declarative/util/qfxglobal.h
+++ b/src/declarative/util/qfxglobal.h
@@ -67,7 +67,7 @@ QT_MODULE(Declarative)
         return status == Yes; \
     }
 
-struct QFx_DerivedObject : public QObject
+struct QmlGraphics_DerivedObject : public QObject
 {
     void setParent_noEvent(QObject *parent) {
         bool sce = d_ptr->sendChildEvents;
@@ -82,9 +82,9 @@ struct QFx_DerivedObject : public QObject
     neither \a parent nor the object's previous parent (if it had one) will
     receive ChildRemoved or ChildAdded events.
 */
-inline void QFx_setParent_noEvent(QObject *object, QObject *parent)
+inline void QmlGraphics_setParent_noEvent(QObject *object, QObject *parent)
 {
-    static_cast<QFx_DerivedObject *>(object)->setParent_noEvent(parent);
+    static_cast<QmlGraphics_DerivedObject *>(object)->setParent_noEvent(parent);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qfxperf.cpp b/src/declarative/util/qfxperf.cpp
index 739e480..97f195b 100644
--- a/src/declarative/util/qfxperf.cpp
+++ b/src/declarative/util/qfxperf.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_DEFINE_PERFORMANCE_LOG(QFxPerf, "QFx") {
+Q_DEFINE_PERFORMANCE_LOG(QmlPerf, "QmlGraphics") {
     Q_DEFINE_PERFORMANCE_METRIC(QmlParsing, "Compilation: QML Parsing")
     Q_DEFINE_PERFORMANCE_METRIC(Compilation, "             QML Compilation")
     Q_DEFINE_PERFORMANCE_METRIC(VMEExecution, "Execution:   QML VME Execution")
@@ -54,13 +54,13 @@ Q_DEFINE_PERFORMANCE_LOG(QFxPerf, "QFx") {
     Q_DEFINE_PERFORMANCE_METRIC(BindableValueUpdate, "QmlBinding::update")
     Q_DEFINE_PERFORMANCE_METRIC(PixmapLoad, "Pixmap loading")
     Q_DEFINE_PERFORMANCE_METRIC(FontDatabase, "Font database creation")
-    Q_DEFINE_PERFORMANCE_METRIC(QFxPathViewPathCache, "FX Items:    QFxPathView: Path cache")
-    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "             QFxParticles: Particle creation")
-    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "             QFxItem::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "             QFxImage::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "             QFxBasePositioner::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "             QFxText::componentComplete")
-    Q_DEFINE_PERFORMANCE_METRIC(QFxText_setText, "             QFxText::setText")
+    Q_DEFINE_PERFORMANCE_METRIC(QmlGraphicsPathViewPathCache, "FX Items:    QmlGraphicsPathView: Path cache")
+    Q_DEFINE_PERFORMANCE_METRIC(CreateParticle, "             QmlGraphicsParticles: Particle creation")
+    Q_DEFINE_PERFORMANCE_METRIC(ItemComponentComplete, "             QmlGraphicsItem::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(ImageComponentComplete, "             QmlGraphicsImage::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(BaseLayoutComponentComplete, "             QmlGraphicsBasePositioner::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(TextComponentComplete, "             QmlGraphicsText::componentComplete")
+    Q_DEFINE_PERFORMANCE_METRIC(QmlGraphicsText_setText, "             QmlGraphicsText::setText")
     Q_DEFINE_PERFORMANCE_METRIC(AddScript, "QmlScript::addScriptToEngine")
 }
 
diff --git a/src/declarative/util/qfxperf_p.h b/src/declarative/util/qfxperf_p.h
index cea7e80..37bfc32 100644
--- a/src/declarative/util/qfxperf_p.h
+++ b/src/declarative/util/qfxperf_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-Q_DECLARE_PERFORMANCE_LOG(QFxPerf) {
+Q_DECLARE_PERFORMANCE_LOG(QmlPerf) {
     Q_DECLARE_PERFORMANCE_METRIC(QmlParsing)
 
     Q_DECLARE_PERFORMANCE_METRIC(Compilation)
@@ -73,13 +73,13 @@ Q_DECLARE_PERFORMANCE_LOG(QFxPerf) {
     Q_DECLARE_PERFORMANCE_METRIC(BindableValueUpdate)
     Q_DECLARE_PERFORMANCE_METRIC(PixmapLoad)
     Q_DECLARE_PERFORMANCE_METRIC(FontDatabase)
-    Q_DECLARE_PERFORMANCE_METRIC(QFxPathViewPathCache)
+    Q_DECLARE_PERFORMANCE_METRIC(QmlGraphicsPathViewPathCache)
     Q_DECLARE_PERFORMANCE_METRIC(CreateParticle)
     Q_DECLARE_PERFORMANCE_METRIC(ItemComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(ImageComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(BaseLayoutComponentComplete)
     Q_DECLARE_PERFORMANCE_METRIC(TextComponentComplete)
-    Q_DECLARE_PERFORMANCE_METRIC(QFxText_setText)
+    Q_DECLARE_PERFORMANCE_METRIC(QmlGraphicsText_setText)
     Q_DECLARE_PERFORMANCE_METRIC(AddScript)
 }
 
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index f103a6b..e00a1c8 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -663,7 +663,7 @@ void QmlPauseAnimationPrivate::init()
 {
     Q_Q(QmlPauseAnimation);
     pa = new QPauseAnimation;
-    QFx_setParent_noEvent(pa, q);
+    QmlGraphics_setParent_noEvent(pa, q);
 }
 
 /*!
@@ -786,7 +786,7 @@ void QmlScriptActionPrivate::init()
 {
     Q_Q(QmlScriptAction);
     rsa = new QActionAnimation(&proxy);
-    QFx_setParent_noEvent(rsa, q);
+    QmlGraphics_setParent_noEvent(rsa, q);
 }
 
 /*!
@@ -904,7 +904,7 @@ void QmlPropertyActionPrivate::init()
 {
     Q_Q(QmlPropertyAction);
     spa = new QActionAnimation;
-    QFx_setParent_noEvent(spa, q);
+    QmlGraphics_setParent_noEvent(spa, q);
 }
 
 /*!
@@ -1097,28 +1097,28 @@ void QmlParentActionPrivate::init()
 {
     Q_Q(QmlParentAction);
     cpa = new QActionAnimation;
-    QFx_setParent_noEvent(cpa, q);
+    QmlGraphics_setParent_noEvent(cpa, q);
 }
 
-QFxItem *QmlParentAction::object() const
+QmlGraphicsItem *QmlParentAction::object() const
 {
     Q_D(const QmlParentAction);
     return d->pcTarget;
 }
 
-void QmlParentAction::setObject(QFxItem *target)
+void QmlParentAction::setObject(QmlGraphicsItem *target)
 {
     Q_D(QmlParentAction);
     d->pcTarget = target;
 }
 
-QFxItem *QmlParentAction::parent() const
+QmlGraphicsItem *QmlParentAction::parent() const
 {
     Q_D(const QmlParentAction);
     return d->pcParent;
 }
 
-void QmlParentAction::setParent(QFxItem *parent)
+void QmlParentAction::setParent(QmlGraphicsItem *parent)
 {
     Q_D(QmlParentAction);
     d->pcParent = parent;
@@ -1516,7 +1516,7 @@ void QmlPropertyAnimationPrivate::init()
 {
     Q_Q(QmlPropertyAnimation);
     va = new QmlTimeLineValueAnimator;
-    QFx_setParent_noEvent(va, q);
+    QmlGraphics_setParent_noEvent(va, q);
 
     va->setStartValue(QVariant(0.0f));
     va->setEndValue(QVariant(1.0f));
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index f4f9f38..4e94aa0 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -221,25 +221,25 @@ protected:
     virtual void prepare(QmlMetaProperty &);
 };
 
-class QFxItem;
+class QmlGraphicsItem;
 class QmlParentActionPrivate;
 class QmlParentAction : public QmlAbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlParentAction)
 
-    Q_PROPERTY(QFxItem *target READ object WRITE setObject)
-    Q_PROPERTY(QFxItem *parent READ parent WRITE setParent)
+    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
+    Q_PROPERTY(QmlGraphicsItem *parent READ parent WRITE setParent)
 
 public:
     QmlParentAction(QObject *parent=0);
     virtual ~QmlParentAction();
 
-    QFxItem *object() const;
-    void setObject(QFxItem *);
+    QmlGraphicsItem *object() const;
+    void setObject(QmlGraphicsItem *);
 
-    QFxItem *parent() const;
-    void setParent(QFxItem *);
+    QmlGraphicsItem *parent() const;
+    void setParent(QmlGraphicsItem *);
 
 protected:
     virtual void transition(QmlStateActions &actions,
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h
index 1f52fcd..38b92ae 100644
--- a/src/declarative/util/qmlanimation_p.h
+++ b/src/declarative/util/qmlanimation_p.h
@@ -275,8 +275,8 @@ public:
 
     void init();
 
-    QFxItem *pcTarget;
-    QFxItem *pcParent;
+    QmlGraphicsItem *pcTarget;
+    QmlGraphicsItem *pcParent;
 
     void doAction();
     QActionAnimation *cpa;
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index bb40a8b..b07def1 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -274,7 +274,7 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state,
     }
 
     if (oldState == 0 || newState == 0) {
-        if (!nullState) { nullState = new QmlState; QFx_setParent_noEvent(nullState, q); }
+        if (!nullState) { nullState = new QmlState; QmlGraphics_setParent_noEvent(nullState, q); }
         if (!oldState) oldState = nullState;
         if (!newState) newState = nullState;
     }
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 4d469f9..1bd9199 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -59,15 +59,15 @@ class QmlParentChangePrivate : public QObjectPrivate
 public:
     QmlParentChangePrivate() : target(0), parent(0), origParent(0), origStackBefore(0) {}
 
-    QFxItem *target;
-    QFxItem *parent;
-    QGuard<QFxItem> origParent;
-    QGuard<QFxItem> origStackBefore;
+    QmlGraphicsItem *target;
+    QmlGraphicsItem *parent;
+    QGuard<QmlGraphicsItem> origParent;
+    QGuard<QmlGraphicsItem> origStackBefore;
 
-    void doChange(QFxItem *targetParent, QFxItem *stackBefore = 0);
+    void doChange(QmlGraphicsItem *targetParent, QmlGraphicsItem *stackBefore = 0);
 };
 
-void QmlParentChangePrivate::doChange(QFxItem *targetParent, QFxItem *stackBefore)
+void QmlParentChangePrivate::doChange(QmlGraphicsItem *targetParent, QmlGraphicsItem *stackBefore)
 {
     if (targetParent && target && target->parentItem()) {
         //### for backwards direction, can we just restore original x, y, scale, rotation
@@ -105,7 +105,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent, QFxItem *stackBefor
 
         qreal xt = transform.dx();
         qreal yt = transform.dy();
-        if (target->transformOrigin() != QFxItem::TopLeft) {
+        if (target->transformOrigin() != QmlGraphicsItem::TopLeft) {
             qreal tempxt = target->transformOriginPoint().x();
             qreal tempyt = target->transformOriginPoint().y();
             QTransform t;
@@ -166,13 +166,13 @@ QmlParentChange::~QmlParentChange()
     This property holds the item to be reparented
 */
 
-QFxItem *QmlParentChange::object() const
+QmlGraphicsItem *QmlParentChange::object() const
 {
     Q_D(const QmlParentChange);
     return d->target;
 }
 
-void QmlParentChange::setObject(QFxItem *target)
+void QmlParentChange::setObject(QmlGraphicsItem *target)
 {
     Q_D(QmlParentChange);
     d->target = target;
@@ -183,13 +183,13 @@ void QmlParentChange::setObject(QFxItem *target)
     This property holds the parent for the item in this state
 */
 
-QFxItem *QmlParentChange::parent() const
+QmlGraphicsItem *QmlParentChange::parent() const
 {
     Q_D(const QmlParentChange);
     return d->parent;
 }
 
-void QmlParentChange::setParent(QFxItem *parent)
+void QmlParentChange::setParent(QmlGraphicsItem *parent)
 {
     Q_D(QmlParentChange);
     d->parent = parent;
@@ -207,13 +207,13 @@ QmlStateOperation::ActionList QmlParentChange::actions()
     return ActionList() << a;
 }
 
-class AccessibleFxItem : public QFxItem
+class AccessibleFxItem : public QmlGraphicsItem
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsItem)
 public:
     int siblingIndex() {
-        Q_D(QFxItem);
+        Q_D(QmlGraphicsItem);
         return d->siblingIndex;
     }
 };
@@ -238,7 +238,7 @@ void QmlParentChange::saveOriginals()
     int siblingIndex = ((AccessibleFxItem*)d->target)->siblingIndex() + 1;
     QList<QGraphicsItem*> children = d->origParent->childItems();
     for (int i = 0; i < children.count(); ++i) {
-        QFxItem *child = qobject_cast<QFxItem*>(children.at(i));
+        QmlGraphicsItem *child = qobject_cast<QmlGraphicsItem*>(children.at(i));
         if (!child)
             continue;
         if (((AccessibleFxItem*)child)->siblingIndex() == siblingIndex) {
@@ -368,24 +368,24 @@ public:
     QmlAnchorChangesPrivate() : target(0) {}
 
     QString name;
-    QFxItem *target;
+    QmlGraphicsItem *target;
     QString resetString;
     QStringList resetList;
-    QFxAnchorLine left;
-    QFxAnchorLine right;
-    QFxAnchorLine horizontalCenter;
-    QFxAnchorLine top;
-    QFxAnchorLine bottom;
-    QFxAnchorLine verticalCenter;
-    QFxAnchorLine baseline;
-
-    QFxAnchorLine origLeft;
-    QFxAnchorLine origRight;
-    QFxAnchorLine origHCenter;
-    QFxAnchorLine origTop;
-    QFxAnchorLine origBottom;
-    QFxAnchorLine origVCenter;
-    QFxAnchorLine origBaseline;
+    QmlGraphicsAnchorLine left;
+    QmlGraphicsAnchorLine right;
+    QmlGraphicsAnchorLine horizontalCenter;
+    QmlGraphicsAnchorLine top;
+    QmlGraphicsAnchorLine bottom;
+    QmlGraphicsAnchorLine verticalCenter;
+    QmlGraphicsAnchorLine baseline;
+
+    QmlGraphicsAnchorLine origLeft;
+    QmlGraphicsAnchorLine origRight;
+    QmlGraphicsAnchorLine origHCenter;
+    QmlGraphicsAnchorLine origTop;
+    QmlGraphicsAnchorLine origBottom;
+    QmlGraphicsAnchorLine origVCenter;
+    QmlGraphicsAnchorLine origBaseline;
     qreal origX;
     qreal origY;
     qreal origWidth;
@@ -413,13 +413,13 @@ QmlAnchorChanges::ActionList QmlAnchorChanges::actions()
     return ActionList() << a;
 }
 
-QFxItem *QmlAnchorChanges::object() const
+QmlGraphicsItem *QmlAnchorChanges::object() const
 {
     Q_D(const QmlAnchorChanges);
     return d->target;
 }
 
-void QmlAnchorChanges::setObject(QFxItem *target)
+void QmlAnchorChanges::setObject(QmlGraphicsItem *target)
 {
     Q_D(QmlAnchorChanges);
     d->target = target;
@@ -450,85 +450,85 @@ void QmlAnchorChanges::setReset(const QString &reset)
     These properties change the respective anchors of the item.
 */
 
-QFxAnchorLine QmlAnchorChanges::left() const
+QmlGraphicsAnchorLine QmlAnchorChanges::left() const
 {
     Q_D(const QmlAnchorChanges);
     return d->left;
 }
 
-void QmlAnchorChanges::setLeft(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setLeft(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->left = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::right() const
+QmlGraphicsAnchorLine QmlAnchorChanges::right() const
 {
     Q_D(const QmlAnchorChanges);
     return d->right;
 }
 
-void QmlAnchorChanges::setRight(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setRight(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->right = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::horizontalCenter() const
+QmlGraphicsAnchorLine QmlAnchorChanges::horizontalCenter() const
 {
     Q_D(const QmlAnchorChanges);
     return d->horizontalCenter;
 }
 
-void QmlAnchorChanges::setHorizontalCenter(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setHorizontalCenter(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->horizontalCenter = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::top() const
+QmlGraphicsAnchorLine QmlAnchorChanges::top() const
 {
     Q_D(const QmlAnchorChanges);
     return d->top;
 }
 
-void QmlAnchorChanges::setTop(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setTop(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->top = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::bottom() const
+QmlGraphicsAnchorLine QmlAnchorChanges::bottom() const
 {
     Q_D(const QmlAnchorChanges);
     return d->bottom;
 }
 
-void QmlAnchorChanges::setBottom(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setBottom(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->bottom = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::verticalCenter() const
+QmlGraphicsAnchorLine QmlAnchorChanges::verticalCenter() const
 {
     Q_D(const QmlAnchorChanges);
     return d->verticalCenter;
 }
 
-void QmlAnchorChanges::setVerticalCenter(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setVerticalCenter(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->verticalCenter = edge;
 }
 
-QFxAnchorLine QmlAnchorChanges::baseline() const
+QmlGraphicsAnchorLine QmlAnchorChanges::baseline() const
 {
     Q_D(const QmlAnchorChanges);
     return d->baseline;
 }
 
-void QmlAnchorChanges::setBaseline(const QFxAnchorLine &edge)
+void QmlAnchorChanges::setBaseline(const QmlGraphicsAnchorLine &edge)
 {
     Q_D(QmlAnchorChanges);
     d->baseline = edge;
@@ -541,19 +541,19 @@ void QmlAnchorChanges::execute()
         return;
 
     //set any anchors that have been specified
-    if (d->left.anchorLine != QFxAnchorLine::Invalid)
+    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setLeft(d->left);
-    if (d->right.anchorLine != QFxAnchorLine::Invalid)
+    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setRight(d->right);
-    if (d->horizontalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setHorizontalCenter(d->horizontalCenter);
-    if (d->top.anchorLine != QFxAnchorLine::Invalid)
+    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setTop(d->top);
-    if (d->bottom.anchorLine != QFxAnchorLine::Invalid)
+    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setBottom(d->bottom);
-    if (d->verticalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setVerticalCenter(d->verticalCenter);
-    if (d->baseline.anchorLine != QFxAnchorLine::Invalid)
+    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setBaseline(d->baseline);
 }
 
@@ -569,19 +569,19 @@ void QmlAnchorChanges::reverse()
         return;
 
     //restore previous anchors
-    if (d->origLeft.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origLeft.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setLeft(d->origLeft);
-    if (d->origRight.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origRight.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setRight(d->origRight);
-    if (d->origHCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origHCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setHorizontalCenter(d->origHCenter);
-    if (d->origTop.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origTop.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setTop(d->origTop);
-    if (d->origBottom.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origBottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setBottom(d->origBottom);
-    if (d->origVCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origVCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setVerticalCenter(d->origVCenter);
-    if (d->origBaseline.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origBaseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->setBaseline(d->origBaseline);
 }
 
@@ -662,19 +662,19 @@ void QmlAnchorChanges::clearForwardBindings()
         d->target->anchors()->resetBaseline();
 
     //reset any anchors that we'll be setting in the state
-    if (d->left.anchorLine != QFxAnchorLine::Invalid)
+    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetLeft();
-    if (d->right.anchorLine != QFxAnchorLine::Invalid)
+    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetRight();
-    if (d->horizontalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetHorizontalCenter();
-    if (d->top.anchorLine != QFxAnchorLine::Invalid)
+    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetTop();
-    if (d->bottom.anchorLine != QFxAnchorLine::Invalid)
+    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBottom();
-    if (d->verticalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetVerticalCenter();
-    if (d->baseline.anchorLine != QFxAnchorLine::Invalid)
+    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBaseline();
 }
 
@@ -687,35 +687,35 @@ void QmlAnchorChanges::clearReverseBindings()
     d->origHeight = d->target->height();
 
     //reset any anchors that were set in the state
-    if (d->left.anchorLine != QFxAnchorLine::Invalid)
+    if (d->left.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetLeft();
-    if (d->right.anchorLine != QFxAnchorLine::Invalid)
+    if (d->right.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetRight();
-    if (d->horizontalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->horizontalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetHorizontalCenter();
-    if (d->top.anchorLine != QFxAnchorLine::Invalid)
+    if (d->top.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetTop();
-    if (d->bottom.anchorLine != QFxAnchorLine::Invalid)
+    if (d->bottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBottom();
-    if (d->verticalCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->verticalCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetVerticalCenter();
-    if (d->baseline.anchorLine != QFxAnchorLine::Invalid)
+    if (d->baseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBaseline();
 
     //reset any anchors that were set in the original state
-    if (d->origLeft.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origLeft.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetLeft();
-    if (d->origRight.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origRight.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetRight();
-    if (d->origHCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origHCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetHorizontalCenter();
-    if (d->origTop.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origTop.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetTop();
-    if (d->origBottom.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origBottom.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBottom();
-    if (d->origVCenter.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origVCenter.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetVerticalCenter();
-    if (d->origBaseline.anchorLine != QFxAnchorLine::Invalid)
+    if (d->origBaseline.anchorLine != QmlGraphicsAnchorLine::Invalid)
         d->target->anchors()->resetBaseline();
 }
 
diff --git a/src/declarative/util/qmlstateoperations.h b/src/declarative/util/qmlstateoperations.h
index 237e3e8..903998d 100644
--- a/src/declarative/util/qmlstateoperations.h
+++ b/src/declarative/util/qmlstateoperations.h
@@ -59,17 +59,17 @@ class Q_DECLARATIVE_EXPORT QmlParentChange : public QmlStateOperation, public Ac
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlParentChange)
 
-    Q_PROPERTY(QFxItem *target READ object WRITE setObject)
-    Q_PROPERTY(QFxItem *parent READ parent WRITE setParent)
+    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
+    Q_PROPERTY(QmlGraphicsItem *parent READ parent WRITE setParent)
 public:
     QmlParentChange(QObject *parent=0);
     ~QmlParentChange();
 
-    QFxItem *object() const;
-    void setObject(QFxItem *);
+    QmlGraphicsItem *object() const;
+    void setObject(QmlGraphicsItem *);
 
-    QFxItem *parent() const;
-    void setParent(QFxItem *);
+    QmlGraphicsItem *parent() const;
+    void setParent(QmlGraphicsItem *);
 
     virtual ActionList actions();
 
@@ -111,15 +111,15 @@ class Q_DECLARATIVE_EXPORT QmlAnchorChanges : public QmlStateOperation, public A
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlAnchorChanges)
 
-    Q_PROPERTY(QFxItem *target READ object WRITE setObject)
+    Q_PROPERTY(QmlGraphicsItem *target READ object WRITE setObject)
     Q_PROPERTY(QString reset READ reset WRITE setReset)
-    Q_PROPERTY(QFxAnchorLine left READ left WRITE setLeft)
-    Q_PROPERTY(QFxAnchorLine right READ right WRITE setRight)
-    Q_PROPERTY(QFxAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter)
-    Q_PROPERTY(QFxAnchorLine top READ top WRITE setTop)
-    Q_PROPERTY(QFxAnchorLine bottom READ bottom WRITE setBottom)
-    Q_PROPERTY(QFxAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter)
-    Q_PROPERTY(QFxAnchorLine baseline READ baseline WRITE setBaseline)
+    Q_PROPERTY(QmlGraphicsAnchorLine left READ left WRITE setLeft)
+    Q_PROPERTY(QmlGraphicsAnchorLine right READ right WRITE setRight)
+    Q_PROPERTY(QmlGraphicsAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter)
+    Q_PROPERTY(QmlGraphicsAnchorLine top READ top WRITE setTop)
+    Q_PROPERTY(QmlGraphicsAnchorLine bottom READ bottom WRITE setBottom)
+    Q_PROPERTY(QmlGraphicsAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter)
+    Q_PROPERTY(QmlGraphicsAnchorLine baseline READ baseline WRITE setBaseline)
 
 public:
     QmlAnchorChanges(QObject *parent=0);
@@ -127,32 +127,32 @@ public:
 
     virtual ActionList actions();
 
-    QFxItem *object() const;
-    void setObject(QFxItem *);
+    QmlGraphicsItem *object() const;
+    void setObject(QmlGraphicsItem *);
 
     QString reset() const;
     void setReset(const QString &);
 
-    QFxAnchorLine left() const;
-    void setLeft(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine left() const;
+    void setLeft(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine right() const;
-    void setRight(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine right() const;
+    void setRight(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine horizontalCenter() const;
-    void setHorizontalCenter(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine horizontalCenter() const;
+    void setHorizontalCenter(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine top() const;
-    void setTop(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine top() const;
+    void setTop(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine bottom() const;
-    void setBottom(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine bottom() const;
+    void setBottom(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine verticalCenter() const;
-    void setVerticalCenter(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine verticalCenter() const;
+    void setVerticalCenter(const QmlGraphicsAnchorLine &edge);
 
-    QFxAnchorLine baseline() const;
-    void setBaseline(const QFxAnchorLine &edge);
+    QmlGraphicsAnchorLine baseline() const;
+    void setBaseline(const QmlGraphicsAnchorLine &edge);
 
     virtual void execute();
     virtual bool isReversable();
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index f1991f5..1d90051 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -66,7 +66,7 @@ public:
 };
 
 /*!
-    \qmlclass Timer QFxTimer
+    \qmlclass Timer QmlGraphicsTimer
     \brief The Timer item triggers a handler at a specified interval.
 
     A timer can be used to trigger an action either once, or repeatedly
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 329a9b2..ac67cb8 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -136,7 +136,7 @@ public:
         : q(w), root(0), component(0), resizable(false) {}
 
     QmlView *q;
-    QFxItem *root;
+    QmlGraphicsItem *root;
 
     QUrl source;
     QString qml;
@@ -193,7 +193,7 @@ void QmlViewPrivate::init()
     QmlMetaType::registerCustomStringConverter(QVariant::KeySequence, &stringToKeySequence);
 
 #ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::FontDatabase> perf;
+    QmlPerfTimer<QmlPerf::FontDatabase> perf;
 #endif
     QFontDatabase database;
 
@@ -213,7 +213,7 @@ void QmlViewPrivate::init()
 }
 
 /*!
-  The destructor clears the view's \l {QFxItem} {items} and
+  The destructor clears the view's \l {QmlGraphicsItem} {items} and
   deletes the internal representation.
 
   \sa clearItems()
@@ -337,7 +337,7 @@ void QmlView::continueExecute()
     }
 
     if (obj) {
-        if (QFxItem *item = qobject_cast<QFxItem *>(obj)) {
+        if (QmlGraphicsItem *item = qobject_cast<QmlGraphicsItem *>(obj)) {
 
             d->scene.addItem(item);
 
@@ -476,11 +476,11 @@ QSize QmlView::sizeHint() const
 
 /*!
   Creates a \l{QmlComponent} {component} from the \a qml
-  string, and returns it as an \l {QFxItem} {item}. If the
+  string, and returns it as an \l {QmlGraphicsItem} {item}. If the
   \a parent item is provided, it becomes the new item's
   parent. \a parent should be in this view's item hierarchy.
  */
-QFxItem* QmlView::addItem(const QString &qml, QFxItem* parent)
+QmlGraphicsItem* QmlView::addItem(const QString &qml, QmlGraphicsItem* parent)
 {
     if (!d->root)
         return 0;
@@ -508,7 +508,7 @@ QFxItem* QmlView::addItem(const QString &qml, QFxItem* parent)
     }
 
     if (obj){
-        QFxItem *item = static_cast<QFxItem *>(obj);
+        QmlGraphicsItem *item = static_cast<QmlGraphicsItem *>(obj);
         if (!parent)
             parent = d->root;
 
@@ -519,7 +519,7 @@ QFxItem* QmlView::addItem(const QString &qml, QFxItem* parent)
 }
 
 /*!
-  Deletes the view's \l {QFxItem} {items} and the \l {QmlEngine}
+  Deletes the view's \l {QmlGraphicsItem} {items} and the \l {QmlEngine}
   {QML engine's} Component cache.
  */
 void QmlView::reset()
@@ -530,7 +530,7 @@ void QmlView::reset()
 }
 
 /*!
-  Deletes the view's \l {QFxItem} {items}.
+  Deletes the view's \l {QmlGraphicsItem} {items}.
  */
 void QmlView::clearItems()
 {
@@ -541,9 +541,9 @@ void QmlView::clearItems()
 }
 
 /*!
-  Returns the view's root \l {QFxItem} {item}.
+  Returns the view's root \l {QmlGraphicsItem} {item}.
  */
-QFxItem *QmlView::root() const
+QmlGraphicsItem *QmlView::root() const
 {
     return d->root;
 }
diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h
index 822827a..4b2dd1c 100644
--- a/src/declarative/util/qmlview.h
+++ b/src/declarative/util/qmlview.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class QFxItem;
+class QmlGraphicsItem;
 class QmlEngine;
 class QmlContext;
 class QmlError;
@@ -78,10 +78,10 @@ public:
     virtual void execute();
     virtual void reset();
 
-    virtual QFxItem* addItem(const QString &qml, QFxItem* parent=0);
+    virtual QmlGraphicsItem* addItem(const QString &qml, QmlGraphicsItem* parent=0);
     virtual void clearItems();
 
-    virtual QFxItem *root() const;
+    virtual QmlGraphicsItem *root() const;
 
     void setContentResizable(bool);
     bool contentResizable() const;