diff options
Diffstat (limited to 'src/templates/qquickrangeslider_p.h')
-rw-r--r-- | src/templates/qquickrangeslider_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/templates/qquickrangeslider_p.h b/src/templates/qquickrangeslider_p.h index 4cf6ffd6..d81ab98a 100644 --- a/src/templates/qquickrangeslider_p.h +++ b/src/templates/qquickrangeslider_p.h @@ -68,7 +68,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickRangeSlider : public QQuickControl Q_PROPERTY(QQuickItem *track READ track WRITE setTrack NOTIFY trackChanged FINAL) public: - explicit QQuickRangeSlider(QQuickItem *parent = Q_NULLPTR); + explicit QQuickRangeSlider(QQuickItem *parent = nullptr); qreal from() const; void setFrom(qreal from); @@ -109,18 +109,18 @@ Q_SIGNALS: void trackChanged(); protected: - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) 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 mirrorChange() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseUngrabEvent() override; + void mirrorChange() override; + void componentComplete() override; #ifndef QT_NO_ACCESSIBILITY - QAccessible::Role accessibleRole() const Q_DECL_OVERRIDE; + QAccessible::Role accessibleRole() const override; #endif private: |