aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/calendar
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-10 14:54:34 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-10 12:58:39 +0000
commit3dadb7aca5982ae5efd890ea122da2625ea8e746 (patch)
tree38cb4eb2bd962f756868b82531dfd604fc23aaf0 /src/imports/calendar
parent5e7b9d5c77a2b9738723b565dbea112725d5444b (diff)
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>
Diffstat (limited to 'src/imports/calendar')
-rw-r--r--src/imports/calendar/qtquickcalendar2plugin.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/calendar/qtquickcalendar2plugin.cpp b/src/imports/calendar/qtquickcalendar2plugin.cpp
index 8e84e094..68ef2ad0 100644
--- a/src/imports/calendar/qtquickcalendar2plugin.cpp
+++ b/src/imports/calendar/qtquickcalendar2plugin.cpp
@@ -36,9 +36,9 @@
#include <QtQml/qqmlextensionplugin.h>
-#include <QtQuickCalendar/private/qquickabstractcalendarview_p.h>
-#include <QtQuickCalendar/private/qquickabstractdayofweekrow_p.h>
-#include <QtQuickCalendar/private/qquickabstractweeknumbercolumn_p.h>
+#include <QtQuickCalendar/private/qquickcalendarview_p.h>
+#include <QtQuickCalendar/private/qquickdayofweekrow_p.h>
+#include <QtQuickCalendar/private/qquickweeknumbercolumn_p.h>
#include <QtQuickCalendar/private/qquickcalendarmodel_p.h>
#include <QtQuickCalendar/private/qquickdayofweekmodel_p.h>
#include <QtQuickCalendar/private/qquickmonthmodel_p.h>
@@ -57,9 +57,9 @@ public:
void QtQuickCalendar2Plugin::registerTypes(const char *uri)
{
- qmlRegisterType<QQuickAbstractCalendarView>(uri, 2, 0, "AbstractCalendarView");
- qmlRegisterType<QQuickAbstractDayOfWeekRow>(uri, 2, 0, "AbstractDayOfWeekRow");
- qmlRegisterType<QQuickAbstractWeekNumberColumn>(uri, 2, 0, "AbstractWeekNumberColumn");
+ qmlRegisterType<QQuickCalendarView>(uri, 2, 0, "AbstractCalendarView");
+ qmlRegisterType<QQuickDayOfWeekRow>(uri, 2, 0, "AbstractDayOfWeekRow");
+ qmlRegisterType<QQuickWeekNumberColumn>(uri, 2, 0, "AbstractWeekNumberColumn");
qmlRegisterType<QQuickCalendarModel>(uri, 2, 0, "CalendarModel");
qmlRegisterType<QQuickDayOfWeekModel>(uri, 2, 0, "DayOfWeekModel");
qmlRegisterType<QQuickMonthModel>(uri, 2, 0, "MonthModel");