From 0bae6b50dd1b654a218fe687ba6498f12e049337 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Tue, 13 Dec 2016 13:53:55 +0300 Subject: GStreamer camerabin: Add missing override and remove redundant virtual Change-Id: I17d716e366cd74226ac858669b10fa0ed28a2fad Reviewed-by: Yoann Lopes --- .../gstreamer/camerabin/camerabinaudioencoder.h | 10 +++++----- .../camerabin/camerabincapturebufferformat.h | 6 +++--- .../camerabin/camerabincapturedestination.h | 6 +++--- .../gstreamer/camerabin/camerabincontainer.h | 8 ++++---- src/plugins/gstreamer/camerabin/camerabincontrol.h | 14 +++++++------- .../gstreamer/camerabin/camerabinexposure.h | 10 +++++----- src/plugins/gstreamer/camerabin/camerabinflash.h | 8 ++++---- src/plugins/gstreamer/camerabin/camerabinfocus.h | 22 +++++++++++----------- .../gstreamer/camerabin/camerabinimagecapture.h | 20 ++++++++++---------- .../gstreamer/camerabin/camerabinimageencoder.h | 10 +++++----- .../gstreamer/camerabin/camerabinimageprocessing.h | 8 ++++---- .../gstreamer/camerabin/camerabininfocontrol.h | 4 ++-- src/plugins/gstreamer/camerabin/camerabinlocks.h | 10 +++++----- .../gstreamer/camerabin/camerabinmetadata.h | 10 +++++----- .../gstreamer/camerabin/camerabinrecorder.h | 22 +++++++++++----------- src/plugins/gstreamer/camerabin/camerabinservice.h | 4 ++-- .../gstreamer/camerabin/camerabinserviceplugin.h | 16 ++++++++-------- src/plugins/gstreamer/camerabin/camerabinsession.h | 4 ++-- .../camerabin/camerabinv4limageprocessing.h | 8 ++++---- .../gstreamer/camerabin/camerabinvideoencoder.h | 12 ++++++------ .../camerabin/camerabinviewfindersettings.h | 6 +++--- .../camerabin/camerabinviewfindersettings2.h | 6 +++--- src/plugins/gstreamer/camerabin/camerabinzoom.h | 14 +++++++------- 23 files changed, 119 insertions(+), 119 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h index cb3d895c7..7178a6b09 100644 --- a/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinaudioencoder.h @@ -66,20 +66,20 @@ public: CameraBinAudioEncoder(QObject *parent); virtual ~CameraBinAudioEncoder(); - QStringList supportedAudioCodecs() const; - QString codecDescription(const QString &codecName) const; + QStringList supportedAudioCodecs() const override; + QString codecDescription(const QString &codecName) const override; QStringList supportedEncodingOptions(const QString &codec) const; QVariant encodingOption(const QString &codec, const QString &name) const; void setEncodingOption(const QString &codec, const QString &name, const QVariant &value); QList supportedSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *isContinuous = 0) const; + bool *isContinuous = 0) const override; QList supportedChannelCounts(const QAudioEncoderSettings &settings = QAudioEncoderSettings()) const; QList supportedSampleSizes(const QAudioEncoderSettings &settings = QAudioEncoderSettings()) const; - QAudioEncoderSettings audioSettings() const; - void setAudioSettings(const QAudioEncoderSettings&); + QAudioEncoderSettings audioSettings() const override; + void setAudioSettings(const QAudioEncoderSettings &) override; QAudioEncoderSettings actualAudioSettings() const; void setActualAudioSettings(const QAudioEncoderSettings&); diff --git a/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h b/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h index 96af6c7fb..a6cdc5297 100644 --- a/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h +++ b/src/plugins/gstreamer/camerabin/camerabincapturebufferformat.h @@ -59,10 +59,10 @@ public: CameraBinCaptureBufferFormat(CameraBinSession *session); virtual ~CameraBinCaptureBufferFormat(); - QList supportedBufferFormats() const; + QList supportedBufferFormats() const override; - QVideoFrame::PixelFormat bufferFormat() const; - void setBufferFormat(QVideoFrame::PixelFormat format); + QVideoFrame::PixelFormat bufferFormat() const override; + void setBufferFormat(QVideoFrame::PixelFormat format) override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabincapturedestination.h b/src/plugins/gstreamer/camerabin/camerabincapturedestination.h index 0ee40e7ba..460fd1aa3 100644 --- a/src/plugins/gstreamer/camerabin/camerabincapturedestination.h +++ b/src/plugins/gstreamer/camerabin/camerabincapturedestination.h @@ -56,9 +56,9 @@ public: CameraBinCaptureDestination(CameraBinSession *session); virtual ~CameraBinCaptureDestination(); - bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const; - QCameraImageCapture::CaptureDestinations captureDestination() const; - void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination); + bool isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const override; + QCameraImageCapture::CaptureDestinations captureDestination() const override; + void setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabincontainer.h b/src/plugins/gstreamer/camerabin/camerabincontainer.h index 676d2de66..b9b7f1214 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontainer.h +++ b/src/plugins/gstreamer/camerabin/camerabincontainer.h @@ -62,11 +62,11 @@ public: CameraBinContainer(QObject *parent); virtual ~CameraBinContainer() {} - virtual QStringList supportedContainers() const; - virtual QString containerDescription(const QString &formatMimeType) const; + QStringList supportedContainers() const override; + QString containerDescription(const QString &formatMimeType) const override; - virtual QString containerFormat() const; - virtual void setContainerFormat(const QString &format); + QString containerFormat() const override; + void setContainerFormat(const QString &format) override; QString actualContainerFormat() const; void setActualContainerFormat(const QString &containerFormat); diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.h b/src/plugins/gstreamer/camerabin/camerabincontrol.h index a4d052afb..56c02dad4 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.h +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.h @@ -59,16 +59,16 @@ public: bool isValid() const { return true; } - QCamera::State state() const; - void setState(QCamera::State state); + QCamera::State state() const override; + void setState(QCamera::State state) override; - QCamera::Status status() const; + QCamera::Status status() const override; - QCamera::CaptureModes captureMode() const; - void setCaptureMode(QCamera::CaptureModes mode); + QCamera::CaptureModes captureMode() const override; + void setCaptureMode(QCamera::CaptureModes mode) override; - bool isCaptureModeSupported(QCamera::CaptureModes mode) const; - bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const; + bool isCaptureModeSupported(QCamera::CaptureModes mode) const override; + bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override; bool viewfinderColorSpaceConversion() const; CamerabinResourcePolicy *resourcePolicy() { return m_resourcePolicy; } diff --git a/src/plugins/gstreamer/camerabin/camerabinexposure.h b/src/plugins/gstreamer/camerabin/camerabinexposure.h index 0435569d4..c30da25ad 100644 --- a/src/plugins/gstreamer/camerabin/camerabinexposure.h +++ b/src/plugins/gstreamer/camerabin/camerabinexposure.h @@ -58,12 +58,12 @@ public: CameraBinExposure(CameraBinSession *session); virtual ~CameraBinExposure(); - bool isParameterSupported(ExposureParameter parameter) const; - QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const; + bool isParameterSupported(ExposureParameter parameter) const override; + QVariantList supportedParameterRange(ExposureParameter parameter, bool *continuous) const override; - QVariant requestedValue(ExposureParameter parameter) const; - QVariant actualValue(ExposureParameter parameter) const; - bool setValue(ExposureParameter parameter, const QVariant& value); + QVariant requestedValue(ExposureParameter parameter) const override; + QVariant actualValue(ExposureParameter parameter) const override; + bool setValue(ExposureParameter parameter, const QVariant &value) override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabinflash.h b/src/plugins/gstreamer/camerabin/camerabinflash.h index 0bcfef1b9..84177f122 100644 --- a/src/plugins/gstreamer/camerabin/camerabinflash.h +++ b/src/plugins/gstreamer/camerabin/camerabinflash.h @@ -57,11 +57,11 @@ public: CameraBinFlash(CameraBinSession *session); virtual ~CameraBinFlash(); - QCameraExposure::FlashModes flashMode() const; - void setFlashMode(QCameraExposure::FlashModes mode); - bool isFlashModeSupported(QCameraExposure::FlashModes mode) const; + QCameraExposure::FlashModes flashMode() const override; + void setFlashMode(QCameraExposure::FlashModes mode) override; + bool isFlashModeSupported(QCameraExposure::FlashModes mode) const override; - bool isFlashReady() const; + bool isFlashReady() const override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.h b/src/plugins/gstreamer/camerabin/camerabinfocus.h index 2b510a987..72a5006f9 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.h +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.h @@ -68,17 +68,17 @@ public: CameraBinFocus(CameraBinSession *session); virtual ~CameraBinFocus(); - QCameraFocus::FocusModes focusMode() const; - void setFocusMode(QCameraFocus::FocusModes mode); - bool isFocusModeSupported(QCameraFocus::FocusModes mode) const; + QCameraFocus::FocusModes focusMode() const override; + void setFocusMode(QCameraFocus::FocusModes mode) override; + bool isFocusModeSupported(QCameraFocus::FocusModes mode) const override; - QCameraFocus::FocusPointMode focusPointMode() const; - void setFocusPointMode(QCameraFocus::FocusPointMode mode) ; - bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const; - QPointF customFocusPoint() const; - void setCustomFocusPoint(const QPointF &point); + QCameraFocus::FocusPointMode focusPointMode() const override; + void setFocusPointMode(QCameraFocus::FocusPointMode mode) override; + bool isFocusPointModeSupported(QCameraFocus::FocusPointMode) const override; + QPointF customFocusPoint() const override; + void setCustomFocusPoint(const QPointF &point) override; - QCameraFocusZoneList focusZones() const; + QCameraFocusZoneList focusZones() const override; void handleFocusMessage(GstMessage*); QCamera::LockStatus focusStatus() const { return m_focusStatus; } @@ -94,7 +94,7 @@ public Q_SLOTS: #if GST_CHECK_VERSION(1,0,0) protected: - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; #endif private Q_SLOTS: @@ -111,7 +111,7 @@ private: void updateRegionOfInterest(const QVector &rectangles); #if GST_CHECK_VERSION(1,0,0) - bool probeBuffer(GstBuffer *buffer); + bool probeBuffer(GstBuffer *buffer) override; #endif CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h b/src/plugins/gstreamer/camerabin/camerabinimagecapture.h index a8a55bb06..5e00ab6d5 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.h +++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.h @@ -62,14 +62,14 @@ public: CameraBinImageCapture(CameraBinSession *session); virtual ~CameraBinImageCapture(); - QCameraImageCapture::DriveMode driveMode() const { return QCameraImageCapture::SingleImageCapture; } - void setDriveMode(QCameraImageCapture::DriveMode) {} + QCameraImageCapture::DriveMode driveMode() const override { return QCameraImageCapture::SingleImageCapture; } + void setDriveMode(QCameraImageCapture::DriveMode) override {} - bool isReadyForCapture() const; - int capture(const QString &fileName); - void cancelCapture(); + bool isReadyForCapture() const override; + int capture(const QString &fileName) override; + void cancelCapture() override; - bool processBusMessage(const QGstreamerMessage &message); + bool processBusMessage(const QGstreamerMessage &message) override; private slots: void updateState(); @@ -85,8 +85,8 @@ private: { public: EncoderProbe(CameraBinImageCapture *capture) : capture(capture) {} - void probeCaps(GstCaps *caps); - bool probeBuffer(GstBuffer *buffer); + void probeCaps(GstCaps *caps) override; + bool probeBuffer(GstBuffer *buffer) override; private: CameraBinImageCapture * const capture; @@ -96,8 +96,8 @@ private: { public: MuxerProbe(CameraBinImageCapture *capture) : capture(capture) {} - void probeCaps(GstCaps *caps); - bool probeBuffer(GstBuffer *buffer); + void probeCaps(GstCaps *caps) override; + bool probeBuffer(GstBuffer *buffer) override; private: CameraBinImageCapture * const capture; diff --git a/src/plugins/gstreamer/camerabin/camerabinimageencoder.h b/src/plugins/gstreamer/camerabin/camerabinimageencoder.h index 8c777b9cd..96f7ae7aa 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimageencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinimageencoder.h @@ -58,13 +58,13 @@ public: virtual ~CameraBinImageEncoder(); QList supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; - QStringList supportedImageCodecs() const; - QString imageCodecDescription(const QString &formatName) const; + QStringList supportedImageCodecs() const override; + QString imageCodecDescription(const QString &formatName) const override; - QImageEncoderSettings imageSettings() const; - void setImageSettings(const QImageEncoderSettings &settings); + QImageEncoderSettings imageSettings() const override; + void setImageSettings(const QImageEncoderSettings &settings) override; Q_SIGNALS: void settingsChanged(); diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h index 82c6e1678..3021f6e9f 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h +++ b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h @@ -74,10 +74,10 @@ public: bool setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceMode mode); bool isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceMode mode) const; - bool isParameterSupported(ProcessingParameter) const; - bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const; - QVariant parameter(ProcessingParameter parameter) const; - void setParameter(ProcessingParameter parameter, const QVariant &value); + 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; #ifdef HAVE_GST_PHOTOGRAPHY void lockWhiteBalance(); diff --git a/src/plugins/gstreamer/camerabin/camerabininfocontrol.h b/src/plugins/gstreamer/camerabin/camerabininfocontrol.h index c5029dc0a..9c801e804 100644 --- a/src/plugins/gstreamer/camerabin/camerabininfocontrol.h +++ b/src/plugins/gstreamer/camerabin/camerabininfocontrol.h @@ -53,8 +53,8 @@ public: CameraBinInfoControl(GstElementFactory *sourceFactory, QObject *parent); ~CameraBinInfoControl(); - QCamera::Position cameraPosition(const QString &deviceName) const; - int cameraOrientation(const QString &deviceName) const; + QCamera::Position cameraPosition(const QString &deviceName) const override; + int cameraOrientation(const QString &deviceName) const override; private: GstElementFactory * const m_sourceFactory; diff --git a/src/plugins/gstreamer/camerabin/camerabinlocks.h b/src/plugins/gstreamer/camerabin/camerabinlocks.h index c90675615..cd592ffd2 100644 --- a/src/plugins/gstreamer/camerabin/camerabinlocks.h +++ b/src/plugins/gstreamer/camerabin/camerabinlocks.h @@ -61,16 +61,16 @@ public: CameraBinLocks(CameraBinSession *session); virtual ~CameraBinLocks(); - QCamera::LockTypes supportedLocks() const; + QCamera::LockTypes supportedLocks() const override; - QCamera::LockStatus lockStatus(QCamera::LockType lock) const; + QCamera::LockStatus lockStatus(QCamera::LockType lock) const override; - void searchAndLock(QCamera::LockTypes locks); - void unlock(QCamera::LockTypes locks); + void searchAndLock(QCamera::LockTypes locks) override; + void unlock(QCamera::LockTypes locks) override; protected: #if GST_CHECK_VERSION(1, 2, 0) - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; #endif private slots: diff --git a/src/plugins/gstreamer/camerabin/camerabinmetadata.h b/src/plugins/gstreamer/camerabin/camerabinmetadata.h index 67d3bf46e..5fef7e388 100644 --- a/src/plugins/gstreamer/camerabin/camerabinmetadata.h +++ b/src/plugins/gstreamer/camerabin/camerabinmetadata.h @@ -52,12 +52,12 @@ public: virtual ~CameraBinMetaData() {} - bool isMetaDataAvailable() const { return true; } - bool isWritable() const { return true; } + bool isMetaDataAvailable() const override { return true; } + bool isWritable() const override { return true; } - QVariant metaData(const QString &key) const; - void setMetaData(const QString &key, const QVariant &value); - QStringList availableMetaData() const; + QVariant metaData(const QString &key) const override; + void setMetaData(const QString &key, const QVariant &value) override; + QStringList availableMetaData() const override; Q_SIGNALS: void metaDataChanged(const QMap&); diff --git a/src/plugins/gstreamer/camerabin/camerabinrecorder.h b/src/plugins/gstreamer/camerabin/camerabinrecorder.h index c5280ebd7..9392f69a5 100644 --- a/src/plugins/gstreamer/camerabin/camerabinrecorder.h +++ b/src/plugins/gstreamer/camerabin/camerabinrecorder.h @@ -58,27 +58,27 @@ public: CameraBinRecorder(CameraBinSession *session); virtual ~CameraBinRecorder(); - QUrl outputLocation() const; - bool setOutputLocation(const QUrl &sink); + QUrl outputLocation() const override; + bool setOutputLocation(const QUrl &sink) override; - QMediaRecorder::State state() const; - QMediaRecorder::Status status() const; + QMediaRecorder::State state() const override; + QMediaRecorder::Status status() const override; - qint64 duration() const; + qint64 duration() const override; - bool isMuted() const; - qreal volume() const; + bool isMuted() const override; + qreal volume() const override; - void applySettings(); + void applySettings() override; #ifdef HAVE_GST_ENCODING_PROFILES GstEncodingContainerProfile *videoProfile(); #endif public slots: - void setState(QMediaRecorder::State state); - void setMuted(bool); - void setVolume(qreal volume); + void setState(QMediaRecorder::State state) override; + void setMuted(bool) override; + void setVolume(qreal volume) override; void updateStatus(); diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.h b/src/plugins/gstreamer/camerabin/camerabinservice.h index 9069c3d5c..44afef25f 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.h +++ b/src/plugins/gstreamer/camerabin/camerabinservice.h @@ -71,8 +71,8 @@ public: CameraBinService(GstElementFactory *sourceFactory, QObject *parent = 0); virtual ~CameraBinService(); - QMediaControl *requestControl(const char *name); - void releaseControl(QMediaControl *); + QMediaControl *requestControl(const char *name) override; + void releaseControl(QMediaControl *) override; static bool isCameraBinAvailable(); diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h index 9b16c0eca..b31e44459 100644 --- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h +++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.h @@ -65,18 +65,18 @@ public: CameraBinServicePlugin(); ~CameraBinServicePlugin(); - QMediaService* create(QString const& key); - void release(QMediaService *service); + QMediaService* create(const QString &key) override; + void release(QMediaService *service) override; - QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const; + QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const override; - QByteArray defaultDevice(const QByteArray &service) const; - QList devices(const QByteArray &service) const; - QString deviceDescription(const QByteArray &service, const QByteArray &device); + QByteArray defaultDevice(const QByteArray &service) const override; + QList devices(const QByteArray &service) const override; + QString deviceDescription(const QByteArray &service, const QByteArray &device) override; QVariant deviceProperty(const QByteArray &service, const QByteArray &device, const QByteArray &property); - QCamera::Position cameraPosition(const QByteArray &device) const; - int cameraOrientation(const QByteArray &device) const; + QCamera::Position cameraPosition(const QByteArray &device) const override; + int cameraOrientation(const QByteArray &device) const override; private: GstElementFactory *sourceFactory() const; diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.h b/src/plugins/gstreamer/camerabin/camerabinsession.h index ca0b22761..0d66d9ee1 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.h +++ b/src/plugins/gstreamer/camerabin/camerabinsession.h @@ -161,8 +161,8 @@ public: QString device() const { return m_inputDevice; } - bool processSyncMessage(const QGstreamerMessage &message); - bool processBusMessage(const QGstreamerMessage &message); + bool processSyncMessage(const QGstreamerMessage &message) override; + bool processBusMessage(const QGstreamerMessage &message) override; QGstreamerVideoProbeControl *videoProbe(); diff --git a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h index 2cc9f925c..a38dc78da 100644 --- a/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h +++ b/src/plugins/gstreamer/camerabin/camerabinv4limageprocessing.h @@ -55,10 +55,10 @@ public: CameraBinV4LImageProcessing(CameraBinSession *session); virtual ~CameraBinV4LImageProcessing(); - bool isParameterSupported(ProcessingParameter) const; - bool isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const; - QVariant parameter(ProcessingParameter parameter) const; - void setParameter(ProcessingParameter parameter, const QVariant &value); + 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; public slots: void updateParametersInfo(QCamera::Status cameraStatus); diff --git a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h index 7abcd66d5..9eb931dbb 100644 --- a/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h +++ b/src/plugins/gstreamer/camerabin/camerabinvideoencoder.h @@ -66,18 +66,18 @@ public: virtual ~CameraBinVideoEncoder(); QList supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; QList< qreal > supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = 0) const override; QPair rateAsRational(qreal) const; - QStringList supportedVideoCodecs() const; - QString videoCodecDescription(const QString &codecName) const; + QStringList supportedVideoCodecs() const override; + QString videoCodecDescription(const QString &codecName) const override; - QVideoEncoderSettings videoSettings() const; - void setVideoSettings(const QVideoEncoderSettings &settings); + QVideoEncoderSettings videoSettings() const override; + void setVideoSettings(const QVideoEncoderSettings &settings) override; QVideoEncoderSettings actualVideoSettings() const; void setActualVideoSettings(const QVideoEncoderSettings&); diff --git a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h index 7a03a065c..59a0ca8a9 100644 --- a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h +++ b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings.h @@ -54,9 +54,9 @@ public: CameraBinViewfinderSettings(CameraBinSession *session); ~CameraBinViewfinderSettings(); - bool isViewfinderParameterSupported(ViewfinderParameter parameter) const; - QVariant viewfinderParameter(ViewfinderParameter parameter) const; - void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value); + bool isViewfinderParameterSupported(ViewfinderParameter parameter) const override; + QVariant viewfinderParameter(ViewfinderParameter parameter) const override; + void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings2.h b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings2.h index 36349b2de..5e03b007a 100644 --- a/src/plugins/gstreamer/camerabin/camerabinviewfindersettings2.h +++ b/src/plugins/gstreamer/camerabin/camerabinviewfindersettings2.h @@ -53,10 +53,10 @@ public: CameraBinViewfinderSettings2(CameraBinSession *session); ~CameraBinViewfinderSettings2(); - QList supportedViewfinderSettings() const; + QList supportedViewfinderSettings() const override; - QCameraViewfinderSettings viewfinderSettings() const; - void setViewfinderSettings(const QCameraViewfinderSettings &settings); + QCameraViewfinderSettings viewfinderSettings() const override; + void setViewfinderSettings(const QCameraViewfinderSettings &settings) override; private: CameraBinSession *m_session; diff --git a/src/plugins/gstreamer/camerabin/camerabinzoom.h b/src/plugins/gstreamer/camerabin/camerabinzoom.h index e009de3b7..8ad4764b2 100644 --- a/src/plugins/gstreamer/camerabin/camerabinzoom.h +++ b/src/plugins/gstreamer/camerabin/camerabinzoom.h @@ -53,15 +53,15 @@ public: CameraBinZoom(CameraBinSession *session); virtual ~CameraBinZoom(); - qreal maximumOpticalZoom() const; - qreal maximumDigitalZoom() const; + qreal maximumOpticalZoom() const override; + qreal maximumDigitalZoom() const override; - qreal requestedOpticalZoom() const; - qreal requestedDigitalZoom() const; - qreal currentOpticalZoom() const; - qreal currentDigitalZoom() const; + qreal requestedOpticalZoom() const override; + qreal requestedDigitalZoom() const override; + qreal currentOpticalZoom() const override; + qreal currentDigitalZoom() const override; - void zoomTo(qreal optical, qreal digital); + void zoomTo(qreal optical, qreal digital) override; private: CameraBinSession *m_session; -- cgit v1.2.3