Remove "abstract" prefix from the C++ classes

The QML type registration is still using Abstract-prefix to avoid
conflicts, until QTBUG-43581 & QTBUG-43582 have been resolved so that
the public types can be used for accessing attached properties and
enums.

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

7 files changed, 126 insertions, 126 deletions

diff --git a/src/calendar/calendar.pri b/src/calendar/calendar.pri
index 67267388..1e1f4107 100644
--- a/src/calendar/calendar.pri
+++ b/src/calendar/calendar.pri
@@ -1,19 +1,19 @@
 INCLUDEPATH += $$PWD
 
 HEADERS += \
-    $$PWD/qquickabstractcalendarview_p.h \
-    $$PWD/qquickabstractdayofweekrow_p.h \
-    $$PWD/qquickabstractweeknumbercolumn_p.h \
     $$PWD/qquickcalendarmodel_p.h \
+    $$PWD/qquickcalendarview_p.h \
     $$PWD/qquickdayofweekmodel_p.h \
+    $$PWD/qquickdayofweekrow_p.h \
     $$PWD/qquickmonthmodel_p.h \
+    $$PWD/qquickweeknumbercolumn_p.h \
     $$PWD/qquickweeknumbermodel_p.h
 
 SOURCES += \
-    $$PWD/qquickabstractcalendarview.cpp \
-    $$PWD/qquickabstractdayofweekrow.cpp \
-    $$PWD/qquickabstractweeknumbercolumn.cpp \
     $$PWD/qquickcalendarmodel.cpp \
+    $$PWD/qquickcalendarview.cpp \
     $$PWD/qquickdayofweekmodel.cpp \
+    $$PWD/qquickdayofweekrow.cpp \
     $$PWD/qquickmonthmodel.cpp \
+    $$PWD/qquickweeknumbercolumn.cpp \
     $$PWD/qquickweeknumbermodel.cpp
diff --git a/src/calendar/qquickabstractcalendarview.cpp b/src/calendar/qquickcalendarview.cpp
index c076cc0c..f797d686 100644
--- a/src/calendar/qquickabstractcalendarview.cpp
+++ b/src/calendar/qquickcalendarview.cpp
@@ -34,21 +34,21 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractcalendarview_p.h"
+#include "qquickcalendarview_p.h"
 #include "qquickmonthmodel_p.h"
 
 #include <QtGui/qstylehints.h>
 #include <QtGui/qguiapplication.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontainer_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractCalendarViewPrivate : public QQuickAbstractContainerPrivate
+class QQuickCalendarViewPrivate : public QQuickContainerPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickAbstractCalendarView)
+    Q_DECLARE_PUBLIC(QQuickCalendarView)
 
 public:
-    QQuickAbstractCalendarViewPrivate() : pressTimer(0), pressedItem(Q_NULLPTR), model(Q_NULLPTR) { }
+    QQuickCalendarViewPrivate() : pressTimer(0), pressedItem(Q_NULLPTR), model(Q_NULLPTR) { }
 
     QQuickItem *cellAt(const QPoint &pos) const;
     QDate dateOf(QQuickItem *cell) const;
@@ -66,9 +66,9 @@ public:
     QQuickMonthModel *model;
 };
 
