Remove dead code.

Change-Id: I2e206d746cc48ff7bab29b2135d03b70f85e39d6
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>

diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index c61dc50..7a28689 100644 (file)
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -594,18 +594,13 @@ class QQuickAnchorSetPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickAnchorSet)
 public:
     QQuickAnchorSetPrivate()
-      : usedAnchors(0), resetAnchors(0), fill(0),
-        centerIn(0)/*, leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
-        margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0)*/
+      : usedAnchors(0), resetAnchors(0)
     {
     }
 
     QQuickAnchors::Anchors usedAnchors;
     QQuickAnchors::Anchors resetAnchors;
 
-    QQuickItem *fill;
-    QQuickItem *centerIn;
-
     QQmlScriptString leftScript;
     QQmlScriptString rightScript;
     QQmlScriptString topScript;
@@ -613,15 +608,6 @@ public:
     QQmlScriptString hCenterScript;
     QQmlScriptString vCenterScript;
     QQmlScriptString baselineScript;
-
-    /*qreal leftMargin;
-    qreal rightMargin;
-    qreal topMargin;
-    qreal bottomMargin;
-    qreal margins;
-    qreal vCenterOffset;
-    qreal hCenterOffset;
-    qreal baselineOffset;*/
 };
 
 QQuickAnchorSet::QQuickAnchorSet(QObject *parent)
@@ -787,41 +773,6 @@ void QQuickAnchorSet::resetHorizontalCenter()
     d->resetAnchors |= QQuickAnchors::HCenterAnchor;
 }
 
-QQuickItem *QQuickAnchorSet::fill() const
-{
-    Q_D(const QQuickAnchorSet);
-    return d->fill;
-}
-
-void QQuickAnchorSet::setFill(QQuickItem *f)
-{
-    Q_D(QQuickAnchorSet);
-    d->fill = f;
-}
-
-void QQuickAnchorSet::resetFill()
-{
-    setFill(0);
-}
-
-QQuickItem *QQuickAnchorSet::centerIn() const
-{
-    Q_D(const QQuickAnchorSet);
-    return d->centerIn;
-}
-
-void QQuickAnchorSet::setCenterIn(QQuickItem* c)
-{
-    Q_D(QQuickAnchorSet);
-    d->centerIn = c;
-}
-
-void QQuickAnchorSet::resetCenterIn()
-{
-    setCenterIn(0);
-}
-
-
 class QQuickAnchorChangesPrivate : public QQuickStateOperationPrivate
 {
 public:

diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 2523cc6..1515e9d 100644 (file)
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -129,17 +129,6 @@ class Q_AUTOTEST_EXPORT QQuickAnchorSet : public QObject
     Q_PROPERTY(QQmlScriptString bottom READ bottom WRITE setBottom RESET resetBottom)
     Q_PROPERTY(QQmlScriptString verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter)
     Q_PROPERTY(QQmlScriptString baseline READ baseline WRITE setBaseline RESET resetBaseline)
-    //Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill)
-    //Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn)
-
-    /*Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
-    Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
-    Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged)
-    Q_PROPERTY(qreal horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged())
-    Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged)
-    Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
-    Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged())
-    Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged())*/
 
 public:
     QQuickAnchorSet(QObject *parent=0);
@@ -173,50 +162,8 @@ public:
     void setBaseline(const QQmlScriptString &edge);
     void resetBaseline();
 
-    QQuickItem *fill() const;
-    void setFill(QQuickItem *);
-    void resetFill();
-
-    QQuickItem *centerIn() const;
-    void setCenterIn(QQuickItem *);
-    void resetCenterIn();
-
-    /*qreal leftMargin() const;
-    void setLeftMargin(qreal);
-
-    qreal rightMargin() const;
-    void setRightMargin(qreal);
-
-    qreal horizontalCenterOffset() const;
-    void setHorizontalCenterOffset(qreal);
-
-    qreal topMargin() const;
-    void setTopMargin(qreal);
-
-    qreal bottomMargin() const;
-    void setBottomMargin(qreal);
-
-    qreal margins() const;
-    void setMargins(qreal);
-
-    qreal verticalCenterOffset() const;
-    void setVerticalCenterOffset(qreal);
-
-    qreal baselineOffset() const;
-    void setBaselineOffset(qreal);*/
-
     QQuickAnchors::Anchors usedAnchors() const;
 
-/*Q_SIGNALS:
-    void leftMarginChanged();
-    void rightMarginChanged();
-    void topMarginChanged();
-    void bottomMarginChanged();
-    void marginsChanged();
-    void verticalCenterOffsetChanged();
-    void horizontalCenterOffsetChanged();
-    void baselineOffsetChanged();*/
-
 private:
     friend class QQuickAnchorChanges;
     Q_DISABLE_COPY(QQuickAnchorSet)