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

22 files changed, 0 insertions, 101 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
index 78b0be4..fba9d69 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp
@@ -402,10 +402,4 @@ void QmlGraphicsBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem *
     }
 }
 
-QmlGraphicsBorderImage::QmlGraphicsBorderImage(QmlGraphicsBorderImagePrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsImageBase(dd, parent)
-{
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
index 04850e6..18195e2 100644
--- a/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsborderimage_p.h
@@ -83,9 +83,6 @@ Q_SIGNALS:
     void horizontalTileModeChanged();
     void verticalTileModeChanged();
 
-protected:
-    QmlGraphicsBorderImage(QmlGraphicsBorderImagePrivate &dd, QmlGraphicsItem *parent);
-
 private:
     void setGridScaledImage(const QmlGraphicsGridScaledImage& sci);
 
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
index 22c2c0a..ec613af 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion.cpp
@@ -246,13 +246,6 @@ QmlGraphicsMouseRegion::QmlGraphicsMouseRegion(QmlGraphicsItem *parent)
     d->init();
 }
 
-QmlGraphicsMouseRegion::QmlGraphicsMouseRegion(QmlGraphicsMouseRegionPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsMouseRegion);
-    d->init();
-}
-
 QmlGraphicsMouseRegion::~QmlGraphicsMouseRegion()
 {
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
index 3403c75..9c3398a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsmouseregion_p.h
@@ -162,9 +162,6 @@ private:
     void handlePress();
     void handleRelease();
 
-protected:
-    QmlGraphicsMouseRegion(QmlGraphicsMouseRegionPrivate &dd, QmlGraphicsItem *parent);
-
 private:
     Q_DISABLE_COPY(QmlGraphicsMouseRegion)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsMouseRegion)
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
index 4ac02b4..399e1a5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles.cpp
@@ -635,13 +635,6 @@ QmlGraphicsParticles::QmlGraphicsParticles(QmlGraphicsItem *parent)
     d->init();
 }
 
