remove itemParent() and related.

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

13 files changed, 61 insertions, 79 deletions

diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp
index 9704fef..9093c8e 100644
--- a/src/declarative/fx/qfxanchors.cpp
+++ b/src/declarative/fx/qfxanchors.cpp
@@ -152,9 +152,9 @@ void QFxAnchorsPrivate::fillChanged()
     if (!fill || !isItemComplete())
         return;
 
-    if (fill == item->itemParent()) {                         //child-parent
+    if (fill == item->parentItem()) {                         //child-parent
         setItemPos(QPointF(leftMargin, topMargin));
-    } else if (fill->itemParent() == item->itemParent()) {   //siblings
+    } else if (fill->parentItem() == item->parentItem()) {   //siblings
         setItemPos(QPointF(fill->x()+leftMargin, fill->y()+topMargin));
     }
     setItemWidth(fill->width()-leftMargin-rightMargin);
@@ -166,12 +166,12 @@ void QFxAnchorsPrivate::centeredInChanged()
     if (!centeredIn || fill || !isItemComplete())
         return;
 
-    if (centeredIn == item->itemParent()) {
-        QPointF p((item->itemParent()->width() - item->width()) / 2.,
-                  (item->itemParent()->height() - item->height()) / 2.);
+    if (centeredIn == item->parentItem()) {
+        QPointF p((item->parentItem()->width() - item->width()) / 2.,
+                  (item->parentItem()->height() - item->height()) / 2.);
         setItemPos(p);
 
-    } else if (centeredIn->itemParent() == item->itemParent()) {
+    } else if (centeredIn->parentItem() == item->parentItem()) {
 
         QPointF p(centeredIn->x() + (centeredIn->width() - item->width()) / 2.,
                   centeredIn->y() + (centeredIn->height() - item->height()) / 2.);
@@ -328,7 +328,7 @@ void QFxAnchors::setFill(QFxItem *f)
         d->fill = f;
         return;
     }
-    if (f != d->item->itemParent() && f->itemParent() != d->item->itemParent()){
+    if (f != d->item->parentItem() && f->parentItem() != d->item->parentItem()){
         qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
         return;
     }
@@ -360,7 +360,7 @@ void QFxAnchors::setCenteredIn(QFxItem* c)
         d->centeredIn = c;
         return;
     }
-    if (c != d->item->itemParent() && c->itemParent() != d->item->itemParent()){
+    if (c != d->item->parentItem() && c->parentItem() != d->item->parentItem()){
         qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling.";
         return;
     }
@@ -379,10 +379,10 @@ bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
                                     QFxAnchorLine::AnchorLine line,
                                     int &stretch)
 {
-    bool edge1IsParent = (edge1.item == item->itemParent());
-    bool edge2IsParent = (edge2.item == item->itemParent());
-    bool edge1IsSibling = (edge1.item->itemParent() == item->itemParent());
-    bool edge2IsSibling = (edge2.item->itemParent() == item->itemParent());
+    bool edge1IsParent = (edge1.item == item->parentItem());
+    bool edge2IsParent = (edge2.item == item->parentItem());
+    bool edge1IsSibling = (edge1.item->parentItem() == item->parentItem());
+    bool edge2IsSibling = (edge2.item->parentItem() == item->parentItem());
 
     bool invalid = false;
     if ((edge2IsParent && edge1IsParent) || (edge2IsSibling && edge1IsSibling)) {
@@ -390,10 +390,10 @@ bool QFxAnchorsPrivate::calcStretch(const QFxAnchorLine &edge1,
                     - ((int)position(edge1.item, edge1.anchorLine) + offset1);
     } else if (edge2IsParent && edge1IsSibling) {
         stretch = ((int)position(edge2.item, edge2.anchorLine) + offset2)
-                    - ((int)position(item->itemParent(), line)
+                    - ((int)position(item->parentItem(), line)
                     + (int)position(edge1.item, edge1.anchorLine) + offset1);
     } else if (edge2IsSibling && edge1IsParent) {
-        stretch = ((int)position(item->itemParent(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
+        stretch = ((int)position(item->parentItem(), line) + (int)position(edge2.item, edge2.anchorLine) + offset2)
                     - ((int)position(edge1.item, edge1.anchorLine) + offset1);
     } else
         invalid = true;
@@ -422,9 +422,9 @@ void QFxAnchorsPrivate::updateVerticalAnchors()
                 setItemHeight(height);
 
             //Handle top
-            if (top.item == item->itemParent()) {
+            if (top.item == item->parentItem()) {
                 setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
-            } else if (top.item->itemParent() == item->itemParent()) {
+            } else if (top.item->parentItem() == item->parentItem()) {
                 setItemY(position(top.item, top.anchorLine) + topMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasBottomAnchor) {
@@ -438,24 +438,24 @@ void QFxAnchorsPrivate::updateVerticalAnchors()
             }
 
             //Handle bottom
-            if (bottom.item == item->itemParent()) {
+            if (bottom.item == item->parentItem()) {
                 setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
-            } else if (bottom.item->itemParent() == item->itemParent()) {
+            } else if (bottom.item->parentItem() == item->parentItem()) {
                 setItemY(position(bottom.item, bottom.anchorLine) - item->height() - bottomMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasVCenterAnchor) {
             //(stetching handled above)
 
             //Handle vCenter
-            if (vCenter.item == item->itemParent()) {
+            if (vCenter.item == item->parentItem()) {
                 setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
                               - item->height()/2 + vCenterOffset);
-            } else if (vCenter.item->itemParent() == item->itemParent()) {
+            } else if (vCenter.item->parentItem() == item->parentItem()) {
                 setItemY(position(vCenter.item, vCenter.anchorLine) - item->height()/2 + vCenterOffset);
             }
         } else if (usedAnchors & QFxAnchors::HasBaselineAnchor) {
             //Handle baseline
-            if (baseline.item->itemParent() == item->itemParent()) {
+            if (baseline.item->parentItem() == item->parentItem()) {
                 setItemY(position(baseline.item, baseline.anchorLine) - item->baselineOffset());
             }
         }
@@ -488,9 +488,9 @@ void QFxAnchorsPrivate::updateHorizontalAnchors()
                 setItemWidth(width);
 
             //Handle left
-            if (left.item == item->itemParent()) {
+            if (left.item == item->parentItem()) {
                 setItemX(adjustedPosition(left.item, left.anchorLine) + leftMargin);
-            } else if (left.item->itemParent() == item->itemParent()) {
+            } else if (left.item->parentItem() == item->parentItem()) {
                 setItemX(position(left.item, left.anchorLine) + leftMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasRightAnchor) {
@@ -504,16 +504,16 @@ void QFxAnchorsPrivate::updateHorizontalAnchors()
             }
 
             //Handle right
-            if (right.item == item->itemParent()) {
+            if (right.item == item->parentItem()) {
                 setItemX(adjustedPosition(right.item, right.anchorLine) - item->width() - rightMargin);
-            } else if (right.item->itemParent() == item->itemParent()) {
+            } else if (right.item->parentItem() == item->parentItem()) {
                 setItemX(position(right.item, right.anchorLine) - item->width() - rightMargin);
             }
         } else if (usedAnchors & QFxAnchors::HasHCenterAnchor) {
             //Handle hCenter
-            if (hCenter.item == item->itemParent()) {
+            if (hCenter.item == item->parentItem()) {
                 setItemX(adjustedPosition(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
-            } else if (hCenter.item->itemParent() == item->itemParent()) {
+            } else if (hCenter.item->parentItem() == item->parentItem()) {
                 setItemX(position(hCenter.item, hCenter.anchorLine) - item->width()/2 + hCenterOffset);
             }
         }
@@ -892,7 +892,7 @@ bool QFxAnchorsPrivate::checkHAnchorValid(QFxAnchorLine anchor) const
     } else if (anchor.anchorLine & QFxAnchorLine::Vertical_Mask) {
         qmlInfo(item) << "Can't anchor a horizontal edge to a vertical edge.";
         return false;
-    } else if (anchor.item != item->itemParent() && anchor.item->itemParent() != item->itemParent()){
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
         qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
         return false;
     } else if (anchor.item == item) {
@@ -929,7 +929,7 @@ bool QFxAnchorsPrivate::checkVAnchorValid(QFxAnchorLine anchor) const
     } else if (anchor.anchorLine & QFxAnchorLine::Horizontal_Mask) {
         qmlInfo(item) << "Can't anchor a vertical edge to a horizontal edge.";
         return false;
-    } else if (anchor.item != item->itemParent() && anchor.item->itemParent() != item->itemParent()){
+    } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
         qmlInfo(item) << "Can't anchor to an item that isn't a parent or sibling.";
         return false;
     } else if (anchor.item == item){
diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp
index 3ea45bd..a85b25d 100644
--- a/src/declarative/fx/qfxcomponentinstance.cpp
+++ b/src/declarative/fx/qfxcomponentinstance.cpp
@@ -113,7 +113,7 @@ void QFxComponentInstance::create()
             QFxItem *objitem = qobject_cast<QFxItem *>(obj);
             if (objitem) {
                 d->instance = objitem;
-                objitem->setItemParent(this);
+                objitem->setParentItem(this);
                 objitem->setFocus(true);
                 connect(objitem, SIGNAL(widthChanged()), this, SLOT(updateSize()));
                 connect(objitem, SIGNAL(heightChanged()), this, SLOT(updateSize()));
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 27ac92d..8df6f2a 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1380,9 +1380,9 @@ void QFxGridView::destroyRemoved()
 void QFxGridView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxGridView);
-    item->setItemParent(this);
+    item->setParentItem(this);
     if (d->requestedIndex != index) {
-        item->setItemParent(this);
+        item->setParentItem(this);
         d->unrequestedItems.insert(item, index);
         if (d->flow == QFxGridView::LeftToRight) {
             item->setPos(QPointF(d->colPosAt(index), d->rowPosAt(index)));
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index b8f4696..edf61e4 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -354,7 +354,7 @@ void QFxContents::setItem(QFxItem *item)
 
     This signal is emitted when the parent of the item changes.
 
-    \sa setItemParent()
+    \sa setParentItem()
 */
 
 /*!
@@ -440,22 +440,23 @@ QFxItem::~QFxItem()
     \property QFxItem::parent
     This property holds the parent of the item.
 */
-void QFxItem::setItemParent(QFxItem *parent)
+void QFxItem::setParentItem(QFxItem *parent)
 {
-    setParent(parent);
+    QFxItem *oldParent = parentItem();
+    if (parent == oldParent || !parent) return;
+
+    QObject::setParent(parent);
+    QGraphicsObject::setParentItem(parent);
+
+    parentChanged(parent, oldParent);
 }
 
 /*!
     Returns the QFxItem parent of this item.
 */
-QFxItem *QFxItem::itemParent() const
-{
-    return qobject_cast<QFxItem *>(QGraphicsItem::parentItem());
-}
-
 QFxItem *QFxItem::parentItem() const
 {
-    return itemParent();
+    return qobject_cast<QFxItem *>(QGraphicsObject::parentItem());
 }
 
 /*!
@@ -849,7 +850,7 @@ void QFxItem::qmlLoaded()
             qWarning() << d->_qmlcomp->errors();
         QFxItem *qmlChild = qobject_cast<QFxItem *>(obj);
         if (qmlChild) {
-            qmlChild->setItemParent(this);
+            qmlChild->setParentItem(this);
             d->_qmlChildren.insert(d->_qml.toString(), qmlChild);
             d->qmlItem = qmlChild;
         } else {
@@ -1037,8 +1038,8 @@ void QFxItem::keyPressEvent(QKeyEvent *event)
     QFxKeyEvent ke(*event);
     emit keyPress(&ke);
     event->setAccepted(ke.isAccepted());
-    if (itemParent() && !ke.isAccepted())
-        itemParent()->keyPressEvent(event);
+    if (parentItem() && !ke.isAccepted())
+        parentItem()->keyPressEvent(event);
 }
 
 /*!
@@ -1049,8 +1050,8 @@ void QFxItem::keyReleaseEvent(QKeyEvent *event)
     QFxKeyEvent ke(*event);
     emit keyRelease(&ke);
     event->setAccepted(ke.isAccepted());
-    if (itemParent() && !ke.isAccepted())
-        itemParent()->keyReleaseEvent(event);
+    if (parentItem() && !ke.isAccepted())
+        parentItem()->keyReleaseEvent(event);
 }
 
 /*!
@@ -2271,22 +2272,6 @@ void QFxItem::setOptions(Options options, bool set)
     }
 }
 
-/*!
-    \fn void QFxItem::setParent(QFxItem *parent)
-
-    Sets the parent of the item to \a parent.
- */
-void QFxItem::setParent(QFxItem *p)
-{
-    if (p == parent() || !p) return;
-
-    QObject::setParent(p);
-
-    QFxItem *oldParent = itemParent();
-    setParentItem(p);
-    parentChanged(p, oldParent);
-}
-
 void QFxItem::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     paintContents(*p);
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index a75bdcd..c444507 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -121,7 +121,7 @@ class Q_DECLARATIVE_EXPORT QFxItem : public QGraphicsObject, public QmlParserSta
     Q_OBJECT
     Q_INTERFACES(QmlParserStatus)
 
-    Q_PROPERTY(QFxItem * parent READ itemParent WRITE setItemParent NOTIFY parentChanged DESIGNABLE false FINAL)
+    Q_PROPERTY(QFxItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL)
     Q_PROPERTY(QmlList<QFxItem *>* children READ children DESIGNABLE false)
     Q_PROPERTY(QmlList<QObject *>* resources READ resources DESIGNABLE false)
     Q_PROPERTY(QFxAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL)
@@ -176,9 +176,8 @@ public:
     QFxItem(QFxItem *parent = 0);
     virtual ~QFxItem();
 
-    QFxItem *itemParent() const; // ### remove me
     QFxItem *parentItem() const;
-    void setItemParent(QFxItem *parent); // ## setParentItem
+    void setParentItem(QFxItem *parent); // ## setParentItem
 
     QmlList<QObject *> *data();
     QmlList<QFxItem *> *children();
@@ -240,8 +239,6 @@ public:
     void setTransformOrigin(TransformOrigin);
     QPointF transformOriginPoint() const;
 
-    void setParent(QFxItem *);
-
     QRect itemBoundingRect(); // ### remove me
 
     void setPaintMargin(qreal margin);
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h
index 5ab31b8..08d2e4a 100644
--- a/src/declarative/fx/qfxitem_p.h
+++ b/src/declarative/fx/qfxitem_p.h
@@ -92,7 +92,7 @@ public:
         Q_Q(QFxItem);
 
         if (parent)
-            q->setItemParent(parent);
+            q->setParentItem(parent);
         _baselineOffset.invalidate();
         q->setAcceptedMouseButtons(Qt::NoButton);
         q->setFlags(QGraphicsItem::ItemHasNoContents |
diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp
index 6b94321..0546845 100644
--- a/src/declarative/fx/qfxlayouts.cpp
+++ b/src/declarative/fx/qfxlayouts.cpp
@@ -378,12 +378,12 @@ void QFxBaseLayout::preLayout()
 
     if (d->aut & Horizontal)
         setWidth(int(width));
-    else if (itemParent())
-        setImplicitWidth(itemParent()->width());
+    else if (parentItem())
+        setImplicitWidth(parentItem()->width());
     if (d->aut & Vertical)
         setHeight(int(height));
-    else if (itemParent())
-        setImplicitHeight(itemParent()->height());
+    else if (parentItem())
+        setImplicitHeight(parentItem()->height());
     setLayoutItem(0);
 }
 
diff --git a/src/declarative/fx/qfxlineedit.cpp b/src/declarative/fx/qfxlineedit.cpp
index 4ff3504..a185383 100644
--- a/src/declarative/fx/qfxlineedit.cpp
+++ b/src/declarative/fx/qfxlineedit.cpp
@@ -367,7 +367,7 @@ void QFxLineEdit::createCursor()
         return;
     }
 
-    d->cursorItem->setItemParent(this);
+    d->cursorItem->setParentItem(this);
     d->cursorItem->setX(d->control->cursorToX());
     d->cursorItem->setHeight(d->control->height());
 }
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 36ecddd..5f1defd 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1615,7 +1615,7 @@ void QFxListView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxListView);
     if (d->requestedIndex != index) {
-        item->setItemParent(viewport());
+        item->setParentItem(viewport());
         d->unrequestedItems.insert(item, index);
         if (d->orient == Qt::Vertical)
             item->setY(d->positionAt(index));
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index 2a36c25..98121e6 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -737,7 +737,7 @@ void QFxPathView::createdItem(int index, QFxItem *item)
 {
     Q_D(QFxPathView);
     if (d->requestedIndex != index) {
-        item->setItemParent(this);
+        item->setParentItem(this);
         d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
     }
 }
diff --git a/src/declarative/fx/qfxpathview_p.h b/src/declarative/fx/qfxpathview_p.h
index 63c8224..be9509f 100644
--- a/src/declarative/fx/qfxpathview_p.h
+++ b/src/declarative/fx/qfxpathview_p.h
@@ -96,7 +96,7 @@ public:
         requestedIndex = modelIndex;
         QFxItem *item = model->item(modelIndex);
         if (item)
-            item->setItemParent(q);
+            item->setParentItem(q);
         requestedIndex = -1;
         return item;
     }
diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp
index 084921b..a231f20 100644
--- a/src/declarative/fx/qfxrepeater.cpp
+++ b/src/declarative/fx/qfxrepeater.cpp
@@ -62,7 +62,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem)
     QObject *nobj = component->create(ctxt);
     QFxItem *item = qobject_cast<QFxItem *>(nobj);
     if (item) {
-        item->setParent(q->itemParent());
+        item->setParent(q->parentItem());
 //        item->stackUnder(lastItem);
         deletables << nobj;
     } else {
@@ -259,7 +259,7 @@ void QFxRepeater::regenerate()
     
     qDeleteAll(d->deletables); 
     d->deletables.clear();
-    if (!d->component || !itemParent() || !isComponentComplete())
+    if (!d->component || !parentItem() || !isComponentComplete())
         return;
 
     QFxItem *lastItem = this;
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index fbb2d53..abad7fc 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -531,7 +531,7 @@ void QFxTextEdit::loadCursorDelegate()
                 this, SLOT(moveCursorDelegate()));
         d->control->setCursorWidth(0);
         dirtyCache(cursorRect());
-        d->cursor->setItemParent(this);
+        d->cursor->setParentItem(this);
         d->cursor->setHeight(QFontMetrics(d->font.font()).height());
         moveCursorDelegate();
     }else{