-QQuickItem *QQuickAbstractCalendarViewPrivate::cellAt(const QPoint &pos) const
+QQuickItem *QQuickCalendarViewPrivate::cellAt(const QPoint &pos) const
 {
-    Q_Q(const QQuickAbstractCalendarView);
+    Q_Q(const QQuickCalendarView);
     if (contentItem) {
         QPointF mapped = q->mapToItem(contentItem, pos);
         return contentItem->childAt(mapped.x(), mapped.y());
@@ -76,16 +76,16 @@ QQuickItem *QQuickAbstractCalendarViewPrivate::cellAt(const QPoint &pos) const
     return Q_NULLPTR;
 }
 
-QDate QQuickAbstractCalendarViewPrivate::dateOf(QQuickItem *cell) const
+QDate QQuickCalendarViewPrivate::dateOf(QQuickItem *cell) const
 {
     if (contentItem)
         return model->dateAt(contentItem->childItems().indexOf(cell));
     return QDate();
 }
 
-void QQuickAbstractCalendarViewPrivate::updatePress(const QPoint &pos)
+void QQuickCalendarViewPrivate::updatePress(const QPoint &pos)
 {
-    Q_Q(QQuickAbstractCalendarView);
+    Q_Q(QQuickCalendarView);
     clearPress(false);
     pressedItem = cellAt(pos);
     setContextProperty(pressedItem, QStringLiteral("pressed"), true);
@@ -94,9 +94,9 @@ void QQuickAbstractCalendarViewPrivate::updatePress(const QPoint &pos)
         emit q->pressed(pressedDate);
 }
 
-void QQuickAbstractCalendarViewPrivate::clearPress(bool clicked)
+void QQuickCalendarViewPrivate::clearPress(bool clicked)
 {
-    Q_Q(QQuickAbstractCalendarView);
+    Q_Q(QQuickCalendarView);
     setContextProperty(pressedItem, QStringLiteral("pressed"), false);
     if (pressedDate.isValid()) {
         emit q->released(pressedDate);
@@ -107,7 +107,7 @@ void QQuickAbstractCalendarViewPrivate::clearPress(bool clicked)
     pressedItem = Q_NULLPTR;
 }
 
-void QQuickAbstractCalendarViewPrivate::setContextProperty(QQuickItem *item, const QString &name, const QVariant &value)
+void QQuickCalendarViewPrivate::setContextProperty(QQuickItem *item, const QString &name, const QVariant &value)
 {
     QQmlContext *context = qmlContext(item);
     if (context && context->isValid()) {
@@ -117,94 +117,94 @@ void QQuickAbstractCalendarViewPrivate::setContextProperty(QQuickItem *item, con
     }
 }
 
-QQuickAbstractCalendarView::QQuickAbstractCalendarView(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractCalendarViewPrivate), parent)
+QQuickCalendarView::QQuickCalendarView(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickCalendarViewPrivate), parent)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     setFlag(ItemIsFocusScope);
     setActiveFocusOnTab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
 
     d->model = new QQuickMonthModel(this);
     d->source = QVariant::fromValue(d->model);
-    connect(d->model, &QQuickMonthModel::monthChanged, this, &QQuickAbstractCalendarView::monthChanged);
-    connect(d->model, &QQuickMonthModel::yearChanged, this, &QQuickAbstractCalendarView::yearChanged);
-    connect(d->model, &QQuickMonthModel::localeChanged, this, &QQuickAbstractCalendarView::localeChanged);
-    connect(d->model, &QQuickMonthModel::titleChanged, this, &QQuickAbstractCalendarView::titleChanged);
+    connect(d->model, &QQuickMonthModel::monthChanged, this, &QQuickCalendarView::monthChanged);
+    connect(d->model, &QQuickMonthModel::yearChanged, this, &QQuickCalendarView::yearChanged);
+    connect(d->model, &QQuickMonthModel::localeChanged, this, &QQuickCalendarView::localeChanged);
+    connect(d->model, &QQuickMonthModel::titleChanged, this, &QQuickCalendarView::titleChanged);
 }
 
-int QQuickAbstractCalendarView::month() const
+int QQuickCalendarView::month() const
 {
-    Q_D(const QQuickAbstractCalendarView);
+    Q_D(const QQuickCalendarView);
     return d->model->month();
 }
 
-void QQuickAbstractCalendarView::setMonth(int month)
+void QQuickCalendarView::setMonth(int month)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->model->setMonth(month);
 }
 
-int QQuickAbstractCalendarView::year() const
+int QQuickCalendarView::year() const
 {
-    Q_D(const QQuickAbstractCalendarView);
+    Q_D(const QQuickCalendarView);
     return d->model->year();
 }
 
-void QQuickAbstractCalendarView::setYear(int year)
+void QQuickCalendarView::setYear(int year)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->model->setYear(year);
 }
 
-QLocale QQuickAbstractCalendarView::locale() const
+QLocale QQuickCalendarView::locale() const
 {
-    Q_D(const QQuickAbstractCalendarView);
+    Q_D(const QQuickCalendarView);
     return d->model->locale();
 }
 
