Calendar: declare delegate component properties in C++

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

3 files changed, 32 insertions, 26 deletions

diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml
index aac2ec9c..6bf11b8f 100644
--- a/src/imports/calendar/CalendarView.qml
+++ b/src/imports/calendar/CalendarView.qml
@@ -41,7 +41,15 @@ import QtQuick.Calendar 2.0
 AbstractCalendarView {
     id: control
 
-    property Component delegate: CalendarDelegate {
+    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
+
+    //! [delegate]
+    delegate: CalendarDelegate {
         width: grid.width ? grid.width / 7 : implicitWidth
         height: grid.height ? grid.height / 6 : implicitHeight
         opacity: model.month === control.month ? 1 : 0
@@ -49,13 +57,7 @@ AbstractCalendarView {
         text: model.day
         padding: control.Theme.padding
     }
-
-    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
+    //! [delegate]
 
     //! [contentItem]
     contentItem: Grid {
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index e4cb2b91..8f88def4 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -41,7 +41,16 @@ import QtQuick.Calendar 2.0
 AbstractDayOfWeekRow {
     id: control
 
-    property Component delegate: Text {
+    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
+
+    //! [delegate]
+    delegate: Text {
         text: model.shortName
         font.bold: true
         color: control.Theme.textColor
@@ -50,14 +59,7 @@ AbstractDayOfWeekRow {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-
-    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
+    //! [delegate]
 
     //! [contentItem]
     contentItem: Row {
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index 0e2dd505..0fb8a87b 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -41,7 +41,16 @@ import QtQuick.Calendar 2.0
 AbstractWeekNumberColumn {
     id: control
 
-    property Component delegate: Text {
+    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
+
+    //! [delegate]
+    delegate: Text {
         text: model.weekNumber
         font.bold: true
         color: control.Theme.textColor
@@ -50,14 +59,7 @@ AbstractWeekNumberColumn {
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
     }
-
-    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
+    //! [delegate]
 
     //! [contentItem]
     contentItem: Column {