Add new class QFxBorderImage.

* Move scalegrid code into QFxBorderImage
* Update examples

1 files changed, 3 insertions, 10 deletions

diff --git a/src/declarative/fx/qfximagebase.h b/src/declarative/fx/qfximagebase.h
index 78e391e..ce9c0c3 100644
--- a/src/declarative/fx/qfximagebase.h
+++ b/src/declarative/fx/qfximagebase.h
@@ -44,10 +44,9 @@
 
 #include <QtDeclarative/qfxitem.h>
 
+QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-class QFxScaleGrid;
-class QFxGridScaledImage;
 class QFxImageBasePrivate;
 class QFxImageBase : public QFxItem
 {
@@ -57,7 +56,6 @@ class QFxImageBase : public QFxItem
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
-    Q_PROPERTY(QFxScaleGrid *scaleGrid READ scaleGrid)
 
 public:
     QFxImageBase(QFxItem *parent = 0);
@@ -76,22 +74,17 @@ Q_SIGNALS:
 
 protected:
     QFxImageBase(QFxImageBasePrivate &dd, QFxItem *parent);
-    virtual void componentComplete();
 
 private Q_SLOTS:
-    void requestFinished();
-    void sciRequestFinished();
+    virtual void requestFinished();
     void requestProgress(qint64,qint64);
 
 private:
-    void setGridScaledImage(const QFxGridScaledImage& sci);
-    QFxScaleGrid *scaleGrid();
-
-private:
     Q_DISABLE_COPY(QFxImageBase)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImageBase)
 };
 
 QT_END_NAMESPACE
+QT_END_HEADER
 
 #endif // QFXIMAGEBASE_H