-void QQuickAbstractCalendarView::setLocale(const QLocale &locale)
+void QQuickCalendarView::setLocale(const QLocale &locale)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->model->setLocale(locale);
 }
 
-QVariant QQuickAbstractCalendarView::source() const
+QVariant QQuickCalendarView::source() const
 {
-    Q_D(const QQuickAbstractCalendarView);
+    Q_D(const QQuickCalendarView);
     return d->source;
 }
 
-void QQuickAbstractCalendarView::setSource(const QVariant &source)
+void QQuickCalendarView::setSource(const QVariant &source)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     if (d->source != source) {
         d->source = source;
         emit sourceChanged();
     }
 }
 
-QString QQuickAbstractCalendarView::title() const
+QString QQuickCalendarView::title() const
 {
-    Q_D(const QQuickAbstractCalendarView);
+    Q_D(const QQuickCalendarView);
     if (d->title.isNull())
         return d->model->title();
     return d->title;
 }
 
-void QQuickAbstractCalendarView::setTitle(const QString &title)
+void QQuickCalendarView::setTitle(const QString &title)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     if (d->title != title) {
         d->title = title;
         emit titleChanged();
     }
 }
 
-void QQuickAbstractCalendarView::componentComplete()
+void QQuickCalendarView::componentComplete()
 {
-    Q_D(QQuickAbstractCalendarView);
-    QQuickAbstractContainer::componentComplete();
+    Q_D(QQuickCalendarView);
+    QQuickContainer::componentComplete();
     if (d->contentItem) {
         foreach (QQuickItem *child, d->contentItem->childItems()) {
             if (!child->inherits("QQuickRepeater"))
@@ -213,38 +213,38 @@ void QQuickAbstractCalendarView::componentComplete()
     }
 }
 
-void QQuickAbstractCalendarView::mousePressEvent(QMouseEvent *event)
+void QQuickCalendarView::mousePressEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->updatePress(event->pos());
     if (d->pressedDate.isValid())
         d->pressTimer = startTimer(qGuiApp->styleHints()->mousePressAndHoldInterval());
     event->accept();
 }
 
-void QQuickAbstractCalendarView::mouseMoveEvent(QMouseEvent *event)
+void QQuickCalendarView::mouseMoveEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->updatePress(event->pos());
     event->accept();
 }
 
-void QQuickAbstractCalendarView::mouseReleaseEvent(QMouseEvent *event)
+void QQuickCalendarView::mouseReleaseEvent(QMouseEvent *event)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->clearPress(true);
     event->accept();
 }
 
-void QQuickAbstractCalendarView::mouseUngrabEvent()
+void QQuickCalendarView::mouseUngrabEvent()
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     d->clearPress(false);
 }
 
