Remove contentWidth/Height usage where applicable

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

6 files changed, 24 insertions, 30 deletions

diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml
index d9d5d42f..b13c1b52 100644
--- a/src/imports/calendar/CalendarView.qml
+++ b/src/imports/calendar/CalendarView.qml
@@ -50,11 +50,10 @@ AbstractCalendarView {
         padding: control.Theme.padding
     }
 
-    contentWidth: grid.implicitWidth
-    contentHeight: grid.implicitHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     Accessible.name: title
 
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index cec70551..c351dd97 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -51,11 +51,10 @@ AbstractDayOfWeekRow {
         verticalAlignment: Text.AlignVCenter
     }
 
-    contentWidth: row.implicitWidth
-    contentHeight: row.implicitHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     topPadding: Theme.padding
     bottomPadding: Theme.padding
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index 149384f3..a396d645 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -51,11 +51,10 @@ AbstractWeekNumberColumn {
         verticalAlignment: Text.AlignVCenter
     }
 
-    contentWidth: column.implicitWidth
-    contentHeight: column.implicitHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     leftPadding: Theme.padding
     rightPadding: Theme.padding
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 54fe52ec..4cc90487 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -55,11 +55,10 @@ AbstractPageIndicator {
 
     Accessible.role: Accessible.Indicator
 
-    contentWidth: row.implicitWidth
-    contentHeight: row.implicitHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     padding: Theme.padding
 
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index 93d30f35..6d4f11c9 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -42,11 +42,10 @@ AbstractTabBar {
 
     property alias highlight: listView.highlight
 
-    contentWidth: listView.contentWidth
-    contentHeight: listView.contentHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     Accessible.role: Accessible.PageTabList
 
diff --git a/src/imports/extras/SwipeView.qml b/src/imports/extras/SwipeView.qml
index 85e31874..6e88bcfc 100644
--- a/src/imports/extras/SwipeView.qml
+++ b/src/imports/extras/SwipeView.qml
@@ -42,11 +42,10 @@ AbstractSwipeView {
 
     property alias spacing: listView.spacing
 
-    contentWidth: listView.implicitWidth
-    contentHeight: listView.contentHeight
-
-    implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
+    implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + bottomPadding)
 
     Accessible.role: Accessible.PageTabList