Add missing override and remove redundant virtual

Change-Id: Ifd439abf21877adff57080489324bea729ee5279
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

4 files changed, 23 insertions, 23 deletions

diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 7d7063650..9d3d26b0e 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -176,7 +176,7 @@ public:
     QT_DEPRECATED static QString deviceDescription(const QByteArray &device);
 #endif
 
-    QMultimedia::AvailabilityStatus availability() const;
+    QMultimedia::AvailabilityStatus availability() const override;
 
     State state() const;
     Status status() const;
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 9da48e257..848b33df8 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -68,15 +68,15 @@ public:
     QCameraFocusFakeZoomControl(QObject *parent) :
         QCameraZoomControl(parent) {}
 
-    qreal maximumOpticalZoom() const { return 1.0; }
-    qreal maximumDigitalZoom() const { return 1.0; }
+    qreal maximumOpticalZoom() const override { return 1.0; }
+    qreal maximumDigitalZoom() const override { return 1.0; }
 
-    qreal requestedOpticalZoom() const { return 1.0; }
-    qreal requestedDigitalZoom() const { return 1.0; }
-    qreal currentOpticalZoom() const { return 1.0; }
-    qreal currentDigitalZoom() const { return 1.0; }
+    qreal requestedOpticalZoom() const override { return 1.0; }
+    qreal requestedDigitalZoom() const override { return 1.0; }
+    qreal currentOpticalZoom() const override { return 1.0; }
+    qreal currentDigitalZoom() const override { return 1.0; }
 
-    void zoomTo(qreal, qreal) { qWarning("The camera doesn't support zooming."); }
+    void zoomTo(qreal, qreal) override { qWarning("The camera doesn't support zooming."); }
 };
 
 class QCameraFocusFakeFocusControl : public QCameraFocusControl
@@ -85,17 +85,17 @@ public:
     QCameraFocusFakeFocusControl(QObject *parent) :
         QCameraFocusControl(parent) {}
 
-    QCameraFocus::FocusModes focusMode() const { return QCameraFocus::AutoFocus; }
-    void setFocusMode(QCameraFocus::FocusModes) { qWarning("Focus mode selection is not supported"); }
-    bool isFocusModeSupported(QCameraFocus::FocusModes) const { return false; }
+    QCameraFocus::FocusModes focusMode() const override { return QCameraFocus::AutoFocus; }
+    void setFocusMode(QCameraFocus::FocusModes) override { qWarning("Focus mode selection is not supported"); }
+    bool isFocusModeSupported(QCameraFocus::FocusModes) const override { return false; }
 
-    QCameraFocus::FocusPointMode focusPointMode() const { return QCameraFocus::FocusPointAuto; }
-    void setFocusPointMode(QCameraFocus::FocusPointMode) { qWarning("Focus points mode selection is not supported"); }
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const { return false; }
-    QPointF customFocusPoint() const { return QPointF(0.5,0.5); }
-    void setCustomFocusPoint(const QPointF &) { qWarning("Focus points selection is not supported"); }
+    QCameraFocus::FocusPointMode focusPointMode() const override { return QCameraFocus::FocusPointAuto; }
+    void setFocusPointMode(QCameraFocus::FocusPointMode) override { qWarning("Focus points mode selection is not supported"); }
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const override { return false; }
+    QPointF customFocusPoint() const override { return QPointF(0.5,0.5); }
+    void setCustomFocusPoint(const QPointF &) override { qWarning("Focus points selection is not supported"); }
 
-    QCameraFocusZoneList focusZones() const { return QCameraFocusZoneList(); }
+    QCameraFocusZoneList focusZones() const override { return QCameraFocusZoneList(); }
 };
 
 
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index 3f3c6bd26..12feb9eec 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -93,7 +93,7 @@ public:
     bool isAvailable() const;
     QMultimedia::AvailabilityStatus availability() const;
 
-    QMediaObject *mediaObject() const;
+    QMediaObject *mediaObject() const override;
 
     Error error() const;
     QString errorString() const;
@@ -135,7 +135,7 @@ Q_SIGNALS:
     void imageSaved(int id, const QString &fileName);
 
 protected:
-    bool setMediaObject(QMediaObject *);
+    bool setMediaObject(QMediaObject *) override;
 
     QCameraImageCapturePrivate *d_ptr;
 private:
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 431e3202d..91ba1d566 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -101,10 +101,10 @@ public:
         QCameraImageProcessingControl(parent)
     {}
 
-    bool isParameterSupported(ProcessingParameter) const { return false; }
-    bool isParameterValueSupported(ProcessingParameter, const QVariant &) const { return false; }
-    QVariant parameter(ProcessingParameter) const { return QVariant(); }
-    void setParameter(ProcessingParameter, const QVariant &) {}
+    bool isParameterSupported(ProcessingParameter) const override { return false; }
+    bool isParameterValueSupported(ProcessingParameter, const QVariant &) const override { return false; }
+    QVariant parameter(ProcessingParameter) const override { return QVariant(); }
+    void setParameter(ProcessingParameter, const QVariant &) override {}
 };