diff options
Diffstat (limited to 'src/imports/calendar/qquickmonthgrid_p.h')
-rw-r--r-- | src/imports/calendar/qquickmonthgrid_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index b2d8124a..93ba3900 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -65,7 +65,7 @@ class QQuickMonthGrid : public QQuickControl Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) public: - explicit QQuickMonthGrid(QQuickItem *parent = Q_NULLPTR); + explicit QQuickMonthGrid(QQuickItem *parent = nullptr); int month() const; void setMonth(int month); @@ -95,17 +95,17 @@ Q_SIGNALS: void pressAndHold(const QDate &date); 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 updatePolish() Q_DECL_OVERRIDE; - - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseUngrabEvent() Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) 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; + void updatePolish() override; + + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QQuickMonthGrid) |