remove itemParent() and related.

Consistently use parentItem() as it is consistent with
the naming in QGraphicsItem.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 96d9e8e..2f5cdd3 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -443,7 +443,7 @@ QFxItem* QFxView::addItem(const QString &qml, QFxItem* parent)
         if (!parent)
             parent = d->root;
 
-        item->setItemParent(parent);
+        item->setParentItem(parent);
         return item;
     }
     return 0;
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 3d03c34..7caf3ed 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -63,8 +63,8 @@ public:
 
 void QmlParentChangePrivate::doChange(QFxItem *targetParent)
 {
-    if (targetParent && target && target->itemParent()) {
-        QPointF me = target->itemParent()->mapToScene(QPointF(0,0));
+    if (targetParent && target && target->parentItem()) {
+        QPointF me = target->parentItem()->mapToScene(QPointF(0,0));
         QPointF them = targetParent->mapToScene(QPointF(0,0));
 
         QPointF themx = targetParent->mapToScene(QPointF(1,0));
@@ -73,7 +73,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent)
         themx -= them;
         themy -= them;
 
-        target->setItemParent(targetParent);
+        target->setParentItem(targetParent);
 
         // XXX - this is silly and will only work in a few cases
 
@@ -112,7 +112,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent)
         target->setX(target->x() - rx);
         target->setY(target->y() - ry);
     } else if (target) {
-        target->setItemParent(targetParent);
+        target->setParentItem(targetParent);
     }
 }
 
@@ -182,7 +182,7 @@ void QmlParentChange::execute()
 {
     Q_D(QmlParentChange);
     if (d->target)
-        d->origParent = d->target->itemParent();
+        d->origParent = d->target->parentItem();
     d->doChange(d->parent);
 }