1 files changed, 14 insertions, 31 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsitem_p.h b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
index 7662a3b..4860b83 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem_p.h
@@ -137,40 +137,23 @@ public:
     QString _id;
 
     // data property
-    void data_removeAt(int);
-    int data_count() const;
-    void data_append(QObject *);
-    void data_insert(int, QObject *);
-    QObject *data_at(int) const;
-    void data_clear();
-    QML_DECLARE_LIST_PROXY(QmlGraphicsItemPrivate, QObject *, data)
+    static void data_append(QmlListProperty<QObject> *, QObject *);
 
     // resources property
-    void resources_removeAt(int);
-    int resources_count() const;
-    void resources_append(QObject *);
-    void resources_insert(int, QObject *);
-    QObject *resources_at(int) const;
-    void resources_clear();
-    QML_DECLARE_LIST_PROXY(QmlGraphicsItemPrivate, QObject *, resources)
+    static QObject *resources_at(QmlListProperty<QObject> *, int);
+    static void resources_append(QmlListProperty<QObject> *, QObject *);
+    static int resources_count(QmlListProperty<QObject> *);
 
     // children property
-    void children_removeAt(int);
-    int children_count() const;
-    void children_append(QmlGraphicsItem *);
-    void children_insert(int, QmlGraphicsItem *);
-    QmlGraphicsItem *children_at(int) const;
-    void children_clear();
-    QML_DECLARE_LIST_PROXY(QmlGraphicsItemPrivate, QmlGraphicsItem *, children)
+    static QmlGraphicsItem *children_at(QmlListProperty<QmlGraphicsItem> *, int);
+    static void children_append(QmlListProperty<QmlGraphicsItem> *, QmlGraphicsItem *);
+    static int children_count(QmlListProperty<QmlGraphicsItem> *);
 
     // transform property
-    void transform_removeAt(int);
-    int transform_count() const;
-    void transform_append(QGraphicsTransform *);
-    void transform_insert(int, QGraphicsTransform *);
-    QGraphicsTransform *transform_at(int) const;
-    void transform_clear();
-    QML_DECLARE_LIST_PROXY(QmlGraphicsItemPrivate, QGraphicsTransform *, transform)
+    static int transform_count(QmlListProperty<QGraphicsTransform> *list);
+    static void transform_append(QmlListProperty<QGraphicsTransform> *list, QGraphicsTransform *);
+    static QGraphicsTransform *transform_at(QmlListProperty<QGraphicsTransform> *list, int);
+    static void transform_clear(QmlListProperty<QGraphicsTransform> *list);
 
     QmlGraphicsAnchors *anchors() {
         if (!_anchors) {
@@ -381,7 +364,7 @@ class QmlGraphicsKeysAttached : public QObject, public QmlGraphicsItemKeyFilter
     Q_DECLARE_PRIVATE(QmlGraphicsKeysAttached)
 
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
-    Q_PROPERTY(QList<QmlGraphicsItem *> *forwardTo READ forwardTo)
+    Q_PROPERTY(QmlListProperty<QmlGraphicsItem> forwardTo READ forwardTo)
 
 public:
     QmlGraphicsKeysAttached(QObject *parent=0);
@@ -396,9 +379,9 @@ public:
         }
     }
 
-    QList<QmlGraphicsItem *> *forwardTo() {
+    QmlListProperty<QmlGraphicsItem> forwardTo() {
         Q_D(QmlGraphicsKeysAttached);
-        return &d->targets;
+        return QmlListProperty<QmlGraphicsItem>(this, d->targets);
     }
 
     virtual void componentComplete();