Revert "Rename Control::availableWidth/Height to contentWidth/Height"

TextField and TextArea have different semantics for contentWidth
and contentHeight. In addition, it looks like we need to restore
contentWidth and contentHeight for Frame & GroupBox.

This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351.

Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

2 files changed, 26 insertions, 28 deletions

diff --git a/src/controls/qquickcontrol.cpp b/src/controls/qquickcontrol.cpp
index ecf4f50b..e2efbf02 100644
--- a/src/controls/qquickcontrol.cpp
+++ b/src/controls/qquickcontrol.cpp
@@ -70,7 +70,7 @@ void QQuickControlPrivate::setTopPadding(qreal value, bool reset)
     hasTopPadding = !reset;
     if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
         emit q->topPaddingChanged();
-        emit q->contentHeightChanged();
+        emit q->availableHeightChanged();
         q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding),
                          QMarginsF(leftPadding, oldPadding, rightPadding, bottomPadding));
     }
@@ -84,7 +84,7 @@ void QQuickControlPrivate::setLeftPadding(qreal value, bool reset)
     hasLeftPadding = !reset;
     if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
         emit q->leftPaddingChanged();
-        emit q->contentWidthChanged();
+        emit q->availableWidthChanged();
         q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding),
                          QMarginsF(oldPadding, topPadding, rightPadding, bottomPadding));
     }
@@ -98,7 +98,7 @@ void QQuickControlPrivate::setRightPadding(qreal value, bool reset)
     hasRightPadding = !reset;
     if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
         emit q->rightPaddingChanged();
-        emit q->contentWidthChanged();
+        emit q->availableWidthChanged();
         q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding),
                          QMarginsF(leftPadding, topPadding, oldPadding, bottomPadding));
     }
@@ -112,7 +112,7 @@ void QQuickControlPrivate::setBottomPadding(qreal value, bool reset)
     hasBottomPadding = !reset;
     if ((!reset && !qFuzzyCompare(oldPadding, value)) || (reset && !qFuzzyCompare(oldPadding, padding))) {
         emit q->bottomPaddingChanged();
-        emit q->contentHeightChanged();
+        emit q->availableHeightChanged();
         q->paddingChange(QMarginsF(leftPadding, topPadding, rightPadding, bottomPadding),
                          QMarginsF(leftPadding, topPadding, rightPadding, oldPadding));
     }
@@ -139,7 +139,7 @@ void QQuickControlPrivate::resizeContent()
     Q_Q(QQuickControl);
     if (contentItem) {
         contentItem->setPosition(QPointF(q->leftPadding(), q->topPadding()));
-        contentItem->setSize(QSizeF(q->contentWidth(), q->contentHeight()));
+        contentItem->setSize(QSizeF(q->availableWidth(), q->availableHeight()));
     }
 }
 
@@ -154,27 +154,25 @@ QQuickControl::QQuickControl(QQuickControlPrivate &dd, QQuickItem *parent) :
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Control::contentWidth
-    \readonly
+    \qmlproperty real QtQuickControls2::Control::availableWidth
 
-    This property holds the content width, which equals to \c {width - leftPadding - rightPadding}.
+    This property holds the width available after deducting horizontal padding.
 
     \sa padding, leftPadding, rightPadding
 */
-qreal QQuickControl::contentWidth() const
+qreal QQuickControl::availableWidth() const
 {
     return width() - leftPadding() - rightPadding();
 }
 
 /*!
-    \qmlproperty real QtQuickControls2::Control::contentHeight
-    \readonly
+    \qmlproperty real QtQuickControls2::Control::availableHeight
 
-    This property holds the content height, which equals to \c {height - topPadding - bottomPadding}.
+    This property holds the height available after deducting vertical padding.
 
     \sa padding, topPadding, bottomPadding
 */
-qreal QQuickControl::contentHeight() const
+qreal QQuickControl::availableHeight() const
 {
     return height() - topPadding() - bottomPadding();
 }
@@ -184,7 +182,7 @@ qreal QQuickControl::contentHeight() const
 
     This property holds the default padding.
 
