From c4274f6e98e29c1399120bdd8db86770d6bba104 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 20 Sep 2017 20:57:43 +0200 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll --- .../src/mediacapture/qandroidvideoencodersettingscontrol.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h') diff --git a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h b/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h index 91f84500e..146b44ac4 100644 --- a/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h +++ b/src/plugins/android/src/mediacapture/qandroidvideoencodersettingscontrol.h @@ -52,12 +52,12 @@ class QAndroidVideoEncoderSettingsControl : public QVideoEncoderSettingsControl public: explicit QAndroidVideoEncoderSettingsControl(QAndroidCaptureSession *session); - QList supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE; - QList supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE; - QStringList supportedVideoCodecs() const Q_DECL_OVERRIDE; - QString videoCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE; - QVideoEncoderSettings videoSettings() const Q_DECL_OVERRIDE; - void setVideoSettings(const QVideoEncoderSettings &settings) Q_DECL_OVERRIDE; + QList supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const override; + QList supportedFrameRates(const QVideoEncoderSettings &settings, bool *continuous = 0) const override; + QStringList supportedVideoCodecs() const override; + QString videoCodecDescription(const QString &codecName) const override; + QVideoEncoderSettings videoSettings() const override; + void setVideoSettings(const QVideoEncoderSettings &settings) override; private: QAndroidCaptureSession *m_session; -- cgit v1.2.3