-QmlGraphicsParticles::QmlGraphicsParticles(QmlGraphicsParticlesPrivate &dd, QmlGraphicsItem *parent)
-    : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsParticles);
-    d->init();
-}
-
 QmlGraphicsParticles::~QmlGraphicsParticles()
 {
     Q_D(QmlGraphicsParticles);
diff --git a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
index 851edd7..2554605 100644
--- a/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsparticles_p.h
@@ -214,7 +214,6 @@ public Q_SLOTS:
 
 protected:
     virtual void componentComplete();
-    QmlGraphicsParticles(QmlGraphicsParticlesPrivate &dd, QmlGraphicsItem *parent);
 
 Q_SIGNALS:
     void sourceChanged();
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index a8f571e..0812d11 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -100,11 +100,6 @@ QmlGraphicsPath::QmlGraphicsPath(QObject *parent)
 {
 }
 
-QmlGraphicsPath::QmlGraphicsPath(QmlGraphicsPathPrivate &dd, QObject *parent)
- : QObject(dd, parent)
-{
-}
-
 QmlGraphicsPath::~QmlGraphicsPath()
 {
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicspath_p.h b/src/declarative/graphicsitems/qmlgraphicspath_p.h
index 4710367..8abfb2a 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspath_p.h
@@ -215,7 +215,6 @@ Q_SIGNALS:
 
 protected:
     virtual void componentComplete();
-    QmlGraphicsPath(QmlGraphicsPathPrivate &dd, QObject *parent);
 
 private Q_SLOTS:
     void processPath();
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview.cpp b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
index f664763..180954c 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspathview.cpp
@@ -106,13 +106,6 @@ QmlGraphicsPathView::QmlGraphicsPathView(QmlGraphicsItem *parent)
     d->init();
 }
 
-QmlGraphicsPathView::QmlGraphicsPathView(QmlGraphicsPathViewPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsPathView);
-    d->init();
-}
-
 QmlGraphicsPathView::~QmlGraphicsPathView()
 {
     Q_D(QmlGraphicsPathView);
diff --git a/src/declarative/graphicsitems/qmlgraphicspathview_p.h b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
index f713794..59118d4 100644
--- a/src/declarative/graphicsitems/qmlgraphicspathview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspathview_p.h
@@ -118,9 +118,6 @@ private Q_SLOTS:
     void createdItem(int index, QmlGraphicsItem *item);
     void destroyingItem(QmlGraphicsItem *item);
 
-protected:
-    QmlGraphicsPathView(QmlGraphicsPathViewPrivate &dd, QmlGraphicsItem *parent);
-
 private:
     friend class QmlGraphicsPathViewAttached;
     static QHash<QObject*, QObject*> attachedProperties;
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
index caec90c..cc09436 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle.cpp
@@ -186,14 +186,6 @@ QmlGraphicsRectangle::QmlGraphicsRectangle(QmlGraphicsItem *parent)
     setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
-QmlGraphicsRectangle::QmlGraphicsRectangle(QmlGraphicsRectanglePrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    Q_D(QmlGraphicsRectangle);
-    d->init();
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
 void QmlGraphicsRectangle::doUpdate()
 {
     Q_D(QmlGraphicsRectangle);
diff --git a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
index 2a80619..2f0a518 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrectangle_p.h
@@ -169,9 +169,6 @@ private:
     void generateBorderedRect();
     void drawRect(QPainter &painter);
 
-protected:
-    QmlGraphicsRectangle(QmlGraphicsRectanglePrivate &dd, QmlGraphicsItem *parent);
-
 private:
     Q_DISABLE_COPY(QmlGraphicsRectangle)
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QmlGraphicsRectangle)
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index 82d6da3..48758a7 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -119,14 +119,6 @@ QmlGraphicsRepeater::QmlGraphicsRepeater(QmlGraphicsItem *parent)
 }
 
 /*!
-    \internal
- */
-QmlGraphicsRepeater::QmlGraphicsRepeater(QmlGraphicsRepeaterPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-}
-
-/*!
     Destroy the repeater instance.  All items it instantiated are also
     destroyed.
  */
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
index 8d71303..4058df0 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater_p.h
@@ -82,7 +82,6 @@ private:
 protected:
     virtual void componentComplete();
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
-    QmlGraphicsRepeater(QmlGraphicsRepeaterPrivate &dd, QmlGraphicsItem *parent);
 
 private Q_SLOTS:
     void itemsInserted(int,int);
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 374972e..504eb2a 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -111,13 +111,6 @@ QmlGraphicsText::QmlGraphicsText(QmlGraphicsItem *parent)
     setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
-QmlGraphicsText::QmlGraphicsText(QmlGraphicsTextPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsItem(dd, parent)
-{
-    setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
-}
-
 QmlGraphicsText::~QmlGraphicsText()
 {
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicstext_p.h b/src/declarative/graphicsitems/qmlgraphicstext_p.h
index ac1ded0..31b049a 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstext_p.h
@@ -131,7 +131,6 @@ Q_SIGNALS:
     void linkActivated(const QString &link);
 
 protected:
-    QmlGraphicsText(QmlGraphicsTextPrivate &dd, QmlGraphicsItem *parent);
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual void geometryChanged(const QRectF &newGeometry,
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
index d8fe5d4..b691304 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit.cpp
@@ -103,16 +103,6 @@ QmlGraphicsTextEdit::QmlGraphicsTextEdit(QmlGraphicsItem *parent)
     d->init();
 }
 
-/*!
-\internal
-*/
-QmlGraphicsTextEdit::QmlGraphicsTextEdit(QmlGraphicsTextEditPrivate &dd, QmlGraphicsItem *parent)
-    : QmlGraphicsPaintedItem(dd, parent)
-{
-    Q_D(QmlGraphicsTextEdit);
-    d->init();
-}
-
 QString QmlGraphicsTextEdit::text() const
 {
     Q_D(const QmlGraphicsTextEdit);
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
index efbe998..fa95373 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h
@@ -201,7 +201,6 @@ private:
     void updateSize();
 
 protected:
-    QmlGraphicsTextEdit(QmlGraphicsTextEditPrivate &dd, QmlGraphicsItem *parent);
     virtual void geometryChanged(const QRectF &newGeometry, 
                                  const QRectF &oldGeometry);
 
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
index cd7377e..d7612aa 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
@@ -70,16 +70,6 @@ QmlGraphicsTextInput::QmlGraphicsTextInput(QmlGraphicsItem* parent)
     d->init();
 }
 
-/*
-   \internal
-*/
-QmlGraphicsTextInput::QmlGraphicsTextInput(QmlGraphicsTextInputPrivate &dd, QmlGraphicsItem* parent)
-    : QmlGraphicsPaintedItem(dd, parent)
-{
-    Q_D(QmlGraphicsTextInput);
-    d->init();
-}
-
 QmlGraphicsTextInput::~QmlGraphicsTextInput()
 {
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
index 7d3fef0..87ceccf 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h
@@ -172,7 +172,6 @@ Q_SIGNALS:
     void acceptableInputChanged();
 
 protected:
-    QmlGraphicsTextInput(QmlGraphicsTextInputPrivate &dd, QmlGraphicsItem *parent);
     virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
 
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 214117f..827144d 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -260,12 +260,6 @@ QmlGraphicsWebView::QmlGraphicsWebView(QmlGraphicsItem *parent)
     init();
 }
 
-QmlGraphicsWebView::QmlGraphicsWebView(QmlGraphicsWebViewPrivate &dd, QmlGraphicsItem *parent)
-  : QmlGraphicsPaintedItem(dd, parent)
-{
-    init();
-}
-
 QmlGraphicsWebView::~QmlGraphicsWebView()
 {
     Q_D(QmlGraphicsWebView);
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index d574c59..6373246 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -209,8 +209,6 @@ private Q_SLOTS:
     void contentsSizeChanged(const QSize&);
 
 protected:
-    QmlGraphicsWebView(QmlGraphicsWebViewPrivate &dd, QmlGraphicsItem *parent);
-
     void drawContents(QPainter *, const QRect &);
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event);