Replace Q_DECL_OVERRIDE with override

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

10 files changed, 62 insertions, 62 deletions

diff --git a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
index 3d81d6294..4ba987e53 100644
--- a/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfaudioencodersettingscontrol.h
@@ -54,11 +54,11 @@ class AVFAudioEncoderSettingsControl : public QAudioEncoderSettingsControl
 public:
     explicit AVFAudioEncoderSettingsControl(AVFCameraService *service);
 
-    QStringList supportedAudioCodecs() const Q_DECL_OVERRIDE;
-    QString codecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
-    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
-    QAudioEncoderSettings audioSettings() const Q_DECL_OVERRIDE;
-    void setAudioSettings(const QAudioEncoderSettings &settings) Q_DECL_OVERRIDE;
+    QStringList supportedAudioCodecs() const override;
+    QString codecDescription(const QString &codecName) const override;
+    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const override;
+    QAudioEncoderSettings audioSettings() const override;
+    void setAudioSettings(const QAudioEncoderSettings &settings) override;
 
     NSDictionary *applySettings();
     void unapplySettings();
diff --git a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
index 30f90208c..0e2846889 100644
--- a/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraexposurecontrol.h
@@ -57,13 +57,13 @@ class AVFCameraExposureControl : public QCameraExposureControl
 public:
     AVFCameraExposureControl(AVFCameraService *service);
 
-    bool isParameterSupported(ExposureParameter parameter) const Q_DECL_OVERRIDE;
+    bool isParameterSupported(ExposureParameter parameter) const override;
     QVariantList supportedParameterRange(ExposureParameter parameter,
-                                         bool *continuous) const Q_DECL_OVERRIDE;
+                                         bool *continuous) const override;
 
-    QVariant requestedValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant actualValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
-    bool setValue(ExposureParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    QVariant requestedValue(ExposureParameter parameter) const override;
+    QVariant actualValue(ExposureParameter parameter) const override;
+    bool setValue(ExposureParameter parameter, const QVariant &value) override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h b/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
index f8a11a821..58403e829 100644
--- a/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraflashcontrol.h
@@ -56,10 +56,10 @@ class AVFCameraFlashControl : public QCameraFlashControl
 public:
     AVFCameraFlashControl(AVFCameraService *service);
 
-    QCameraExposure::FlashModes flashMode() const Q_DECL_OVERRIDE;
-    void setFlashMode(QCameraExposure::FlashModes mode) Q_DECL_OVERRIDE;
-    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const Q_DECL_OVERRIDE;
-    bool isFlashReady() const Q_DECL_OVERRIDE;
+    QCameraExposure::FlashModes flashMode() const override;
+    void setFlashMode(QCameraExposure::FlashModes mode) override;
+    bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override;
+    bool isFlashReady() const override;
 
 private Q_SLOTS:
     void cameraStateChanged(QCamera::State newState);
diff --git a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
index 9d8b7a5ab..26135e534 100644
--- a/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerafocuscontrol.h
@@ -58,17 +58,17 @@ class AVFCameraFocusControl : public QCameraFocusControl
 public:
     explicit AVFCameraFocusControl(AVFCameraService *service);
 
-    QCameraFocus::FocusModes focusMode() const Q_DECL_OVERRIDE;
-    void setFocusMode(QCameraFocus::FocusModes mode) Q_DECL_OVERRIDE;
-    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const Q_DECL_OVERRIDE;
+    QCameraFocus::FocusModes focusMode() const override;
+    void setFocusMode(QCameraFocus::FocusModes mode) override;
+    bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override;
 
-    QCameraFocus::FocusPointMode focusPointMode() const Q_DECL_OVERRIDE;
-    void setFocusPointMode(QCameraFocus::FocusPointMode mode) Q_DECL_OVERRIDE;
-    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Q_DECL_OVERRIDE;
-    QPointF customFocusPoint() const Q_DECL_OVERRIDE;
-    void setCustomFocusPoint(const QPointF &point) Q_DECL_OVERRIDE;
+    QCameraFocus::FocusPointMode focusPointMode() const override;
+    void setFocusPointMode(QCameraFocus::FocusPointMode mode) override;
+    bool isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const override;
+    QPointF customFocusPoint() const override;
+    void setCustomFocusPoint(const QPointF &point) override;
 
-    QCameraFocusZoneList focusZones() const Q_DECL_OVERRIDE;
+    QCameraFocusZoneList focusZones() const override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
index bed755339..588aa7b74 100644
--- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
@@ -67,9 +67,9 @@ class AVFCameraViewfinderSettingsControl2 : public QCameraViewfinderSettingsCont
 public:
     AVFCameraViewfinderSettingsControl2(AVFCameraService *service);
 
-    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const Q_DECL_OVERRIDE;
-    QCameraViewfinderSettings viewfinderSettings() const Q_DECL_OVERRIDE;
-    void setViewfinderSettings(const QCameraViewfinderSettings &settings) Q_DECL_OVERRIDE;
+    QList<QCameraViewfinderSettings> supportedViewfinderSettings() const override;
+    QCameraViewfinderSettings viewfinderSettings() const override;
+    void setViewfinderSettings(const QCameraViewfinderSettings &settings) override;
 
     // "Converters":
     static QVideoFrame::PixelFormat QtPixelFormatFromCVFormat(unsigned avPixelFormat);
@@ -97,9 +97,9 @@ class AVFCameraViewfinderSettingsControl : public QCameraViewfinderSettingsContr
 public:
     AVFCameraViewfinderSettingsControl(AVFCameraService *service);
 
-    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    QVariant viewfinderParameter(ViewfinderParameter parameter) const Q_DECL_OVERRIDE;
-    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+    bool isViewfinderParameterSupported(ViewfinderParameter parameter) const override;
+    QVariant viewfinderParameter(ViewfinderParameter parameter) const override;
+    void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) override;
 
 private:
     void setResolution(const QVariant &resolution);
