Demote some containers to plain controls

These don't need the upcoming container API for managing child items.

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

8 files changed, 21 insertions, 21 deletions

diff --git a/src/calendar/qquickcalendarview.cpp b/src/calendar/qquickcalendarview.cpp
index f797d686..c5c6f9e3 100644
--- a/src/calendar/qquickcalendarview.cpp
+++ b/src/calendar/qquickcalendarview.cpp
@@ -39,11 +39,11 @@
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
-#include <QtQuickControls/private/qquickcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickCalendarViewPrivate : public QQuickContainerPrivate
+class QQuickCalendarViewPrivate : public QQuickControlPrivate
 {
     Q_DECLARE_PUBLIC(QQuickCalendarView)
 
@@ -118,7 +118,7 @@ void QQuickCalendarViewPrivate::setContextProperty(QQuickItem *item, const QStri
 }
 
 QQuickCalendarView::QQuickCalendarView(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickCalendarViewPrivate), parent)
+    QQuickControl(*(new QQuickCalendarViewPrivate), parent)
 {
     Q_D(QQuickCalendarView);
     setFlag(ItemIsFocusScope);
@@ -204,7 +204,7 @@ void QQuickCalendarView::setTitle(const QString &title)
 void QQuickCalendarView::componentComplete()
 {
     Q_D(QQuickCalendarView);
-    QQuickContainer::componentComplete();
+    QQuickControl::componentComplete();
     if (d->contentItem) {
         foreach (QQuickItem *child, d->contentItem->childItems()) {
             if (!child->inherits("QQuickRepeater"))
diff --git a/src/calendar/qquickcalendarview_p.h b/src/calendar/qquickcalendarview_p.h
index 407d441f..5b26f8e6 100644
--- a/src/calendar/qquickcalendarview_p.h
+++ b/src/calendar/qquickcalendarview_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickControls/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickCalendarViewPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickCalendarView : public QQuickContainer
+class Q_QUICKCALENDAR_EXPORT QQuickCalendarView : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL)
diff --git a/src/calendar/qquickdayofweekrow.cpp b/src/calendar/qquickdayofweekrow.cpp
index ea401bf0..fc880817 100644
--- a/src/calendar/qquickdayofweekrow.cpp
+++ b/src/calendar/qquickdayofweekrow.cpp
@@ -37,11 +37,11 @@
 #include "qquickdayofweekrow_p.h"
 #include "qquickdayofweekmodel_p.h"
 
-#include <QtQuickControls/private/qquickcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDayOfWeekRowPrivate : public QQuickContainerPrivate
+class QQuickDayOfWeekRowPrivate : public QQuickControlPrivate
 {
 public:
     QVariant source;
@@ -49,7 +49,7 @@ public:
 };
 
 QQuickDayOfWeekRow::QQuickDayOfWeekRow(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickDayOfWeekRowPrivate), parent)
+    QQuickControl(*(new QQuickDayOfWeekRowPrivate), parent)
 {
     Q_D(QQuickDayOfWeekRow);
     d->model = new QQuickDayOfWeekModel(this);
diff --git a/src/calendar/qquickdayofweekrow_p.h b/src/calendar/qquickdayofweekrow_p.h
index 27c81e6f..d0d2fc1c 100644
--- a/src/calendar/qquickdayofweekrow_p.h
+++ b/src/calendar/qquickdayofweekrow_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickControls/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickDayOfWeekRowPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickDayOfWeekRow : public QQuickContainer
+class Q_QUICKCALENDAR_EXPORT QQuickDayOfWeekRow : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL)
diff --git a/src/calendar/qquickweeknumbercolumn.cpp b/src/calendar/qquickweeknumbercolumn.cpp
index 748ae694..d4d764a2 100644
--- a/src/calendar/qquickweeknumbercolumn.cpp
+++ b/src/calendar/qquickweeknumbercolumn.cpp
@@ -37,11 +37,11 @@
 #include "qquickweeknumbercolumn_p.h"
 #include "qquickweeknumbermodel_p.h"
 
-#include <QtQuickControls/private/qquickcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontrol_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickWeekNumberColumnPrivate : public QQuickContainerPrivate
+class QQuickWeekNumberColumnPrivate : public QQuickControlPrivate
 {
 public:
     QVariant source;
@@ -49,7 +49,7 @@ public:
 };
 
 QQuickWeekNumberColumn::QQuickWeekNumberColumn(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickWeekNumberColumnPrivate), parent)
+    QQuickControl(*(new QQuickWeekNumberColumnPrivate), parent)
 {
     Q_D(QQuickWeekNumberColumn);
     d->model = new QQuickWeekNumberModel(this);
diff --git a/src/calendar/qquickweeknumbercolumn_p.h b/src/calendar/qquickweeknumbercolumn_p.h
index 66b4c85f..3da37ac7 100644
--- a/src/calendar/qquickweeknumbercolumn_p.h
+++ b/src/calendar/qquickweeknumbercolumn_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickControls/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickWeekNumberColumnPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickWeekNumberColumn : public QQuickContainer
+class Q_QUICKCALENDAR_EXPORT QQuickWeekNumberColumn : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL)
diff --git a/src/controls/qquickpageindicator.cpp b/src/controls/qquickpageindicator.cpp
index 58b5d66f..7e55482f 100644
--- a/src/controls/qquickpageindicator.cpp
+++ b/src/controls/qquickpageindicator.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qquickpageindicator_p.h"
-#include "qquickcontainer_p_p.h"
+#include "qquickcontrol_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     TODO
 */
 
-class QQuickPageIndicatorPrivate : public QQuickContainerPrivate
+class QQuickPageIndicatorPrivate : public QQuickControlPrivate
 {
 public:
     QQuickPageIndicatorPrivate() : count(0), currentIndex(0) { }
@@ -60,7 +60,7 @@ public:
 };
 
 QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) :
-    QQuickContainer(*(new QQuickPageIndicatorPrivate), parent)
+    QQuickControl(*(new QQuickPageIndicatorPrivate), parent)
 {
 }
 
diff --git a/src/controls/qquickpageindicator_p.h b/src/controls/qquickpageindicator_p.h
index dcf0d093..a5ce58b0 100644
--- a/src/controls/qquickpageindicator_p.h
+++ b/src/controls/qquickpageindicator_p.h
@@ -48,13 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickControls/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickPageIndicatorPrivate;
 
-class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickContainer
+class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)