diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-17 16:29:15 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-18 10:20:12 +0000 |
| commit | 7e7138517ed09363c98986e09ffd966548c27a88 (patch) | |
| tree | 5df82df835d021cecf1945815f26cf12fd4a077b /src/quick/items/qquickitemview_p.h | |
| parent | e8089fe3f64211d780407210b548d9c3d392e343 (diff) | |
Item views: Q_DECL_OVERRIDE -> override
Change-Id: I7dfbd5f47893a3244c96989ad7eea7e93ea28603
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickitemview_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index 3ac54ea3dc..b38bc6174f 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_p.h @@ -232,10 +232,10 @@ public: Q_INVOKABLE void positionViewAtEnd(); Q_REVISION(1) Q_INVOKABLE void forceLayout(); - void setContentX(qreal pos) Q_DECL_OVERRIDE; - void setContentY(qreal pos) Q_DECL_OVERRIDE; - qreal originX() const Q_DECL_OVERRIDE; - qreal originY() const Q_DECL_OVERRIDE; + void setContentX(qreal pos) override; + void setContentY(qreal pos) override; + qreal originX() const override; + qreal originY() const override; Q_SIGNALS: void modelChanged(); @@ -277,13 +277,13 @@ Q_SIGNALS: void highlightMoveDurationChanged(); protected: - void updatePolish() Q_DECL_OVERRIDE; - void componentComplete() Q_DECL_OVERRIDE; - void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; - qreal minYExtent() const Q_DECL_OVERRIDE; - qreal maxYExtent() const Q_DECL_OVERRIDE; - qreal minXExtent() const Q_DECL_OVERRIDE; - qreal maxXExtent() const Q_DECL_OVERRIDE; + void updatePolish() override; + void componentComplete() override; + void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override; + qreal minYExtent() const override; + qreal maxYExtent() const override; + qreal minXExtent() const override; + qreal maxXExtent() const override; protected Q_SLOTS: void destroyRemoved(); |