Cleanup and optimize QQuickContents.

Change-Id: I12e51b431a7568bc80d8200d1c619373a72521c0
Reviewed-by: Martin Jones <martin.jones@nokia.com>

1 files changed, 21 insertions, 13 deletions

diff --git a/src/declarative/items/qquickitem_p.h b/src/declarative/items/qquickitem_p.h
index e9ddae5f75..08ae7fac9b 100644
--- a/src/declarative/items/qquickitem_p.h
+++ b/src/declarative/items/qquickitem_p.h
@@ -84,33 +84,28 @@ class QNetworkReply;
 class QQuickItemKeyFilter;
 class QQuickLayoutMirroringAttached;
 
-//### merge into private?
-class QQuickContents : public QObject, public QQuickItemChangeListener
+class QQuickContents : public QQuickItemChangeListener
 {
-    Q_OBJECT
 public:
     QQuickContents(QQuickItem *item);
     ~QQuickContents();
 
-    QRectF rectF() const;
-
-    void childRemoved(QQuickItem *item);
-    void childAdded(QQuickItem *item);
+    QRectF rectF() const { return QRectF(m_x, m_y, m_width, m_height); }
 
-    void calcGeometry() { calcWidth(); calcHeight(); }
+    inline void calcGeometry(QQuickItem *changed = 0);
     void complete();
 
-Q_SIGNALS:
-    void rectChanged(QRectF);
-
 protected:
     void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void itemDestroyed(QQuickItem *item);
+    void itemChildAdded(QQuickItem *, QQuickItem *);
+    void itemChildRemoved(QQuickItem *, QQuickItem *);
     //void itemVisibilityChanged(QQuickItem *item)
 
 private:
-    void calcHeight(QQuickItem *changed = 0);
-    void calcWidth(QQuickItem *changed = 0);
+    bool calcHeight(QQuickItem *changed = 0);
+    bool calcWidth(QQuickItem *changed = 0);
+    void updateRect();
 
     QQuickItem *m_item;
     qreal m_x;
@@ -119,6 +114,14 @@ private:
     qreal m_height;
 };
 
+void QQuickContents::calcGeometry(QQuickItem *changed)
+{
+    bool wChanged = calcWidth(changed);
+    bool hChanged = calcHeight(changed);
+    if (wChanged || hChanged)
+        updateRect();
+}
+
 class QQuickTransformPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QQuickTransform);
@@ -342,6 +345,11 @@ public:
         return effectiveLayoutMirror;
     }
 
+    void emitChildrenRectChanged(const QRectF &rect) {
+        Q_Q(QQuickItem);
+        emit q->childrenRectChanged(rect);
+    }
+
     QPointF computeTransformOrigin() const;
     QList<QQuickTransform *> transforms;
     virtual void transformChanged();