-void QQuickAbstractCalendarView::timerEvent(QTimerEvent *event)
+void QQuickCalendarView::timerEvent(QTimerEvent *event)
 {
-    Q_D(QQuickAbstractCalendarView);
+    Q_D(QQuickCalendarView);
     if (event->timerId() == d->pressTimer) {
         if (d->pressedDate.isValid())
             emit pressAndHold(d->pressedDate);
diff --git a/src/calendar/qquickabstractcalendarview_p.h b/src/calendar/qquickcalendarview_p.h
index d7334cf4..407d441f 100644
--- a/src/calendar/qquickabstractcalendarview_p.h
+++ b/src/calendar/qquickcalendarview_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTCALENDARVIEW_P_H
-#define QQUICKABSTRACTCALENDARVIEW_P_H
+#ifndef QQUICKCALENDARVIEW_P_H
+#define QQUICKCALENDARVIEW_P_H
 
 //
 //  W A R N I N G
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractCalendarViewPrivate;
+class QQuickCalendarViewPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickAbstractCalendarView : public QQuickAbstractContainer
+class Q_QUICKCALENDAR_EXPORT QQuickCalendarView : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL)
@@ -65,7 +65,7 @@ class Q_QUICKCALENDAR_EXPORT QQuickAbstractCalendarView : public QQuickAbstractC
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
 
 public:
-    explicit QQuickAbstractCalendarView(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickCalendarView(QQuickItem *parent = Q_NULLPTR);
 
     int month() const;
     void setMonth(int month);
@@ -103,10 +103,10 @@ protected:
     void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractCalendarView)
-    Q_DECLARE_PRIVATE(QQuickAbstractCalendarView)
+    Q_DISABLE_COPY(QQuickCalendarView)
+    Q_DECLARE_PRIVATE(QQuickCalendarView)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTCALENDARVIEW_P_H
+#endif // QQUICKCALENDARVIEW_P_H
diff --git a/src/calendar/qquickabstractdayofweekrow.cpp b/src/calendar/qquickdayofweekrow.cpp
index 0d2830de..ea401bf0 100644
--- a/src/calendar/qquickabstractdayofweekrow.cpp
+++ b/src/calendar/qquickdayofweekrow.cpp
@@ -34,50 +34,50 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractdayofweekrow_p.h"
+#include "qquickdayofweekrow_p.h"
 #include "qquickdayofweekmodel_p.h"
 
-#include <QtQuickControls/private/qquickabstractcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontainer_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractDayOfWeekRowPrivate : public QQuickAbstractContainerPrivate
+class QQuickDayOfWeekRowPrivate : public QQuickContainerPrivate
 {
 public:
     QVariant source;
     QQuickDayOfWeekModel *model;
 };
 
-QQuickAbstractDayOfWeekRow::QQuickAbstractDayOfWeekRow(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractDayOfWeekRowPrivate), parent)
+QQuickDayOfWeekRow::QQuickDayOfWeekRow(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickDayOfWeekRowPrivate), parent)
 {
-    Q_D(QQuickAbstractDayOfWeekRow);
+    Q_D(QQuickDayOfWeekRow);
     d->model = new QQuickDayOfWeekModel(this);
     d->source = QVariant::fromValue(d->model);
-    connect(d->model, &QQuickDayOfWeekModel::localeChanged, this, &QQuickAbstractDayOfWeekRow::localeChanged);
+    connect(d->model, &QQuickDayOfWeekModel::localeChanged, this, &QQuickDayOfWeekRow::localeChanged);
 }
 
-QLocale QQuickAbstractDayOfWeekRow::locale() const
+QLocale QQuickDayOfWeekRow::locale() const
 {
-    Q_D(const QQuickAbstractDayOfWeekRow);
+    Q_D(const QQuickDayOfWeekRow);
     return d->model->locale();
 }
 
-void QQuickAbstractDayOfWeekRow::setLocale(const QLocale &locale)
+void QQuickDayOfWeekRow::setLocale(const QLocale &locale)
 {
-    Q_D(QQuickAbstractDayOfWeekRow);
+    Q_D(QQuickDayOfWeekRow);
     d->model->setLocale(locale);
 }
 
-QVariant QQuickAbstractDayOfWeekRow::source() const
+QVariant QQuickDayOfWeekRow::source() const
 {
-    Q_D(const QQuickAbstractDayOfWeekRow);
+    Q_D(const QQuickDayOfWeekRow);
     return d->source;
 }
 
