Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

28 files changed, 100 insertions, 56 deletions

diff --git a/src/declarative/fx/qfxborderimage.cpp b/src/declarative/fx/qfxborderimage.cpp
index 60faa84..d199d5d 100644
--- a/src/declarative/fx/qfxborderimage.cpp
+++ b/src/declarative/fx/qfxborderimage.cpp
@@ -79,7 +79,7 @@ QFxBorderImage::~QFxBorderImage()
     Q_D(QFxBorderImage);
     if (d->sciReply)
         d->sciReply->deleteLater();
-    if (!d->sciurl.isEmpty())
+    if (d->sciPendingPixmapCache)
         QFxPixmapCache::cancelGet(d->sciurl, this);
 }
 /*!
@@ -153,10 +153,14 @@ void QFxBorderImage::setSource(const QUrl &url)
         d->sciReply = 0;
     }
 
-    if (!d->url.isEmpty())
+    if (d->pendingPixmapCache) {
         QFxPixmapCache::cancelGet(d->url, this);
-    if (!d->sciurl.isEmpty())
+        d->pendingPixmapCache = false;
+    }
+    if (d->sciPendingPixmapCache) {
         QFxPixmapCache::cancelGet(d->sciurl, this);
+        d->sciPendingPixmapCache = false;
+    }
 
     d->url = url;
     d->sciurl = QUrl();
@@ -194,6 +198,7 @@ void QFxBorderImage::setSource(const QUrl &url)
         } else {
             QNetworkReply *reply = QFxPixmapCache::get(qmlEngine(this), d->url, &d->pix);
             if (reply) {
+                d->pendingPixmapCache = true;
                 connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
                 connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
                         this, SLOT(requestProgress(qint64,qint64)));
@@ -310,6 +315,7 @@ void QFxBorderImage::setGridScaledImage(const QFxGridScaledImage& sci)
         d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
         QNetworkReply *reply = QFxPixmapCache::get(qmlEngine(this), d->sciurl, &d->pix);
         if (reply) {
+            d->sciPendingPixmapCache = true;
             connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
             connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
                     this, SLOT(requestProgress(qint64,qint64)));
@@ -332,9 +338,12 @@ void QFxBorderImage::setGridScaledImage(const QFxGridScaledImage& sci)
 void QFxBorderImage::requestFinished()
 {
     Q_D(QFxBorderImage);
+
     if (d->url.path().endsWith(QLatin1String(".sci"))) {
+        d->sciPendingPixmapCache = false;
         QFxPixmapCache::find(d->sciurl, &d->pix);
     } else {
+        d->pendingPixmapCache = false;
         if (!QFxPixmapCache::find(d->url, &d->pix))
             d->status = Error;
     }
diff --git a/src/declarative/fx/qfxborderimage.h b/src/declarative/fx/qfxborderimage.h
index c6885fb..0a66b52 100644
--- a/src/declarative/fx/qfxborderimage.h
+++ b/src/declarative/fx/qfxborderimage.h
@@ -79,7 +79,7 @@ public:
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
     void setSource(const QUrl &url);
 
-signals:
+Q_SIGNALS:
     void tileModeChanged();
 
 protected:
@@ -94,7 +94,7 @@ private Q_SLOTS:
 
 private:
     Q_DISABLE_COPY(QFxBorderImage)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxBorderImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxBorderImage)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxborderimage_p.h b/src/declarative/fx/qfxborderimage_p.h
index 809b00d..aebe13f 100644
--- a/src/declarative/fx/qfxborderimage_p.h
+++ b/src/declarative/fx/qfxborderimage_p.h
@@ -66,6 +66,7 @@ class QFxBorderImagePrivate : public QFxImageBasePrivate
 public:
     QFxBorderImagePrivate()
       : border(0), sciReply(0),
+        sciPendingPixmapCache(false),
         horizontalTileMode(QFxBorderImage::Stretch),
         verticalTileMode(QFxBorderImage::Stretch)
     {
@@ -86,6 +87,7 @@ public:
     QFxScaleGrid *border;
     QUrl sciurl;
     QNetworkReply *sciReply;
+    bool sciPendingPixmapCache;
     QFxBorderImage::TileMode horizontalTileMode;
     QFxBorderImage::TileMode verticalTileMode;
 };
diff --git a/src/declarative/fx/qfxcomponentinstance.h b/src/declarative/fx/qfxcomponentinstance.h
index 0ba11a6..b223ca2 100644
--- a/src/declarative/fx/qfxcomponentinstance.h
+++ b/src/declarative/fx/qfxcomponentinstance.h
@@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+//### remove
+//### add component property to Loader
+
 class QFxComponentInstancePrivate;
 class Q_DECLARATIVE_EXPORT QFxComponentInstance : public QFxItem
 {
@@ -78,7 +81,7 @@ protected:
     QFxComponentInstance(QFxComponentInstancePrivate &dd, QFxItem *parent);
 
 private:
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxComponentInstance)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxComponentInstance)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxflickable.h b/src/declarative/fx/qfxflickable.h
index 4fcaf44..e13fa9b 100644
--- a/src/declarative/fx/qfxflickable.h
+++ b/src/declarative/fx/qfxflickable.h
@@ -56,26 +56,31 @@ class Q_DECLARATIVE_EXPORT QFxFlickable : public QFxItem
     Q_OBJECT
 
     Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot)
-    Q_PROPERTY(int viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged)
+    Q_PROPERTY(int viewportWidth READ viewportWidth WRITE setViewportWidth NOTIFY viewportWidthChanged) //### qreal
     Q_PROPERTY(int viewportHeight READ viewportHeight WRITE setViewportHeight NOTIFY viewportHeightChanged)
-    Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged)
-    Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged)
+    Q_PROPERTY(qreal xPosition READ xPosition WRITE setXPosition NOTIFY positionChanged) //### viewportX, positionXChannged
+    Q_PROPERTY(qreal yPosition READ yPosition WRITE setYPosition NOTIFY positionChanged) //### ^^^
+
+    Q_PROPERTY(int velocityDecay READ velocityDecay WRITE setVelocityDecay NOTIFY velocityDecayChanged) //### qreal deceleration
+    Q_PROPERTY(int maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity) ///### qreal, use same units as follow (pixels/s)
+
+    Q_PROPERTY(qreal xVelocity READ xVelocity NOTIFY velocityChanged) //### horizontalVelocity
+    Q_PROPERTY(qreal yVelocity READ yVelocity NOTIFY velocityChanged) //### verticalVelocity
     Q_PROPERTY(bool moving READ isMoving NOTIFY movingChanged)
     Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged)
-    Q_PROPERTY(int velocityDecay READ velocityDecay WRITE setVelocityDecay NOTIFY velocityDecayChanged)
-    Q_PROPERTY(int maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity)
-    Q_PROPERTY(bool locked READ isLocked WRITE setLocked)
-    Q_PROPERTY(DragMode dragMode READ dragMode WRITE setDragMode)
-    Q_PROPERTY(qreal xVelocity READ xVelocity NOTIFY velocityChanged)
-    Q_PROPERTY(qreal yVelocity READ yVelocity NOTIFY velocityChanged)
+
+    Q_PROPERTY(bool locked READ isLocked WRITE setLocked) //### interactive, ensure flicking is stopped, etc.
+    Q_PROPERTY(DragMode dragMode READ dragMode WRITE setDragMode) //### remove.  Consider a better way to implement different drag behaviour
+
     Q_PROPERTY(bool atXEnd READ isAtXEnd NOTIFY isAtBoundaryChanged)
     Q_PROPERTY(bool atYEnd READ isAtYEnd NOTIFY isAtBoundaryChanged)
     Q_PROPERTY(bool atXBeginning READ isAtXBeginning NOTIFY isAtBoundaryChanged)
     Q_PROPERTY(bool atYBeginning READ isAtYBeginning NOTIFY isAtBoundaryChanged)
-    Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged)
-    Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged)
+
+    Q_PROPERTY(qreal pageXPosition READ pageXPosition NOTIFY pageChanged) //### visibleArea.xPosition
+    Q_PROPERTY(qreal pageYPosition READ pageYPosition NOTIFY pageChanged) //### visibleArea.yPosition
+    Q_PROPERTY(qreal pageWidth READ pageWidth NOTIFY pageChanged) //### visibleArea.widthRatio
+    Q_PROPERTY(qreal pageHeight READ pageHeight NOTIFY pageChanged) //### visibleArea.heightRatio
 
     Q_PROPERTY(QmlList<QObject *>* flickableData READ flickableData)
     Q_PROPERTY(QmlList<QFxItem *>* flickableChildren READ flickableChildren)
@@ -184,7 +189,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxFlickable)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlickable)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxFlickable)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h
index 0ab8fd2..e1bd9ea 100644
--- a/src/declarative/fx/qfxflipable.h
+++ b/src/declarative/fx/qfxflipable.h
@@ -62,6 +62,8 @@ class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem
     Q_PROPERTY(QFxItem *front READ front WRITE setFront)
     Q_PROPERTY(QFxItem *back READ back WRITE setBack)
     Q_PROPERTY(Side side READ side NOTIFY sideChanged)
+    //### flipAxis
+    //### flipRotation
 public:
     QFxFlipable(QFxItem *parent=0);
     ~QFxFlipable();
@@ -80,7 +82,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QFxFlipable)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxFlipable)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxFlipable)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxfocusscope.h b/src/declarative/fx/qfxfocusscope.h
index 28a6e30..e337fc6 100644
--- a/src/declarative/fx/qfxfocusscope.h
+++ b/src/declarative/fx/qfxfocusscope.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+//### set component root as focusscope
 class Q_DECLARATIVE_EXPORT QFxFocusScope : public QFxItem
 {
     Q_OBJECT
diff --git a/src/declarative/fx/qfxgridview.h b/src/declarative/fx/qfxgridview.h
index 63f93ca..4f2146d 100644
--- a/src/declarative/fx/qfxgridview.h
+++ b/src/declarative/fx/qfxgridview.h
@@ -55,7 +55,7 @@ class QFxGridViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxGridView : public QFxFlickable
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxGridView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxGridView)
 
     Q_PROPERTY(QVariant model READ model WRITE setModel)
     Q_CLASSINFO("DefaultProperty", "delegate")
diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h
index 4f46495..fc8079c 100644
--- a/src/declarative/fx/qfximage.h
+++ b/src/declarative/fx/qfximage.h
@@ -80,7 +80,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxImage)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImage)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxImage)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximagebase.cpp b/src/declarative/fx/qfximagebase.cpp
index 5aa87db..a68c1f9 100644
--- a/src/declarative/fx/qfximagebase.cpp
+++ b/src/declarative/fx/qfximagebase.cpp
@@ -64,7 +64,7 @@ QFxImageBase::QFxImageBase(QFxImageBasePrivate &dd, QFxItem *parent)
 QFxImageBase::~QFxImageBase()
 {
     Q_D(QFxImageBase);
-    if (!d->url.isEmpty())
+    if (d->pendingPixmapCache)
         QFxPixmapCache::cancelGet(d->url, this);
 }
 
@@ -94,8 +94,10 @@ void QFxImageBase::setSource(const QUrl &url)
     if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
         return;
 
-    if (!d->url.isEmpty())
+    if (d->pendingPixmapCache) {
         QFxPixmapCache::cancelGet(d->url, this);
+        d->pendingPixmapCache = false;
+    }
 
     d->url = url;
     if (d->progress != 0.0) {
@@ -117,6 +119,7 @@ void QFxImageBase::setSource(const QUrl &url)
         d->status = Loading;
         QNetworkReply *reply = QFxPixmapCache::get(qmlEngine(this), d->url, &d->pix);
         if (reply) {
+            d->pendingPixmapCache = true;
             connect(reply, SIGNAL(finished()), this, SLOT(requestFinished()));
             connect(reply, SIGNAL(downloadProgress(qint64,qint64)),
                     this, SLOT(requestProgress(qint64,qint64)));
@@ -141,6 +144,9 @@ void QFxImageBase::setSource(const QUrl &url)
 void QFxImageBase::requestFinished()
 {
     Q_D(QFxImageBase);
+
+    d->pendingPixmapCache = false;
+
     if (!QFxPixmapCache::find(d->url, &d->pix))
         d->status = Error;
     setImplicitWidth(d->pix.width());
diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qfximagebase.h
index ce9c0c3..226d3c3 100644
--- a/src/declarative/fx/qfximagebase.h
+++ b/src/declarative/fx/qfximagebase.h
@@ -81,7 +81,7 @@ private Q_SLOTS:
 
 private:
     Q_DISABLE_COPY(QFxImageBase)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImageBase)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxImageBase)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfximagebase_p.h b/src/declarative/fx/qfximagebase_p.h
index 3f43f38..a6fcc80 100644
--- a/src/declarative/fx/qfximagebase_p.h
+++ b/src/declarative/fx/qfximagebase_p.h
@@ -66,7 +66,8 @@ class QFxImageBasePrivate : public QFxItemPrivate
 public:
     QFxImageBasePrivate()
       : status(QFxImageBase::Null),
-        progress(0.0)
+        progress(0.0),
+        pendingPixmapCache(false)
     {
     }
 
@@ -74,6 +75,7 @@ public:
     QFxImageBase::Status status;
     QUrl url;
     qreal progress;
+    bool pendingPixmapCache;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 0e781c9..8bdc2de 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -1158,6 +1158,7 @@ QFxItem::~QFxItem()
             anchor->d_func()->updateOnComplete();
     }
     delete d->_anchorLines; d->_anchorLines = 0;
+    delete d->_anchors; d->_anchors = 0;
 }
 
 /*!
diff --git a/src/declarative/fx/qfxitem.h b/src/declarative/fx/qfxitem.h
index cb2d97a..165e4cc 100644
--- a/src/declarative/fx/qfxitem.h
+++ b/src/declarative/fx/qfxitem.h
@@ -199,7 +199,7 @@ private:
     friend class QmlStatePrivate;
     friend class QFxAnchors;
     Q_DISABLE_COPY(QFxItem)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxItem)
 };
 
 // ### move to QGO
diff --git a/src/declarative/fx/qfxkeyproxy.h b/src/declarative/fx/qfxkeyproxy.h
index e77ffac..d5f8c7c 100644
--- a/src/declarative/fx/qfxkeyproxy.h
+++ b/src/declarative/fx/qfxkeyproxy.h
@@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+//### move to Keys attached property as Keys.forwardTo
+
 class QFxKeyProxyPrivate;
 class Q_DECLARATIVE_EXPORT QFxKeyProxy : public QFxItem
 {
diff --git a/src/declarative/fx/qfxlistview.h b/src/declarative/fx/qfxlistview.h
index 858e5ed..dbab57b 100644
--- a/src/declarative/fx/qfxlistview.h
+++ b/src/declarative/fx/qfxlistview.h
@@ -56,7 +56,7 @@ class QFxListViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxListView : public QFxFlickable
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxListView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxListView)
 
     Q_ENUMS(CurrentItemPositioning)
     Q_PROPERTY(QVariant model READ model WRITE setModel)
diff --git a/src/declarative/fx/qfxloader.h b/src/declarative/fx/qfxloader.h
index f11d116..8c555c6 100644
--- a/src/declarative/fx/qfxloader.h
+++ b/src/declarative/fx/qfxloader.h
@@ -56,7 +56,11 @@ class Q_DECLARATIVE_EXPORT QFxLoader : public QFxItem
     Q_OBJECT
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QFxItem *item READ item)
+    Q_PROPERTY(QFxItem *item READ item) //### NOTIFY itemChanged
+    //### sourceItem
+    //### sourceComponent
+    //### status, progress
+    //### resizeMode { NoResize, SizeLoaderToItem (default), SizeItemToLoader }
 
 public:
     QFxLoader(QFxItem *parent=0);
@@ -72,7 +76,7 @@ Q_SIGNALS:
 
 private:
     Q_DISABLE_COPY(QFxLoader)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxLoader)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxLoader)
     Q_PRIVATE_SLOT(d_func(), void _q_sourceLoaded())
 };
 
diff --git a/src/declarative/fx/qfxmouseregion.h b/src/declarative/fx/qfxmouseregion.h
index 7fb34b5..114ea87 100644
--- a/src/declarative/fx/qfxmouseregion.h
+++ b/src/declarative/fx/qfxmouseregion.h
@@ -167,7 +167,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxMouseRegion)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxMouseRegion)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxMouseRegion)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpainteditem.h b/src/declarative/fx/qfxpainteditem.h
index 9c40458..776ef329 100644
--- a/src/declarative/fx/qfxpainteditem.h
+++ b/src/declarative/fx/qfxpainteditem.h
@@ -91,7 +91,7 @@ protected Q_SLOTS:
 private:
     void init();
     Q_DISABLE_COPY(QFxPaintedItem)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPaintedItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxPaintedItem)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpathview.h b/src/declarative/fx/qfxpathview.h
index 9cc8adb..a0ef262 100644
--- a/src/declarative/fx/qfxpathview.h
+++ b/src/declarative/fx/qfxpathview.h
@@ -126,7 +126,7 @@ private:
     friend class QFxPathViewAttached;
     static QHash<QObject*, QObject*> attachedProperties;
     Q_DISABLE_COPY(QFxPathView)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxPathView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxPathView)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxpositioners.h b/src/declarative/fx/qfxpositioners.h
index 9c18452..89a61d7 100644
--- a/src/declarative/fx/qfxpositioners.h
+++ b/src/declarative/fx/qfxpositioners.h
@@ -108,7 +108,7 @@ private:
     void applyTransition(const QList<QPair<QString, QVariant> >& changes, QFxItem* target,
             QmlStateOperation::ActionList &actions);
     Q_DISABLE_COPY(QFxBasePositioner)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxBasePositioner)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxBasePositioner)
 };
 
 class Q_DECLARATIVE_EXPORT QFxColumn : public QFxBasePositioner
diff --git a/src/declarative/fx/qfxrect.h b/src/declarative/fx/qfxrect.h
index fb96217..359e8fc 100644
--- a/src/declarative/fx/qfxrect.h
+++ b/src/declarative/fx/qfxrect.h
@@ -174,7 +174,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxRect)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRect)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxRect)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxrepeater.h b/src/declarative/fx/qfxrepeater.h
index 7fa914e..3013b61 100644
--- a/src/declarative/fx/qfxrepeater.h
+++ b/src/declarative/fx/qfxrepeater.h
@@ -55,9 +55,10 @@ class Q_DECLARATIVE_EXPORT QFxRepeater : public QFxItem
 {
     Q_OBJECT
 
-    Q_PROPERTY(QVariant dataSource READ dataSource WRITE setDataSource)
-    Q_PROPERTY(QmlComponent *component READ component WRITE setComponent)
+    Q_PROPERTY(QVariant dataSource READ dataSource WRITE setDataSource) //### model
+    Q_PROPERTY(QmlComponent *component READ component WRITE setComponent) //### delegate
     Q_CLASSINFO("DefaultProperty", "component")
+    //### count
 public:
     QFxRepeater(QFxItem *parent=0);
     virtual ~QFxRepeater();
@@ -78,7 +79,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxRepeater)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxRepeater)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxRepeater)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index fcfe2b1..763e2aa 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -134,7 +134,7 @@ protected:
 
 private:
     Q_DISABLE_COPY(QFxText)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxText)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxText)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index f24faf9..6a10e85 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -222,7 +222,7 @@ protected:
     void drawContents(QPainter *, const QRect &);
 private:
     Q_DISABLE_COPY(QFxTextEdit)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxTextEdit)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextEdit)
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxtextinput.h b/src/declarative/fx/qfxtextinput.h
index b5812d4..1dca945 100644
--- a/src/declarative/fx/qfxtextinput.h
+++ b/src/declarative/fx/qfxtextinput.h
@@ -182,7 +182,7 @@ private Q_SLOTS:
     void cursorPosChanged();
 
 private:
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxTextInput);
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxTextInput);
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 04a4eef..d3ce00c 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -68,6 +68,7 @@ static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system
 class QFxWebSettings : public QObject {
     Q_OBJECT
     /*
+        ### Add these
         StandardFont,
         FixedFont,
         SerifFont,
diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h
index d7c9fd0..ef40912 100644
--- a/src/declarative/fx/qfxwebview.h
+++ b/src/declarative/fx/qfxwebview.h
@@ -77,6 +77,10 @@ private:
 class QFxWebViewAttached;
 class QFxWebSettings;
 
+//### TODO: new web "windows" (popups)
+//### TODO: browser plugins
+//### TODO: smart zooming using e.g. DIV
+
 class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
 {
     Q_OBJECT
@@ -85,25 +89,26 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxPaintedItem
     Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
-    Q_PROPERTY(QString status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QString status READ status NOTIFY statusChanged) //### statusText
 
-    Q_PROPERTY(int mouseX READ mouseX)
+    Q_PROPERTY(int mouseX READ mouseX) //### remove and find way to handle double clicking
     Q_PROPERTY(int mouseY READ mouseY)
 
     Q_PROPERTY(QString html READ html WRITE setHtml)
 
-    Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged)
-    Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged)
-    Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
-    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+    Q_PROPERTY(int idealWidth READ idealWidth WRITE setIdealWidth NOTIFY idealWidthChanged) //### widthHint
+    Q_PROPERTY(int idealHeight READ idealHeight WRITE setIdealHeight NOTIFY idealHeightChanged) //### heightHint
+    Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize) //### remove
+    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) //### change immediately
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
+    //### status
 
-    Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged)
+    Q_PROPERTY(bool interactive READ interactive WRITE setInteractive NOTIFY interactiveChanged) //### Really needed here??
 
-    Q_PROPERTY(QObject* reload READ reloadAction CONSTANT)
-    Q_PROPERTY(QObject* back READ backAction CONSTANT)
-    Q_PROPERTY(QObject* forward READ forwardAction CONSTANT)
-    Q_PROPERTY(QObject* stop READ stopAction CONSTANT)
+    Q_PROPERTY(QObject* reload READ reloadAction CONSTANT) //### QAction
+    Q_PROPERTY(QObject* back READ backAction CONSTANT) //### QAction
+    Q_PROPERTY(QObject* forward READ forwardAction CONSTANT) //### QAction
+    Q_PROPERTY(QObject* stop READ stopAction CONSTANT) //### QAction
 
     Q_PROPERTY(QFxWebSettings* settings READ settingsObject CONSTANT)
 
@@ -181,7 +186,7 @@ Q_SIGNALS:
     void statusChanged();
     void zoomFactorChanged();
 
-    void loadStarted();
+    void loadStarted(); //### document with \qmlsignal
     void loadFinished();
     void loadFailed();
 
@@ -189,7 +194,7 @@ Q_SIGNALS:
     void doubleClick();
 
 public Q_SLOTS:
-    QVariant evaluateJavaScript (const QString&);
+    QVariant evaluateJavaScript(const QString&);
 
 private Q_SLOTS:
     void expandToWebPage();
@@ -221,7 +226,7 @@ private:
     void init();
     virtual void componentComplete();
     Q_DISABLE_COPY(QFxWebView)
-    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxWebView)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QFxWebView)
 };
 
 QT_END_NAMESPACE