diff --git a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
index 6a460ad59..2307dfc28 100644
--- a/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
+++ b/src/plugins/avfoundation/camera/avfcamerazoomcontrol.h
@@ -57,15 +57,15 @@ class AVFCameraZoomControl : public QCameraZoomControl
 public:
     AVFCameraZoomControl(AVFCameraService *service);
 
-    qreal maximumOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal maximumDigitalZoom() const Q_DECL_OVERRIDE;
+    qreal maximumOpticalZoom() const override;
+    qreal maximumDigitalZoom() const override;
 
-    qreal requestedOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal requestedDigitalZoom() const Q_DECL_OVERRIDE;
-    qreal currentOpticalZoom() const Q_DECL_OVERRIDE;
-    qreal currentDigitalZoom() const Q_DECL_OVERRIDE;
+    qreal requestedOpticalZoom() const override;
+    qreal requestedDigitalZoom() const override;
+    qreal currentOpticalZoom() const override;
+    qreal currentDigitalZoom() const override;
 
-    void zoomTo(qreal optical, qreal digital) Q_DECL_OVERRIDE;
+    void zoomTo(qreal optical, qreal digital) override;
 
 private Q_SLOTS:
     void cameraStateChanged();
diff --git a/src/plugins/avfoundation/camera/avfimageencodercontrol.h b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
index 22a6b2722..7e2e34294 100644
--- a/src/plugins/avfoundation/camera/avfimageencodercontrol.h
+++ b/src/plugins/avfoundation/camera/avfimageencodercontrol.h
@@ -61,12 +61,12 @@ class AVFImageEncoderControl : public QImageEncoderControl
 public:
     AVFImageEncoderControl(AVFCameraService *service);
 
-    QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
-    QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
+    QStringList supportedImageCodecs() const override;
+    QString imageCodecDescription(const QString &codecName) const override;
     QList<QSize> supportedResolutions(const QImageEncoderSettings &settings,
-                                      bool *continuous) const Q_DECL_OVERRIDE;
-    QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
-    void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+                                      bool *continuous) const override;
+    QImageEncoderSettings imageSettings() const override;
+    void setImageSettings(const QImageEncoderSettings &settings) override;
 
     QImageEncoderSettings requestedSettings() const;
 