-void QQuickAbstractDayOfWeekRow::setSource(const QVariant &source)
+void QQuickDayOfWeekRow::setSource(const QVariant &source)
 {
-    Q_D(QQuickAbstractDayOfWeekRow);
+    Q_D(QQuickDayOfWeekRow);
     if (d->source != source) {
         d->source = source;
         emit sourceChanged();
diff --git a/src/calendar/qquickabstractdayofweekrow_p.h b/src/calendar/qquickdayofweekrow_p.h
index 03b23348..27c81e6f 100644
--- a/src/calendar/qquickabstractdayofweekrow_p.h
+++ b/src/calendar/qquickdayofweekrow_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTDAYOFWEEKROW_P_H
-#define QQUICKABSTRACTDAYOFWEEKROW_P_H
+#ifndef QQUICKDAYOFWEEKROW_P_H
+#define QQUICKDAYOFWEEKROW_P_H
 
 //
 //  W A R N I N G
@@ -49,20 +49,20 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractDayOfWeekRowPrivate;
+class QQuickDayOfWeekRowPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickAbstractDayOfWeekRow : public QQuickAbstractContainer
+class Q_QUICKCALENDAR_EXPORT QQuickDayOfWeekRow : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(QLocale locale READ locale WRITE setLocale NOTIFY localeChanged FINAL)
     Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL)
 
 public:
-    explicit QQuickAbstractDayOfWeekRow(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickDayOfWeekRow(QQuickItem *parent = Q_NULLPTR);
 
     QLocale locale() const;
     void setLocale(const QLocale &locale);
@@ -75,10 +75,10 @@ Q_SIGNALS:
     void sourceChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractDayOfWeekRow)
-    Q_DECLARE_PRIVATE(QQuickAbstractDayOfWeekRow)
+    Q_DISABLE_COPY(QQuickDayOfWeekRow)
+    Q_DECLARE_PRIVATE(QQuickDayOfWeekRow)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTDAYOFWEEKROW_P_H
+#endif // QQUICKDAYOFWEEKROW_P_H
diff --git a/src/calendar/qquickabstractweeknumbercolumn.cpp b/src/calendar/qquickweeknumbercolumn.cpp
index 9357c0cf..748ae694 100644
--- a/src/calendar/qquickabstractweeknumbercolumn.cpp
+++ b/src/calendar/qquickweeknumbercolumn.cpp
@@ -34,76 +34,76 @@
 **
 ****************************************************************************/
 
-#include "qquickabstractweeknumbercolumn_p.h"
+#include "qquickweeknumbercolumn_p.h"
 #include "qquickweeknumbermodel_p.h"
 
-#include <QtQuickControls/private/qquickabstractcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontainer_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractWeekNumberColumnPrivate : public QQuickAbstractContainerPrivate
+class QQuickWeekNumberColumnPrivate : public QQuickContainerPrivate
 {
 public:
     QVariant source;
     QQuickWeekNumberModel *model;
 };
 
-QQuickAbstractWeekNumberColumn::QQuickAbstractWeekNumberColumn(QQuickItem *parent) :
-    QQuickAbstractContainer(*(new QQuickAbstractWeekNumberColumnPrivate), parent)
+QQuickWeekNumberColumn::QQuickWeekNumberColumn(QQuickItem *parent) :
+    QQuickContainer(*(new QQuickWeekNumberColumnPrivate), parent)
 {
-    Q_D(QQuickAbstractWeekNumberColumn);
+    Q_D(QQuickWeekNumberColumn);
     d->model = new QQuickWeekNumberModel(this);
     d->source = QVariant::fromValue(d->model);
-    connect(d->model, &QQuickWeekNumberModel::monthChanged, this, &QQuickAbstractWeekNumberColumn::monthChanged);
-    connect(d->model, &QQuickWeekNumberModel::yearChanged, this, &QQuickAbstractWeekNumberColumn::yearChanged);
-    connect(d->model, &QQuickWeekNumberModel::localeChanged, this, &QQuickAbstractWeekNumberColumn::localeChanged);
+    connect(d->model, &QQuickWeekNumberModel::monthChanged, this, &QQuickWeekNumberColumn::monthChanged);
+    connect(d->model, &QQuickWeekNumberModel::yearChanged, this, &QQuickWeekNumberColumn::yearChanged);
+    connect(d->model, &QQuickWeekNumberModel::localeChanged, this, &QQuickWeekNumberColumn::localeChanged);
 }
 
-int QQuickAbstractWeekNumberColumn::month() const
+int QQuickWeekNumberColumn::month() const
 {
-    Q_D(const QQuickAbstractWeekNumberColumn);
+    Q_D(const QQuickWeekNumberColumn);
     return d->model->month();
 }
 
-void QQuickAbstractWeekNumberColumn::setMonth(int month)
+void QQuickWeekNumberColumn::setMonth(int month)
 {
-    Q_D(QQuickAbstractWeekNumberColumn);
+    Q_D(QQuickWeekNumberColumn);
     d->model->setMonth(month);
 }
 
-int QQuickAbstractWeekNumberColumn::year() const
+int QQuickWeekNumberColumn::year() const
 {
-    Q_D(const QQuickAbstractWeekNumberColumn);
+    Q_D(const QQuickWeekNumberColumn);
     return d->model->year();
 }
 
-void QQuickAbstractWeekNumberColumn::setYear(int year)
+void QQuickWeekNumberColumn::setYear(int year)
 {
-    Q_D(QQuickAbstractWeekNumberColumn);
+    Q_D(QQuickWeekNumberColumn);
     d->model->setYear(year);
 }
 
-QLocale QQuickAbstractWeekNumberColumn::locale() const
+QLocale QQuickWeekNumberColumn::locale() const
 {
-    Q_D(const QQuickAbstractWeekNumberColumn);
+    Q_D(const QQuickWeekNumberColumn);
     return d->model->locale();
 }
 
-void QQuickAbstractWeekNumberColumn::setLocale(const QLocale &locale)
+void QQuickWeekNumberColumn::setLocale(const QLocale &locale)
 {
-    Q_D(QQuickAbstractWeekNumberColumn);
+    Q_D(QQuickWeekNumberColumn);
     d->model->setLocale(locale);
 }
 
-QVariant QQuickAbstractWeekNumberColumn::source() const
+QVariant QQuickWeekNumberColumn::source() const
 {
-    Q_D(const QQuickAbstractWeekNumberColumn);
+    Q_D(const QQuickWeekNumberColumn);
     return d->source;
 }
 
-void QQuickAbstractWeekNumberColumn::setSource(const QVariant &source)
+void QQuickWeekNumberColumn::setSource(const QVariant &source)
 {
-    Q_D(QQuickAbstractWeekNumberColumn);
+    Q_D(QQuickWeekNumberColumn);
     if (d->source != source) {
         d->source = source;
         emit sourceChanged();
diff --git a/src/calendar/qquickabstractweeknumbercolumn_p.h b/src/calendar/qquickweeknumbercolumn_p.h
index cc0a2856..66b4c85f 100644
--- a/src/calendar/qquickabstractweeknumbercolumn_p.h
+++ b/src/calendar/qquickweeknumbercolumn_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKABSTRACTWEEKNUMBERCOLUMN_P_H
-#define QQUICKABSTRACTWEEKNUMBERCOLUMN_P_H
+#ifndef QQUICKWEEKNUMBERCOLUMN_P_H
+#define QQUICKWEEKNUMBERCOLUMN_P_H
 
 //
 //  W A R N I N G
@@ -49,13 +49,13 @@
 //
 
 #include <QtQuickCalendar/private/qtquickcalendarglobal_p.h>
-#include <QtQuickControls/private/qquickabstractcontainer_p.h>
+#include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickAbstractWeekNumberColumnPrivate;
+class QQuickWeekNumberColumnPrivate;
 
-class Q_QUICKCALENDAR_EXPORT QQuickAbstractWeekNumberColumn : public QQuickAbstractContainer
+class Q_QUICKCALENDAR_EXPORT QQuickWeekNumberColumn : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int month READ month WRITE setMonth NOTIFY monthChanged FINAL)
@@ -64,7 +64,7 @@ class Q_QUICKCALENDAR_EXPORT QQuickAbstractWeekNumberColumn : public QQuickAbstr
     Q_PROPERTY(QVariant source READ source WRITE setSource NOTIFY sourceChanged FINAL)
 
 public:
-    explicit QQuickAbstractWeekNumberColumn(QQuickItem *parent = Q_NULLPTR);
+    explicit QQuickWeekNumberColumn(QQuickItem *parent = Q_NULLPTR);
 
     int month() const;
     void setMonth(int month);
@@ -85,10 +85,10 @@ Q_SIGNALS:
     void sourceChanged();
 
 private:
-    Q_DISABLE_COPY(QQuickAbstractWeekNumberColumn)
-    Q_DECLARE_PRIVATE(QQuickAbstractWeekNumberColumn)
+    Q_DISABLE_COPY(QQuickWeekNumberColumn)
+    Q_DECLARE_PRIVATE(QQuickWeekNumberColumn)
 };
 
 QT_END_NAMESPACE
 
-#endif // QQUICKABSTRACTWEEKNUMBERCOLUMN_P_H
+#endif // QQUICKWEEKNUMBERCOLUMN_P_H