From 6ba8b6ef24fd8317e35ef7d228e9a5eefa26e81e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Sun, 14 Jun 2015 23:57:21 +0200
Subject: Remove obsolete Container::contentWidth & contentHeight

Change-Id: Ia0ed99904e2bcdcf15820da9ad8a7e1f07fc7e1e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/controls/qquickcontainer.cpp   | 39 +-------------------------------------
 src/controls/qquickcontainer_p.h   | 10 ----------
 src/controls/qquickcontainer_p_p.h |  2 --
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/controls/qquickcontainer.cpp b/src/controls/qquickcontainer.cpp
index 732f3feb..f50a5f5a 100644
--- a/src/controls/qquickcontainer.cpp
+++ b/src/controls/qquickcontainer.cpp
@@ -48,8 +48,7 @@ QT_BEGIN_NAMESPACE
     \internal
 */
 
-QQuickContainerPrivate::QQuickContainerPrivate() :
-    contentWidth(0), contentHeight(0), contentItem(Q_NULLPTR)
+QQuickContainerPrivate::QQuickContainerPrivate() : contentItem(Q_NULLPTR)
 {
 }
 
@@ -72,42 +71,6 @@ QQuickContainer::QQuickContainer(QQuickContainerPrivate &dd, QQuickItem *parent)
 {
 }
 
-/*!
-    \qmlproperty real QtQuickControls2::Container::contentWidth
-    \qmlproperty real QtQuickControls2::Container::contentHeight
-
-    TODO
-*/
-qreal QQuickContainer::contentWidth() const
-{
-    Q_D(const QQuickContainer);
-    return d->contentWidth;
-}
-
-void QQuickContainer::setContentWidth(qreal width)
-{
-    Q_D(QQuickContainer);
-    if (d->contentWidth != width) {
-        d->contentWidth = width;
-        emit contentWidthChanged();
-    }
-}
-
-qreal QQuickContainer::contentHeight() const
-{
-    Q_D(const QQuickContainer);
-    return d->contentHeight;
-}
-
-void QQuickContainer::setContentHeight(qreal height)
-{
-    Q_D(QQuickContainer);
-    if (d->contentHeight != height) {
-        d->contentHeight = height;
-        emit contentHeightChanged();
-    }
-}
-
 /*!
     \qmlproperty Item QtQuickControls2::Container::contentItem
 
diff --git a/src/controls/qquickcontainer_p.h b/src/controls/qquickcontainer_p.h
index f42e4cee..a6f15b1e 100644
--- a/src/controls/qquickcontainer_p.h
+++ b/src/controls/qquickcontainer_p.h
@@ -57,25 +57,15 @@ class QQuickContainerPrivate;
 class Q_QUICKCONTROLS_EXPORT QQuickContainer : public QQuickControl
 {
     Q_OBJECT
-    Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)
-    Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged FINAL)
     Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL)
 
 public:
     explicit QQuickContainer(QQuickItem *parent = Q_NULLPTR);
 
-    qreal contentWidth() const;
-    void setContentWidth(qreal width);
-
-    qreal contentHeight() const;
-    void setContentHeight(qreal height);
-
     QQuickItem *contentItem() const;
     void setContentItem(QQuickItem *item);
 
 Q_SIGNALS:
-    void contentWidthChanged();
-    void contentHeightChanged();
     void contentItemChanged();
 
 protected:
diff --git a/src/controls/qquickcontainer_p_p.h b/src/controls/qquickcontainer_p_p.h
index 538ecc3c..40cb163a 100644
--- a/src/controls/qquickcontainer_p_p.h
+++ b/src/controls/qquickcontainer_p_p.h
@@ -61,8 +61,6 @@ public:
 
     void resizeContent();
 
-    qreal contentWidth;
-    qreal contentHeight;
     QQuickItem *contentItem;
 };
 
-- 
cgit v1.2.3