diff --git a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h b/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
index 45d69f18b..e43e70baf 100644
--- a/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
+++ b/src/plugins/avfoundation/camera/avfmediacontainercontrol.h
@@ -53,10 +53,10 @@ class AVFMediaContainerControl : public QMediaContainerControl
 public:
     explicit AVFMediaContainerControl(AVFCameraService *service);
 
-    QStringList supportedContainers() const Q_DECL_OVERRIDE;
-    QString containerFormat() const Q_DECL_OVERRIDE;
-    void setContainerFormat(const QString &format) Q_DECL_OVERRIDE;
-    QString containerDescription(const QString &formatMimeType) const Q_DECL_OVERRIDE;
+    QStringList supportedContainers() const override;
+    QString containerFormat() const override;
+    void setContainerFormat(const QString &format) override;
+    QString containerDescription(const QString &formatMimeType) const override;
 
     NSString *fileType() const;
 
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
index a0967efa3..8e049a595 100644
--- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
+++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h
@@ -65,24 +65,24 @@ public:
     AVFMediaRecorderControlIOS(AVFCameraService *service, QObject *parent = 0);
     ~AVFMediaRecorderControlIOS();
 
-    QUrl outputLocation() const Q_DECL_OVERRIDE;
-    bool setOutputLocation(const QUrl &location) Q_DECL_OVERRIDE;
+    QUrl outputLocation() const override;
+    bool setOutputLocation(const QUrl &location) override;
 
-    QMediaRecorder::State state() const Q_DECL_OVERRIDE;
-    QMediaRecorder::Status status() const Q_DECL_OVERRIDE;
+    QMediaRecorder::State state() const override;
+    QMediaRecorder::Status status() const override;
 
-    qint64 duration() const Q_DECL_OVERRIDE;
+    qint64 duration() const override;
 
-    bool isMuted() const Q_DECL_OVERRIDE;
-    qreal volume() const Q_DECL_OVERRIDE;
+    bool isMuted() const override;
+    qreal volume() const override;
 
-    void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
     void unapplySettings();
 
 public Q_SLOTS:
-    void setState(QMediaRecorder::State state) Q_DECL_OVERRIDE;
-    void setMuted(bool muted) Q_DECL_OVERRIDE;
-    void setVolume(qreal volume) Q_DECL_OVERRIDE;
+    void setState(QMediaRecorder::State state) override;
+    void setMuted(bool muted) override;
+    void setVolume(qreal volume) override;
 
 private:
 
diff --git a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
index 4d90377d5..9bdf5a788 100644
--- a/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
+++ b/src/plugins/avfoundation/camera/avfvideoencodersettingscontrol.h
@@ -59,16 +59,16 @@ public:
     explicit AVFVideoEncoderSettingsControl(AVFCameraService *service);
 
     QList<QSize> supportedResolutions(const QVideoEncoderSettings &requestedVideoSettings,
-                                      bool *continuous = 0) const Q_DECL_OVERRIDE;
+                                      bool *continuous = 0) const override;
 
     QList<qreal> supportedFrameRates(const QVideoEncoderSettings &requestedVideoSettings,
-                                     bool *continuous = 0) const Q_DECL_OVERRIDE;
+                                     bool *continuous = 0) const override;
 
-    QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE;
-    QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
+    QStringList supportedVideoCodecs() const override;
+    QString videoCodecDescription(const QString &codecName) const override;
 
-    QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE;
-    void setVideoSettings(const QVideoEncoderSettings &requestedVideoSettings) Q_DECL_OVERRIDE;
+    QVideoEncoderSettings videoSettings() const override;
+    void setVideoSettings(const QVideoEncoderSettings &requestedVideoSettings) override;
 
     NSDictionary *applySettings(AVCaptureConnection *connection);
     void unapplySettings(AVCaptureConnection *connection);