diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 11:25:31 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:56:22 +0000 |
commit | a9428fd087035e2f80c8f1230917d12b3d20be4c (patch) | |
tree | 9c83913356e3b03cefe3fa10bd7f44a1055a4a80 /src | |
parent | f83b3dd1ac60c04229d53b72a9d2c15f8cdd5abc (diff) |
Remove empty destructors in the *Controls classes
Change-Id: I2c7266a6e068b1336e34ea8bf0cea46e77c29998
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src')
48 files changed, 0 insertions, 229 deletions
diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index 90eec2b25..6255e2015 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol.cpp @@ -75,13 +75,6 @@ QT_BEGIN_NAMESPACE */ /*! - Destroys an audio decoder control. -*/ -QAudioDecoderControl::~QAudioDecoderControl() -{ -} - -/*! Constructs a new audio decoder control with the given \a parent. */ QAudioDecoderControl::QAudioDecoderControl(QObject *parent) diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h index 537285a16..1422ca333 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ b/src/multimedia/controls/qaudiodecodercontrol.h @@ -55,8 +55,6 @@ class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QObject Q_OBJECT public: - ~QAudioDecoderControl(); - virtual QAudioDecoder::State state() const = 0; virtual QString sourceFilename() const = 0; diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp index b9c234d8d..692fa28e2 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -86,13 +86,6 @@ QAudioEncoderSettingsControl::QAudioEncoderSettingsControl(QObject *parent) } /*! - Destroys the audio encoder settings control. -*/ -QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() -{ -} - -/*! \fn QAudioEncoderSettingsControl::supportedAudioCodecs() const Returns the list of supported audio codec names. diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index cc9c09770..b2e257f33 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -60,8 +60,6 @@ class Q_MULTIMEDIA_EXPORT QAudioEncoderSettingsControl : public QObject Q_OBJECT public: - virtual ~QAudioEncoderSettingsControl(); - virtual QStringList supportedAudioCodecs() const = 0; virtual QString codecDescription(const QString &codecName) const = 0; diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp index 19ef92474..8f62cebdb 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudioinputselectorcontrol.cpp @@ -78,13 +78,6 @@ QAudioInputSelectorControl::QAudioInputSelectorControl(QObject *parent) } /*! - Destroys an audio input selector control. -*/ -QAudioInputSelectorControl::~QAudioInputSelectorControl() -{ -} - -/*! \fn QList<QString> QAudioInputSelectorControl::availableInputs() const Returns a list of the names of the available audio inputs. diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h index e741a93db..003d878fc 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ b/src/multimedia/controls/qaudioinputselectorcontrol.h @@ -53,8 +53,6 @@ class Q_MULTIMEDIA_EXPORT QAudioInputSelectorControl : public QObject Q_OBJECT public: - virtual ~QAudioInputSelectorControl(); - virtual QList<QString> availableInputs() const = 0; virtual QString inputDescription(const QString& name) const = 0; virtual QString defaultInput() const = 0; diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp index 72b3b5d14..abb2568d8 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp @@ -78,13 +78,6 @@ QAudioOutputSelectorControl::QAudioOutputSelectorControl(QObject *parent) } /*! - Destroys an audio output selector control. -*/ -QAudioOutputSelectorControl::~QAudioOutputSelectorControl() -{ -} - -/*! \fn QList<QString> QAudioOutputSelectorControl::availableOutputs() const Returns a list of the names of the available audio outputs. diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h index 1b6d685f8..01c4a1573 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h @@ -53,8 +53,6 @@ class Q_MULTIMEDIA_EXPORT QAudioOutputSelectorControl : public QObject Q_OBJECT public: - virtual ~QAudioOutputSelectorControl(); - virtual QList<QString> availableOutputs() const = 0; virtual QString outputDescription(const QString& name) const = 0; virtual QString defaultOutput() const = 0; diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index 9ade67da1..e207a3fb9 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -78,13 +78,6 @@ QCameraCaptureBufferFormatControl::QCameraCaptureBufferFormatControl(QObject *pa } /*! - Destroys an image buffer capture format control. -*/ -QCameraCaptureBufferFormatControl::~QCameraCaptureBufferFormatControl() -{ -} - -/*! \fn QCameraCaptureBufferFormatControl::supportedBufferFormats() const Returns the list of the supported buffer capture formats. diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index b1a4561e8..319d7df22 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -52,8 +52,6 @@ class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QObject { Q_OBJECT public: - ~QCameraCaptureBufferFormatControl(); - virtual QList<QVideoFrame::PixelFormat> supportedBufferFormats() const = 0; virtual QVideoFrame::PixelFormat bufferFormat() const = 0; virtual void setBufferFormat(QVideoFrame::PixelFormat format) = 0; diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index 1c5161ac5..2468e9e2f 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -85,14 +85,6 @@ QCameraControl::QCameraControl(QObject *parent) } /*! - Destruct the camera control object. -*/ - -QCameraControl::~QCameraControl() -{ -} - -/*! \fn QCameraControl::state() const Returns the state of the camera service. diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 5da4aeac7..d57b74937 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -63,8 +63,6 @@ public: ViewfinderSettings = 5 }; - ~QCameraControl(); - virtual QCamera::State state() const = 0; virtual void setState(QCamera::State state) = 0; diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index 2ff220fac..8894604cf 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -84,13 +84,6 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent) } /*! - Destroys the camera exposure control object. -*/ -QCameraExposureControl::~QCameraExposureControl() -{ -} - -/*! \enum QCameraExposureControl::ExposureParameter \value ISO Camera ISO sensitivity, specified as integer value. diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 87274b407..7331e7392 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -58,8 +58,6 @@ class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QObject Q_ENUMS(ExposureParameter) public: - ~QCameraExposureControl(); - enum ExposureParameter { ISO, Aperture, diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index 52f423721..91fbb7bd6 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -81,15 +81,6 @@ QCameraFocusControl::QCameraFocusControl(QObject *parent) } /*! - Destruct the camera control object. -*/ - -QCameraFocusControl::~QCameraFocusControl() -{ -} - - -/*! \fn QCameraFocus::FocusModes QCameraFocusControl::focusMode() const Returns the focus mode being used. diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 7c46cdfad..3ff51b9f5 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -55,8 +55,6 @@ class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QObject Q_OBJECT public: - ~QCameraFocusControl(); - virtual QCameraFocus::FocusModes focusMode() const = 0; virtual void setFocusMode(QCameraFocus::FocusModes mode) = 0; virtual bool isFocusModeSupported(QCameraFocus::FocusModes mode) const = 0; diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index 88da5a90c..3eb627705 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -80,13 +80,6 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent) } /*! - Destroys an image capture control. -*/ -QCameraImageCaptureControl::~QCameraImageCaptureControl() -{ -} - -/*! \fn QCameraImageCaptureControl::isReadyForCapture() const Identifies if a capture control is ready to perform a capture diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 04a6b2f4f..28bde94de 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -58,8 +58,6 @@ class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QObject Q_OBJECT public: - ~QCameraImageCaptureControl(); - virtual bool isReadyForCapture() const = 0; virtual QCameraImageCapture::DriveMode driveMode() const = 0; diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index a07260079..ab840900e 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -101,14 +101,6 @@ QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent) } /*! - Destruct the image processing control object. -*/ - -QCameraImageProcessingControl::~QCameraImageProcessingControl() -{ -} - -/*! \fn bool QCameraImageProcessingControl::isParameterSupported(ProcessingParameter parameter) const Returns true if the camera supports adjusting image processing \a parameter. diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 69a266a9f..1d8a0d23b 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -57,8 +57,6 @@ class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QObject Q_ENUMS(ProcessingParameter) public: - ~QCameraImageProcessingControl(); - enum ProcessingParameter { WhiteBalancePreset, ColorTemperature, diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp index fe43a0ce6..d9a901404 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp @@ -82,13 +82,6 @@ QCameraViewfinderSettingsControl::QCameraViewfinderSettingsControl(QObject *pare } /*! - Destroys the camera viewfinder control object. -*/ -QCameraViewfinderSettingsControl::~QCameraViewfinderSettingsControl() -{ -} - -/*! \enum QCameraViewfinderSettingsControl::ViewfinderParameter \value Resolution Viewfinder resolution, QSize. @@ -170,13 +163,6 @@ QCameraViewfinderSettingsControl2::QCameraViewfinderSettingsControl2(QObject *pa } /*! - Destroys the camera viewfinder settings control object. -*/ -QCameraViewfinderSettingsControl2::~QCameraViewfinderSettingsControl2() -{ -} - -/*! \fn QCameraViewfinderSettingsControl2::supportedViewfinderSettings() const Returns a list of supported camera viewfinder settings. diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index 5edcbcd26..e724c88d4 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -63,8 +63,6 @@ public: UserParameter = 1000 }; - ~QCameraViewfinderSettingsControl(); - virtual bool isViewfinderParameterSupported(ViewfinderParameter parameter) const = 0; virtual QVariant viewfinderParameter(ViewfinderParameter parameter) const = 0; virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0; @@ -84,8 +82,6 @@ class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl2 : public QObject { Q_OBJECT public: - virtual ~QCameraViewfinderSettingsControl2(); - virtual QList<QCameraViewfinderSettings> supportedViewfinderSettings() const = 0; virtual QCameraViewfinderSettings viewfinderSettings() const = 0; diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index 99dd4e949..793e91d73 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -84,13 +84,6 @@ QImageEncoderControl::QImageEncoderControl(QObject *parent) } /*! - Destroys the image encoder control. -*/ -QImageEncoderControl::~QImageEncoderControl() -{ -} - -/*! \fn QImageEncoderControl::supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), bool *continuous = 0) const diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index 9e91d14c6..99342bcbe 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -58,8 +58,6 @@ class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QObject Q_OBJECT public: - virtual ~QImageEncoderControl(); - virtual QStringList supportedImageCodecs() const = 0; virtual QString imageCodecDescription(const QString &codec) const = 0; diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp index cb315450c..9bd028573 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp @@ -78,11 +78,6 @@ QMediaAudioProbeControl::QMediaAudioProbeControl(QObject *parent) { } -/*! Destroys this audio probe control */ -QMediaAudioProbeControl::~QMediaAudioProbeControl() -{ -} - /*! \fn QMediaAudioProbeControl::audioBufferProbed(const QAudioBuffer &buffer) diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index 06a882d80..7067b809e 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -48,8 +48,6 @@ class QAudioBuffer; class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QObject { Q_OBJECT -public: - virtual ~QMediaAudioProbeControl(); Q_SIGNALS: void audioBufferProbed(const QAudioBuffer &buffer); diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 208e5bec5..851979199 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -86,14 +86,6 @@ QMediaContainerControl::QMediaContainerControl(QObject *parent) } /*! - Destroys a media container control. -*/ -QMediaContainerControl::~QMediaContainerControl() -{ -} - - -/*! \fn QMediaContainerControl::supportedContainers() const Returns a list of MIME types of supported container formats. diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 114833e3a..34753b44c 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -53,8 +53,6 @@ class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QObject Q_OBJECT public: - virtual ~QMediaContainerControl(); - virtual QStringList supportedContainers() const = 0; virtual QString containerFormat() const = 0; virtual void setContainerFormat(const QString &format) = 0; diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index dae2bf10d..75a162a40 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -83,13 +83,6 @@ QT_BEGIN_NAMESPACE */ /*! - Destroys a media player control. -*/ -QMediaPlayerControl::~QMediaPlayerControl() -{ -} - -/*! Constructs a new media player control with the given \a parent. */ QMediaPlayerControl::QMediaPlayerControl(QObject *parent) diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 252c73d67..ae0966ae9 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -56,8 +56,6 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QObject Q_OBJECT public: - ~QMediaPlayerControl(); - virtual QMediaPlayer::State state() const = 0; virtual QMediaPlayer::MediaStatus mediaStatus() const = 0; diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 8686d95a6..fdee47e1c 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -89,14 +89,6 @@ QMediaRecorderControl::QMediaRecorderControl(QObject* parent) } /*! - Destroys a media recorder control. -*/ - -QMediaRecorderControl::~QMediaRecorderControl() -{ -} - -/*! \fn QUrl QMediaRecorderControl::outputLocation() const Returns the current output location being used. diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index c8b283729..fa2abd792 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -58,8 +58,6 @@ class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QObject Q_OBJECT public: - virtual ~QMediaRecorderControl(); - virtual QUrl outputLocation() const = 0; virtual bool setOutputLocation(const QUrl &location) = 0; diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 622c5e1cc..a948026a9 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -88,13 +88,6 @@ QMediaStreamsControl::QMediaStreamsControl(QObject *parent) } /*! - Destroys a media streams control. -*/ -QMediaStreamsControl::~QMediaStreamsControl() -{ -} - -/*! \enum QMediaStreamsControl::StreamType Media stream type. diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index 470783e03..ac9674699 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -58,8 +58,6 @@ class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QObject public: enum StreamType { UnknownStream, VideoStream, AudioStream, SubPictureStream, DataStream }; - virtual ~QMediaStreamsControl(); - virtual int streamCount() = 0; virtual StreamType streamType(int streamNumber) = 0; diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp index 7c8145ebe..d0a7640be 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp @@ -78,11 +78,6 @@ QMediaVideoProbeControl::QMediaVideoProbeControl(QObject *parent) { } -/*! Destroys this video probe control */ -QMediaVideoProbeControl::~QMediaVideoProbeControl() -{ -} - /*! \fn QMediaVideoProbeControl::videoFrameProbed(const QVideoFrame &frame) diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index 6d7bf2f2b..f291a3e0a 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -50,8 +50,6 @@ class QVideoFrame; class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QObject { Q_OBJECT -public: - virtual ~QMediaVideoProbeControl(); Q_SIGNALS: void videoFrameProbed(const QVideoFrame &frame); diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index ff9e61f91..1a8fb792c 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -93,14 +93,6 @@ QMetaDataReaderControl::QMetaDataReaderControl(QObject *parent) } /*! - Destroy the meta-data object. -*/ - -QMetaDataReaderControl::~QMetaDataReaderControl() -{ -} - -/*! \fn bool QMetaDataReaderControl::isMetaDataAvailable() const Identifies if meta-data is available from a media service. diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index f97af803e..04729d61b 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -55,8 +55,6 @@ class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QObject { Q_OBJECT public: - ~QMetaDataReaderControl(); - virtual bool isMetaDataAvailable() const = 0; virtual QVariant metaData(const QString &key) const = 0; diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 2c8b0d587..14a22492f 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -92,14 +92,6 @@ QMetaDataWriterControl::QMetaDataWriterControl(QObject *parent) } /*! - Destroy the meta-data writer control. -*/ - -QMetaDataWriterControl::~QMetaDataWriterControl() -{ -} - -/*! \fn bool QMetaDataWriterControl::isMetaDataAvailable() const Identifies if meta-data is available from a media service. diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index b0e0b3624..5181974f0 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -55,8 +55,6 @@ class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QObject { Q_OBJECT public: - ~QMetaDataWriterControl(); - virtual bool isWritable() const = 0; virtual bool isMetaDataAvailable() const = 0; diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp index e3e14cd2d..22c75b696 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp @@ -78,13 +78,6 @@ QVideoDeviceSelectorControl::QVideoDeviceSelectorControl(QObject *parent) } /*! - Destroys a video device selector control. -*/ -QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl() -{ -} - -/*! \fn QVideoDeviceSelectorControl::deviceCount() const Returns the number of available video devices; diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 34ac4c536..b8ecf2b9a 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -53,8 +53,6 @@ class Q_MULTIMEDIA_EXPORT QVideoDeviceSelectorControl : public QObject Q_OBJECT public: - virtual ~QVideoDeviceSelectorControl(); - virtual int deviceCount() const = 0; virtual QString deviceName(int index) const = 0; diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp index af44da245..710b67455 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp +++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp @@ -88,13 +88,6 @@ QVideoEncoderSettingsControl::QVideoEncoderSettingsControl(QObject *parent) } /*! - Destroys a video encoder settings control. -*/ -QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl() -{ -} - -/*! \fn QVideoEncoderSettingsControl::supportedVideoCodecs() const Returns the list of supported video codecs. diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 53835f716..37b6da856 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -61,8 +61,6 @@ class Q_MULTIMEDIA_EXPORT QVideoEncoderSettingsControl : public QObject Q_OBJECT public: - virtual ~QVideoEncoderSettingsControl(); - virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, bool *continuous = nullptr) const = 0; diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index 585799ea3..4683ed3c7 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -84,13 +84,6 @@ QVideoRendererControl::QVideoRendererControl(QObject *parent) } /*! - Destroys a video renderer media end point. -*/ -QVideoRendererControl::~QVideoRendererControl() -{ -} - -/*! \fn QVideoRendererControl::surface() const Returns the surface a video producer renders to. diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index caa5dd114..bc2f27fcf 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -50,8 +50,6 @@ class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QObject Q_OBJECT public: - ~QVideoRendererControl(); - virtual QAbstractVideoSurface *surface() const = 0; virtual void setSurface(QAbstractVideoSurface *surface) = 0; diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp index 6e73ddd97..f5e2259a8 100644 --- a/src/multimedia/controls/qvideowindowcontrol.cpp +++ b/src/multimedia/controls/qvideowindowcontrol.cpp @@ -86,13 +86,6 @@ QVideoWindowControl::QVideoWindowControl(QObject *parent) } /*! - Destroys a video window control. -*/ -QVideoWindowControl::~QVideoWindowControl() -{ -} - -/*! \fn QVideoWindowControl::winId() const Returns the ID of the window a video overlay end point renders to. diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index 3560cdfa8..7f7012494 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -55,8 +55,6 @@ class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QObject Q_OBJECT public: - ~QVideoWindowControl(); - virtual WId winId() const = 0; virtual void setWinId(WId id) = 0; |