Quick: add missing 'override'

... and drop redundant 'virtual'

Change-Id: Iffebc971122f39212ea091ed1fe39e3a1fd68469
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

7 files changed, 10 insertions, 8 deletions

diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index 17721251d9..f9faca55e0 100644
--- a/src/quick/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -290,7 +290,7 @@ public:
 
     Q_INVOKABLE int drop();
 
-    bool event(QEvent *event);
+    bool event(QEvent *event) override;
 
 public Q_SLOTS:
     void start(QQmlV4Function *);
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index e36c070248..a53d068597 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -69,7 +69,7 @@ public:
         emit textureChanged();
     }
 
-    QSGTexture *texture() const {
+    QSGTexture *texture() const override {
         if (m_texture) {
             m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
             m_texture->setMipmapFiltering(m_mipmap ? QSGTexture::Linear : QSGTexture::None);
diff --git a/src/quick/items/qquickitemanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h
index 8d270865ed..99c973eb25 100644
--- a/src/quick/items/qquickitemanimation_p_p.h
+++ b/src/quick/items/qquickitemanimation_p_p.h
@@ -93,7 +93,7 @@ public:
         entryInterval(0), exitInterval(0) {}
     ~QQuickPathAnimationUpdater() {}
 
-    void setValue(qreal v);
+    void setValue(qreal v) override;
 
     QQuickPath *path;
 
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index d21eb93dbf..bc89de5a1c 100644
--- a/src/quick/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -52,7 +52,7 @@ class QQuickPaintedItemTextureProvider : public QSGTextureProvider
 {
 public:
     QSGPainterNode *node;
-    QSGTexture *texture() const { return node ? node->texture() : 0; }
+    QSGTexture *texture() const override { return node ? node->texture() : 0; }
     void fireTextureChanged() { emit textureChanged(); }
 };
 
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index a60a06f59a..1b37a746d3 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    QSGTexture *texture() const {
+    QSGTexture *texture() const override {
         sourceTexture->setMipmapFiltering(mipmapFiltering);
         sourceTexture->setFiltering(filtering);
         sourceTexture->setHorizontalWrapMode(horizontalWrap);
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h
index 602e457cb8..e06e3b8b29 100644
--- a/src/quick/items/qquicktextcontrol_p.h
+++ b/src/quick/items/qquicktextcontrol_p.h
@@ -193,9 +193,11 @@ class QQuickTextEditMimeData : public QMimeData
 public:
     inline QQuickTextEditMimeData(const QTextDocumentFragment &aFragment) : fragment(aFragment) {}
 
-    virtual QStringList formats() const;
+    QStringList formats() const override;
+
 protected:
-    virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+    QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
+
 private:
     void setup() const;
 
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 2613c3c724..3e146d5440 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -198,7 +198,7 @@ public:
     void setFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
     void clearFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
     static void notifyFocusChangesRecur(QQuickItem **item, int remaining);
-    void clearFocusObject();
+    void clearFocusObject() override;
 
     void updateFocusItemTransform();