-    \sa contentWidth, contentHeight, topPadding, leftPadding, rightPadding, bottomPadding
+    \sa availableWidth, availableHeight, topPadding, leftPadding, rightPadding, bottomPadding
 */
 qreal QQuickControl::padding() const
 {
@@ -210,9 +208,9 @@ void QQuickControl::setPadding(qreal padding)
     if (!qFuzzyCompare(newPadding.bottom(), oldPadding.bottom()))
         emit bottomPaddingChanged();
     if (!qFuzzyCompare(newPadding.top(), oldPadding.top()) || !qFuzzyCompare(newPadding.bottom(), oldPadding.bottom()))
-        emit contentHeightChanged();
+        emit availableHeightChanged();
     if (!qFuzzyCompare(newPadding.left(), oldPadding.left()) || !qFuzzyCompare(newPadding.right(), oldPadding.right()))
-        emit contentWidthChanged();
+        emit availableWidthChanged();
     paddingChange(newPadding, oldPadding);
 }
 
@@ -226,7 +224,7 @@ void QQuickControl::resetPadding()
 
     This property holds the top padding.
 
-    \sa padding, bottomPadding, contentHeight
+    \sa padding, bottomPadding, availableHeight
 */
 qreal QQuickControl::topPadding() const
 {
@@ -253,7 +251,7 @@ void QQuickControl::resetTopPadding()
 
     This property holds the left padding.
 
-    \sa padding, rightPadding, contentWidth
+    \sa padding, rightPadding, availableWidth
 */
 qreal QQuickControl::leftPadding() const
 {
@@ -280,7 +278,7 @@ void QQuickControl::resetLeftPadding()
 
     This property holds the right padding.
 
-    \sa padding, leftPadding, contentWidth
+    \sa padding, leftPadding, availableWidth
 */
 qreal QQuickControl::rightPadding() const
 {
@@ -307,7 +305,7 @@ void QQuickControl::resetRightPadding()
 
     This property holds the bottom padding.
 
-    \sa padding, topPadding, contentHeight
+    \sa padding, topPadding, availableHeight
 */
 qreal QQuickControl::bottomPadding() const
 {
@@ -463,9 +461,9 @@ void QQuickControl::geometryChanged(const QRectF &newGeometry, const QRectF &old
     d->resizeBackground();
     d->resizeContent();
     if (newGeometry.width() != oldGeometry.width())
-        emit contentWidthChanged();
+        emit availableWidthChanged();
     if (newGeometry.width() != oldGeometry.height())
-        emit contentHeightChanged();
+        emit availableHeightChanged();
 }
 
 void QQuickControl::mirrorChange()
diff --git a/src/controls/qquickcontrol_p.h b/src/controls/qquickcontrol_p.h
index 72960083..5090985c 100644
--- a/src/controls/qquickcontrol_p.h
+++ b/src/controls/qquickcontrol_p.h
@@ -58,8 +58,8 @@ class QQuickControlPrivate;
 class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(qreal contentWidth READ contentWidth NOTIFY contentWidthChanged FINAL)
-    Q_PROPERTY(qreal contentHeight READ contentHeight NOTIFY contentHeightChanged FINAL)
+    Q_PROPERTY(qreal availableWidth READ availableWidth NOTIFY availableWidthChanged FINAL)
+    Q_PROPERTY(qreal availableHeight READ availableHeight NOTIFY availableHeightChanged FINAL)
     Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)
     Q_PROPERTY(qreal topPadding READ topPadding WRITE setTopPadding RESET resetTopPadding NOTIFY topPaddingChanged FINAL)
     Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding NOTIFY leftPaddingChanged FINAL)
@@ -74,8 +74,8 @@ class Q_QUICKCONTROLS_EXPORT QQuickControl : public QQuickItem
 public:
     explicit QQuickControl(QQuickItem *parent = Q_NULLPTR);
 
-    qreal contentWidth() const;
-    qreal contentHeight() const;
+    qreal availableWidth() const;
+    qreal availableHeight() const;
 
     qreal padding() const;
     void setPadding(qreal padding);
@@ -110,8 +110,8 @@ public:
     void setContentItem(QQuickItem *item);
 
 Q_SIGNALS:
-    void contentWidthChanged();
-    void contentHeightChanged();
+    void availableWidthChanged();
+    void availableHeightChanged();
     void paddingChanged();
     void topPaddingChanged();
     void leftPaddingChanged();