diff options
Diffstat (limited to 'src/imports/calendar/qquickweeknumbercolumn_p.h')
| -rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 2cacdeac..bf3da66e 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates2/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -64,7 +64,7 @@ class QQuickWeekNumberColumn : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickWeekNumberColumn(QQuickItem *parent = Q_NULLPTR); + explicit QQuickWeekNumberColumn(QQuickItem *parent = nullptr); int month() const; void setMonth(int month); @@ -85,10 +85,10 @@ Q_SIGNALS: void delegateChanged(); protected: - void componentComplete() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - void localeChange(const QLocale &newLocale, const QLocale &oldLocale) Q_DECL_OVERRIDE; - void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) Q_DECL_OVERRIDE; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + void localeChange(const QLocale &newLocale, const QLocale &oldLocale) override; + void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; private: Q_DISABLE_COPY(QQuickWeekNumberColumn) |