From db462cce86dba0be80239d4aaaea668ef173af3d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 13 Jan 2017 09:41:38 +0100 Subject: QQuickItemViewPrivate: cleanup superfluous semi-colons Change-Id: I178a9630353346f85dd67cfb552dde8ad4ca350e Reviewed-by: Robin Burchell --- src/quick/items/qquickitemview_p_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickitemview_p_p.h') diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index a8e66301c1..4ebb632840 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -348,8 +348,8 @@ protected: virtual bool showFooterForIndex(int index) const = 0; virtual void updateHeader() = 0; virtual void updateFooter() = 0; - virtual bool hasStickyHeader() const { return false; }; - virtual bool hasStickyFooter() const { return false; }; + virtual bool hasStickyHeader() const { return false; } + virtual bool hasStickyFooter() const { return false; } virtual void createHighlight() = 0; virtual void updateHighlight() = 0; -- cgit v1.2.3 From 7e7138517ed09363c98986e09ffd966548c27a88 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 17 Jan 2017 16:29:15 +0100 Subject: Item views: Q_DECL_OVERRIDE -> override Change-Id: I7dfbd5f47893a3244c96989ad7eea7e93ea28603 Reviewed-by: Robin Burchell Reviewed-by: Shawn Rutledge --- src/quick/items/qquickitemview_p_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quick/items/qquickitemview_p_p.h') diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 4ebb632840..3087682ac7 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -201,10 +201,10 @@ public: void regenerate(bool orientationChanged=false); void layout(); - virtual void animationFinished(QAbstractAnimationJob *) Q_DECL_OVERRIDE; + virtual void animationFinished(QAbstractAnimationJob *) override; void refill(); void refill(qreal from, qreal to); - void mirrorChange() Q_DECL_OVERRIDE; + void mirrorChange() override; FxViewItem *createItem(int modelIndex, bool asynchronous = false); virtual bool releaseItem(FxViewItem *item); @@ -236,7 +236,7 @@ public: void prepareVisibleItemTransitions(); void prepareRemoveTransitions(QHash *removedItems); bool prepareNonVisibleItemTransition(FxViewItem *item, const QRectF &viewBounds); - void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) Q_DECL_OVERRIDE; + void viewItemTransitionFinished(QQuickItemViewTransitionableItem *item) override; int findMoveKeyIndex(QQmlChangeSet::MoveKey key, const QVector &changes) const; @@ -382,7 +382,7 @@ protected: virtual void updateSectionCriteria() {} virtual void updateSections() {} - void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) Q_DECL_OVERRIDE; + void itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) override; }; -- cgit v1.2.3