diff options
Diffstat (limited to 'src/templates/qquickoverlay_p.h')
| -rw-r--r-- | src/templates/qquickoverlay_p.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/templates/qquickoverlay_p.h b/src/templates/qquickoverlay_p.h index 6a4d56b3..33e008c5 100644 --- a/src/templates/qquickoverlay_p.h +++ b/src/templates/qquickoverlay_p.h @@ -61,7 +61,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickOverlay : public QQuickItem Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) public: - explicit QQuickOverlay(QQuickItem *parent = Q_NULLPTR); + explicit QQuickOverlay(QQuickItem *parent = nullptr); QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -72,16 +72,11 @@ Q_SIGNALS: void released(); protected: - void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &oldGeometry, const QRectF &newGeometry) Q_DECL_OVERRIDE; + void itemChange(ItemChange change, const ItemChangeData &data) override; + void geometryChanged(const QRectF &oldGeometry, const QRectF &newGeometry) 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 wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; - bool childMouseEventFilter(QQuickItem *item, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool childMouseEventFilter(QQuickItem *item, QEvent *event) override; private: Q_DISABLE_COPY(QQuickOverlay) |