1 files changed, 42 insertions, 42 deletions

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 5b928310cd..6e3c671a2e 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -125,7 +125,7 @@ public:
     void setPosition(qreal col, qreal row, bool immediate = false) {
         moveTo(pointForPosition(col, row), immediate);
     }
-    bool contains(qreal x, qreal y) const {
+    bool contains(qreal x, qreal y) const Q_DECL_OVERRIDE {
         return (x >= itemX() && x < itemX() + view->cellWidth() &&
                 y >= itemY() && y < itemY() + view->cellHeight());
     }
@@ -162,13 +162,13 @@ class QQuickGridViewPrivate : public QQuickItemViewPrivate
     Q_DECLARE_PUBLIC(QQuickGridView)
 
 public:
-    virtual Qt::Orientation layoutOrientation() const;
-    virtual bool isContentFlowReversed() const;
+    Qt::Orientation layoutOrientation() const Q_DECL_OVERRIDE;
+    bool isContentFlowReversed() const Q_DECL_OVERRIDE;
 
-    virtual qreal positionAt(int index) const;
-    virtual qreal endPositionAt(int index) const;
-    virtual qreal originPosition() const;
-    virtual qreal lastPosition() const;
+    qreal positionAt(int index) const Q_DECL_OVERRIDE;
+    qreal endPositionAt(int index) const Q_DECL_OVERRIDE;
+    qreal originPosition() const Q_DECL_OVERRIDE;
+    qreal lastPosition() const Q_DECL_OVERRIDE;
 
     qreal rowSize() const;
     qreal colSize() const;
@@ -182,41 +182,41 @@ public:
 
     void resetColumns();
 
-    virtual bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer);
-    virtual bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo);
-
-    virtual FxViewItem *newViewItem(int index, QQuickItem *item);
-    virtual void initializeViewItem(FxViewItem *item);
-    virtual void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer);
-    virtual void repositionPackageItemAt(QQuickItem *item, int index);
-    virtual void resetFirstItemPosition(qreal pos = 0.0);
-    virtual void adjustFirstItem(qreal forwards, qreal backwards, int changeBeforeVisible);
-
-    virtual void createHighlight();
-    virtual void updateHighlight();
-    virtual void resetHighlightPosition();
-
-    virtual void setPosition(qreal pos);
-    virtual void layoutVisibleItems(int fromModelIndex = 0);
-    virtual bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView);
-    virtual void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult);
-    virtual bool needsRefillForAddedOrRemovedIndex(int index) const;
-
-    virtual qreal headerSize() const;
-    virtual qreal footerSize() const;
-    virtual bool showHeaderForIndex(int index) const;
-    virtual bool showFooterForIndex(int index) const;
-    virtual void updateHeader();
-    virtual void updateFooter();
-
-    virtual void changedVisibleIndex(int newIndex);
-    virtual void initializeCurrentItem();
-
-    virtual void updateViewport();
-    virtual void fixupPosition();
-    virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
-    virtual bool flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
-                        QQuickTimeLineCallback::Callback fixupCallback, qreal velocity);
+    bool addVisibleItems(qreal fillFrom, qreal fillTo, qreal bufferFrom, qreal bufferTo, bool doBuffer) Q_DECL_OVERRIDE;
+    bool removeNonVisibleItems(qreal bufferFrom, qreal bufferTo) Q_DECL_OVERRIDE;
+
+    FxViewItem *newViewItem(int index, QQuickItem *item) Q_DECL_OVERRIDE;
+    void initializeViewItem(FxViewItem *item) Q_DECL_OVERRIDE;
+    void repositionItemAt(FxViewItem *item, int index, qreal sizeBuffer) Q_DECL_OVERRIDE;
+    void repositionPackageItemAt(QQuickItem *item, int index) Q_DECL_OVERRIDE;
+    void resetFirstItemPosition(qreal pos = 0.0) Q_DECL_OVERRIDE;
+    void adjustFirstItem(qreal forwards, qreal backwards, int changeBeforeVisible) Q_DECL_OVERRIDE;
+
+    void createHighlight() Q_DECL_OVERRIDE;
+    void updateHighlight() Q_DECL_OVERRIDE;
+    void resetHighlightPosition() Q_DECL_OVERRIDE;
+
+    void setPosition(qreal pos) Q_DECL_OVERRIDE;
+    void layoutVisibleItems(int fromModelIndex = 0) Q_DECL_OVERRIDE;
+    bool applyInsertionChange(const QQmlChangeSet::Change &insert, ChangeResult *changeResult, QList<FxViewItem *> *addedItems, QList<MovedItem> *movingIntoView) Q_DECL_OVERRIDE;
+    void translateAndTransitionItemsAfter(int afterModelIndex, const ChangeResult &insertionResult, const ChangeResult &removalResult) Q_DECL_OVERRIDE;
+    bool needsRefillForAddedOrRemovedIndex(int index) const Q_DECL_OVERRIDE;
+
+    qreal headerSize() const Q_DECL_OVERRIDE;
+    qreal footerSize() const Q_DECL_OVERRIDE;
+    bool showHeaderForIndex(int index) const Q_DECL_OVERRIDE;
+    bool showFooterForIndex(int index) const Q_DECL_OVERRIDE;
+    void updateHeader() Q_DECL_OVERRIDE;
+    void updateFooter() Q_DECL_OVERRIDE;
+
+    void changedVisibleIndex(int newIndex) Q_DECL_OVERRIDE;
+    void initializeCurrentItem() Q_DECL_OVERRIDE;
+
+    void updateViewport() Q_DECL_OVERRIDE;
+    void fixupPosition() Q_DECL_OVERRIDE;
+    void fixup(AxisData &data, qreal minExtent, qreal maxExtent) Q_DECL_OVERRIDE;
+    bool flick(QQuickItemViewPrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
+               QQuickTimeLineCallback::Callback fixupCallback, qreal velocity) Q_DECL_OVERRIDE;
 
     QQuickGridView::Flow flow;
     qreal cellWidth;