summaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx/camera
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-09-20 20:57:43 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-22 14:31:24 +0000
commitc4274f6e98e29c1399120bdd8db86770d6bba104 (patch)
tree9c3e905386cd9bf6b01e32cc1835d7263eb9070d /src/plugins/qnx/camera
parentbb6166a5eca14550584bfc4ab4cb4130872df3ad (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/qnx/camera')
-rw-r--r--src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h10
-rw-r--r--src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h6
-rw-r--r--src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h6
-rw-r--r--src/plugins/qnx/camera/bbcameracontrol.h14
-rw-r--r--src/plugins/qnx/camera/bbcameraexposurecontrol.h10
-rw-r--r--src/plugins/qnx/camera/bbcameraflashcontrol.h8
-rw-r--r--src/plugins/qnx/camera/bbcamerafocuscontrol.h18
-rw-r--r--src/plugins/qnx/camera/bbcameraimagecapturecontrol.h10
-rw-r--r--src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h8
-rw-r--r--src/plugins/qnx/camera/bbcameralockscontrol.h8
-rw-r--r--src/plugins/qnx/camera/bbcameramediarecordercontrol.h22
-rw-r--r--src/plugins/qnx/camera/bbcameraorientationhandler.h2
-rw-r--r--src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h12
-rw-r--r--src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h6
-rw-r--r--src/plugins/qnx/camera/bbcamerazoomcontrol.h14
-rw-r--r--src/plugins/qnx/camera/bbimageencodercontrol.h10
-rw-r--r--src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h12
-rw-r--r--src/plugins/qnx/camera/bbvideorenderercontrol.h4
18 files changed, 90 insertions, 90 deletions
diff --git a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h b/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
index 44ee80026..38c01f86c 100644
--- a/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.h
@@ -51,11 +51,11 @@ class BbCameraAudioEncoderSettingsControl : public QAudioEncoderSettingsControl
public:
explicit BbCameraAudioEncoderSettingsControl(BbCameraSession *session, QObject *parent = 0);
- 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;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
index 2be6f0c3b..4aac740c8 100644
--- a/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
+++ b/src/plugins/qnx/camera/bbcameracapturebufferformatcontrol.h
@@ -49,9 +49,9 @@ class BbCameraCaptureBufferFormatControl : public QCameraCaptureBufferFormatCont
public:
explicit BbCameraCaptureBufferFormatControl(QObject *parent = 0);
- QList<QVideoFrame::PixelFormat> supportedBufferFormats() const Q_DECL_OVERRIDE;
- QVideoFrame::PixelFormat bufferFormat() const Q_DECL_OVERRIDE;
- void setBufferFormat(QVideoFrame::PixelFormat format) Q_DECL_OVERRIDE;
+ QList<QVideoFrame::PixelFormat> supportedBufferFormats() const override;
+ QVideoFrame::PixelFormat bufferFormat() const override;
+ void setBufferFormat(QVideoFrame::PixelFormat format) override;
};
QT_END_NAMESPACE
diff --git a/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h b/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
index ab6f54b3d..9586ec56a 100644
--- a/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
+++ b/src/plugins/qnx/camera/bbcameracapturedestinationcontrol.h
@@ -51,9 +51,9 @@ class BbCameraCaptureDestinationControl : public QCameraCaptureDestinationContro
public:
explicit BbCameraCaptureDestinationControl(BbCameraSession *session, QObject *parent = 0);
- bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const Q_DECL_OVERRIDE;
- QCameraImageCapture::CaptureDestinations captureDestination() const Q_DECL_OVERRIDE;
- void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) Q_DECL_OVERRIDE;
+ bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const override;
+ QCameraImageCapture::CaptureDestinations captureDestination() const override;
+ void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameracontrol.h b/src/plugins/qnx/camera/bbcameracontrol.h
index a22c8d6fa..0c97bd83c 100644
--- a/src/plugins/qnx/camera/bbcameracontrol.h
+++ b/src/plugins/qnx/camera/bbcameracontrol.h
@@ -51,16 +51,16 @@ class BbCameraControl : public QCameraControl
public:
explicit BbCameraControl(BbCameraSession *session, QObject *parent = 0);
- QCamera::State state() const Q_DECL_OVERRIDE;
- void setState(QCamera::State state) Q_DECL_OVERRIDE;
+ QCamera::State state() const override;
+ void setState(QCamera::State state) override;
- QCamera::Status status() const Q_DECL_OVERRIDE;
+ QCamera::Status status() const override;
- QCamera::CaptureModes captureMode() const Q_DECL_OVERRIDE;
- void setCaptureMode(QCamera::CaptureModes) Q_DECL_OVERRIDE;
- bool isCaptureModeSupported(QCamera::CaptureModes mode) const Q_DECL_OVERRIDE;
+ QCamera::CaptureModes captureMode() const override;
+ void setCaptureMode(QCamera::CaptureModes) override;
+ bool isCaptureModeSupported(QCamera::CaptureModes mode) const override;
- bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const Q_DECL_OVERRIDE;
+ bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraexposurecontrol.h b/src/plugins/qnx/camera/bbcameraexposurecontrol.h
index 4f5a71518..2d0da29bd 100644
--- a/src/plugins/qnx/camera/bbcameraexposurecontrol.h
+++ b/src/plugins/qnx/camera/bbcameraexposurecontrol.h
@@ -51,12 +51,12 @@ class BbCameraExposureControl : public QCameraExposureControl
public:
explicit BbCameraExposureControl(BbCameraSession *session, QObject *parent = 0);
- virtual bool isParameterSupported(ExposureParameter parameter) const Q_DECL_OVERRIDE;
- virtual QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const Q_DECL_OVERRIDE;
+ bool isParameterSupported(ExposureParameter parameter) const override;
+ QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const override;
- virtual QVariant requestedValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
- virtual QVariant actualValue(ExposureParameter parameter) const Q_DECL_OVERRIDE;
- virtual 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 statusChanged(QCamera::Status status);
diff --git a/src/plugins/qnx/camera/bbcameraflashcontrol.h b/src/plugins/qnx/camera/bbcameraflashcontrol.h
index e4b5f0a7f..8ce9c1f41 100644
--- a/src/plugins/qnx/camera/bbcameraflashcontrol.h
+++ b/src/plugins/qnx/camera/bbcameraflashcontrol.h
@@ -51,10 +51,10 @@ class BbCameraFlashControl : public QCameraFlashControl
public:
explicit BbCameraFlashControl(BbCameraSession *session, QObject *parent = 0);
- 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:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcamerafocuscontrol.h b/src/plugins/qnx/camera/bbcamerafocuscontrol.h
index 2501aafdd..bf11ea03e 100644
--- a/src/plugins/qnx/camera/bbcamerafocuscontrol.h
+++ b/src/plugins/qnx/camera/bbcamerafocuscontrol.h
@@ -51,15 +51,15 @@ class BbCameraFocusControl : public QCameraFocusControl
public:
explicit BbCameraFocusControl(BbCameraSession *session, QObject *parent = 0);
- 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::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;
- QCameraFocusZoneList focusZones() 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 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 override;
private:
void updateCustomFocusRegion();
diff --git a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h b/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
index 4d239ef59..b8013ba1f 100644
--- a/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
+++ b/src/plugins/qnx/camera/bbcameraimagecapturecontrol.h
@@ -51,13 +51,13 @@ class BbCameraImageCaptureControl : public QCameraImageCaptureControl
public:
explicit BbCameraImageCaptureControl(BbCameraSession *session, QObject *parent = 0);
- bool isReadyForCapture() const Q_DECL_OVERRIDE;
+ bool isReadyForCapture() const override;
- QCameraImageCapture::DriveMode driveMode() const Q_DECL_OVERRIDE;
- void setDriveMode(QCameraImageCapture::DriveMode mode) Q_DECL_OVERRIDE;
+ QCameraImageCapture::DriveMode driveMode() const override;
+ void setDriveMode(QCameraImageCapture::DriveMode mode) override;
- int capture(const QString &fileName) Q_DECL_OVERRIDE;
- void cancelCapture() Q_DECL_OVERRIDE;
+ int capture(const QString &fileName) override;
+ void cancelCapture() override;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h b/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
index 2060b4d99..0eefdd2a1 100644
--- a/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
+++ b/src/plugins/qnx/camera/bbcameraimageprocessingcontrol.h
@@ -51,10 +51,10 @@ class BbCameraImageProcessingControl : public QCameraImageProcessingControl
public:
explicit BbCameraImageProcessingControl(BbCameraSession *session, QObject *parent = 0);
- bool isParameterSupported(ProcessingParameter) const Q_DECL_OVERRIDE;
- bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const Q_DECL_OVERRIDE;
- QVariant parameter(ProcessingParameter parameter) const Q_DECL_OVERRIDE;
- void setParameter(ProcessingParameter parameter, const QVariant &value) Q_DECL_OVERRIDE;
+ bool isParameterSupported(ProcessingParameter) const override;
+ bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const override;
+ QVariant parameter(ProcessingParameter parameter) const override;
+ void setParameter(ProcessingParameter parameter, const QVariant &value) override;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameralockscontrol.h b/src/plugins/qnx/camera/bbcameralockscontrol.h
index f6a7e1864..be3d1bd02 100644
--- a/src/plugins/qnx/camera/bbcameralockscontrol.h
+++ b/src/plugins/qnx/camera/bbcameralockscontrol.h
@@ -59,10 +59,10 @@ public:
explicit BbCameraLocksControl(BbCameraSession *session, QObject *parent = 0);
- QCamera::LockTypes supportedLocks() const Q_DECL_OVERRIDE;
- QCamera::LockStatus lockStatus(QCamera::LockType lock) const Q_DECL_OVERRIDE;
- void searchAndLock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
- void unlock(QCamera::LockTypes locks) Q_DECL_OVERRIDE;
+ QCamera::LockTypes supportedLocks() const override;
+ QCamera::LockStatus lockStatus(QCamera::LockType lock) const override;
+ void searchAndLock(QCamera::LockTypes locks) override;
+ void unlock(QCamera::LockTypes locks) override;
private Q_SLOTS:
void cameraOpened();
diff --git a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h b/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
index 0ba82969f..af46479a5 100644
--- a/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
+++ b/src/plugins/qnx/camera/bbcameramediarecordercontrol.h
@@ -51,19 +51,19 @@ class BbCameraMediaRecorderControl : public QMediaRecorderControl
public:
explicit BbCameraMediaRecorderControl(BbCameraSession *session, QObject *parent = 0);
- QUrl outputLocation() const Q_DECL_OVERRIDE;
- bool setOutputLocation(const QUrl &location) Q_DECL_OVERRIDE;
- QMediaRecorder::State state() const Q_DECL_OVERRIDE;
- QMediaRecorder::Status status() const Q_DECL_OVERRIDE;
- qint64 duration() const Q_DECL_OVERRIDE;
- bool isMuted() const Q_DECL_OVERRIDE;
- qreal volume() const Q_DECL_OVERRIDE;
- void applySettings() Q_DECL_OVERRIDE;
+ QUrl outputLocation() const override;
+ bool setOutputLocation(const QUrl &location) override;
+ QMediaRecorder::State state() const override;
+ QMediaRecorder::Status status() const override;
+ qint64 duration() const override;
+ bool isMuted() const override;
+ qreal volume() const override;
+ void applySettings() override;
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:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraorientationhandler.h b/src/plugins/qnx/camera/bbcameraorientationhandler.h
index e730acdc7..006a259cc 100644
--- a/src/plugins/qnx/camera/bbcameraorientationhandler.h
+++ b/src/plugins/qnx/camera/bbcameraorientationhandler.h
@@ -51,7 +51,7 @@ public:
explicit BbCameraOrientationHandler(QObject *parent = 0);
~BbCameraOrientationHandler();
- bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE;
+ bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
int orientation() const;
diff --git a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h b/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
index 1e0ed8708..f67196be1 100644
--- a/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameravideoencodersettingscontrol.h
@@ -51,12 +51,12 @@ class BbCameraVideoEncoderSettingsControl : public QVideoEncoderSettingsControl
public:
explicit BbCameraVideoEncoderSettingsControl(BbCameraSession *session, QObject *parent = 0);
- QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
- QList<qreal> 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<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = 0) const override;
+ QList<qreal> 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:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h b/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
index b9c4af8a3..7a8e57a13 100644
--- a/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
+++ b/src/plugins/qnx/camera/bbcameraviewfindersettingscontrol.h
@@ -51,9 +51,9 @@ class BbCameraViewfinderSettingsControl : public QCameraViewfinderSettingsContro
public:
explicit BbCameraViewfinderSettingsControl(BbCameraSession *session, QObject *parent = 0);
- 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:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbcamerazoomcontrol.h b/src/plugins/qnx/camera/bbcamerazoomcontrol.h
index fc5813db4..7b5e06f8d 100644
--- a/src/plugins/qnx/camera/bbcamerazoomcontrol.h
+++ b/src/plugins/qnx/camera/bbcamerazoomcontrol.h
@@ -52,13 +52,13 @@ class BbCameraZoomControl : public QCameraZoomControl
public:
explicit BbCameraZoomControl(BbCameraSession *session, QObject *parent = 0);
- qreal maximumOpticalZoom() const Q_DECL_OVERRIDE;
- qreal maximumDigitalZoom() const Q_DECL_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;
- void zoomTo(qreal optical, qreal digital) Q_DECL_OVERRIDE;
+ qreal maximumOpticalZoom() const override;
+ qreal maximumDigitalZoom() const override;
+ qreal requestedOpticalZoom() const override;
+ qreal requestedDigitalZoom() const override;
+ qreal currentOpticalZoom() const override;
+ qreal currentDigitalZoom() const override;
+ void zoomTo(qreal optical, qreal digital) override;
private Q_SLOTS:
void statusChanged(QCamera::Status status);
diff --git a/src/plugins/qnx/camera/bbimageencodercontrol.h b/src/plugins/qnx/camera/bbimageencodercontrol.h
index adb506f1f..bb246def6 100644
--- a/src/plugins/qnx/camera/bbimageencodercontrol.h
+++ b/src/plugins/qnx/camera/bbimageencodercontrol.h
@@ -51,11 +51,11 @@ class BbImageEncoderControl : public QImageEncoderControl
public:
explicit BbImageEncoderControl(BbCameraSession *session, QObject *parent = 0);
- QStringList supportedImageCodecs() const Q_DECL_OVERRIDE;
- QString imageCodecDescription(const QString &codecName) const Q_DECL_OVERRIDE;
- QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const Q_DECL_OVERRIDE;
- QImageEncoderSettings imageSettings() const Q_DECL_OVERRIDE;
- void setImageSettings(const QImageEncoderSettings &settings) Q_DECL_OVERRIDE;
+ QStringList supportedImageCodecs() const override;
+ QString imageCodecDescription(const QString &codecName) const override;
+ QList<QSize> supportedResolutions(const QImageEncoderSettings &settings, bool *continuous = 0) const override;
+ QImageEncoderSettings imageSettings() const override;
+ void setImageSettings(const QImageEncoderSettings &settings) override;
private:
BbCameraSession *m_session;
diff --git a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h b/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
index 051fd713a..08d6cbb14 100644
--- a/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
+++ b/src/plugins/qnx/camera/bbvideodeviceselectorcontrol.h
@@ -52,16 +52,16 @@ class BbVideoDeviceSelectorControl : public QVideoDeviceSelectorControl
public:
explicit BbVideoDeviceSelectorControl(BbCameraSession *session, QObject *parent = 0);
- int deviceCount() const Q_DECL_OVERRIDE;
- QString deviceName(int index) const Q_DECL_OVERRIDE;
- QString deviceDescription(int index) const Q_DECL_OVERRIDE;
- int defaultDevice() const Q_DECL_OVERRIDE;
- int selectedDevice() const Q_DECL_OVERRIDE;
+ int deviceCount() const override;
+ QString deviceName(int index) const override;
+ QString deviceDescription(int index) const override;
+ int defaultDevice() const override;
+ int selectedDevice() const override;
static void enumerateDevices(QList<QByteArray> *devices, QStringList *descriptions);
public Q_SLOTS:
- void setSelectedDevice(int index) Q_DECL_OVERRIDE;
+ void setSelectedDevice(int index) override;
private:
BbCameraSession* m_session;
diff --git a/src/plugins/qnx/camera/bbvideorenderercontrol.h b/src/plugins/qnx/camera/bbvideorenderercontrol.h
index 44bd5ca1b..441ff369d 100644
--- a/src/plugins/qnx/camera/bbvideorenderercontrol.h
+++ b/src/plugins/qnx/camera/bbvideorenderercontrol.h
@@ -51,8 +51,8 @@ class BbVideoRendererControl : public QVideoRendererControl
public:
explicit BbVideoRendererControl(BbCameraSession *session, QObject *parent = 0);
- QAbstractVideoSurface *surface() const Q_DECL_OVERRIDE;
- void setSurface(QAbstractVideoSurface *surface) Q_DECL_OVERRIDE;
+ QAbstractVideoSurface *surface() const override;
+ void setSurface(QAbstractVideoSurface *surface) override;
private:
BbCameraSession *m_session;