diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-16 15:19:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 07:32:24 +0100 |
commit | a6268601c907c56555ae42668e983a447c0da2eb (patch) | |
tree | 8e702efd10ec2eae5688d2afa6d660930c89399f /src/multimedia/controls | |
parent | b228ff95d763fc954ffe34b2fdbc73d88ed25758 (diff) |
Remove antiquated \since lines in docs.
They aren't useful in the case of QtMultimedia{Kit}
Change-Id: If1b0b6625763c85907fb05beb9c440046472ddef
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia/controls')
27 files changed, 0 insertions, 306 deletions
diff --git a/src/multimedia/controls/qaudioencodercontrol.cpp b/src/multimedia/controls/qaudioencodercontrol.cpp index 469a78584..df79e465b 100644 --- a/src/multimedia/controls/qaudioencodercontrol.cpp +++ b/src/multimedia/controls/qaudioencodercontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QAudioEncoderControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QAudioEncoderControl class provides access to the settings of a media service that performs audio encoding. @@ -97,14 +96,12 @@ QAudioEncoderControl::~QAudioEncoderControl() \fn QAudioEncoderControl::supportedAudioCodecs() const Returns the list of supported audio codec names. - \since 1.0 */ /*! \fn QAudioEncoderControl::codecDescription(const QString &codec) const Returns description of audio \a codec. - \since 1.0 */ /*! @@ -120,28 +117,24 @@ QAudioEncoderControl::~QAudioEncoderControl() If the encoder supports arbitrary sample rates within the supported rates range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.0 */ /*! \fn QAudioEncoderControl::supportedEncodingOptions(const QString &codec) const Returns the list of \a codec specific audio encoding options. - \since 1.0 */ /*! \fn QAudioEncoderControl::encodingOption(const QString &codec, const QString &option) const Returns the value of audio encoding \a option for \a codec. - \since 1.0 */ /*! \fn QAudioEncoderControl::setEncodingOption(const QString &codec, const QString &option, const QVariant &value) Set the \a codec specific \a option to \a value. - \since 1.0 */ /*! @@ -152,14 +145,12 @@ QAudioEncoderControl::~QAudioEncoderControl() The returned value may be different tha passed to QAudioEncoderControl::setAudioSettings() if the settings contains the default or undefined parameters. In this case if the undefined parameters are already resolved, they should be returned. - \since 1.0 */ /*! \fn QAudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings) Sets the selected audio \a settings. - \since 1.0 */ #include "moc_qaudioencodercontrol.cpp" diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index f2eb64ef5..321dc2b9d 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -88,28 +88,24 @@ QCameraCaptureBufferFormatControl::~QCameraCaptureBufferFormatControl() \fn QCameraCaptureBufferFormatControl::supportedBufferFormats() const Returns the list of the supported buffer capture formats. - \since 1.2 */ /*! \fn QCameraCaptureBufferFormatControl::bufferFormat() const Returns the current buffer capture format. - \since 1.2 */ /*! \fn QCameraCaptureBufferFormatControl::setBufferFormat(QVideoFrame::PixelFormat format) Sets the buffer capture \a format. - \since 1.2 */ /*! \fn QCameraCaptureBufferFormatControl::bufferFormatChanged(QVideoFrame::PixelFormat format) Signals the buffer image capture format changed to \a format. - \since 1.2 */ #include "moc_qcameracapturebufferformatcontrol.cpp" diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp index 3bcc000ef..bbce6996f 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp @@ -92,28 +92,24 @@ QCameraCaptureDestinationControl::~QCameraCaptureDestinationControl() \fn QCameraCaptureDestinationControl::isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const Returns true if the capture \a destination is supported; and false if it is not. - \since 1.2 */ /*! \fn QCameraCaptureDestinationControl::captureDestination() const Returns the current capture \a destination. The default destination is QCameraImageCapture::CaptureToFile. - \since 1.2 */ /*! \fn QCameraCaptureDestinationControl::setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) Sets the capture \a destination. - \since 1.2 */ /*! \fn QCameraCaptureDestinationControl::captureDestinationChanged(QCameraImageCapture::CaptureDestinations destination) Signals the image capture \a destination changed. - \since 1.2 */ #include "moc_qcameracapturedestinationcontrol.cpp" diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index f98de778c..2f11e96ac 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 This service is provided by a QMediaService object via QMediaService::control(). It is used by QCamera. @@ -99,7 +98,6 @@ QCameraControl::~QCameraControl() Returns the state of the camera service. - \since 1.1 \sa QCamera::state */ @@ -112,7 +110,6 @@ QCameraControl::~QCameraControl() while camera status is used as a feedback mechanism to inform application about backend status. Status changes are reported asynchronously with QCameraControl::statusChanged() signal. - \since 1.1 \sa QCamera::State */ @@ -123,7 +120,6 @@ QCameraControl::~QCameraControl() In most cases the state chage is caused by QCameraControl::setState(), but if critical error has occurred the state changes to QCamera::UnloadedState. - \since 1.1 */ /*! @@ -131,7 +127,6 @@ QCameraControl::~QCameraControl() Returns the status of the camera service. - \since 1.1 \sa QCamera::state */ @@ -139,7 +134,6 @@ QCameraControl::~QCameraControl() \fn void QCameraControl::statusChanged(QCamera::Status status) Signal emitted when the camera \a status changes. - \since 1.1 */ @@ -148,14 +142,12 @@ QCameraControl::~QCameraControl() Signal emitted when an error occurs with error code \a error and a description of the error \a errorString. - \since 1.1 */ /*! \fn Camera::CaptureMode QCameraControl::captureMode() const = 0 Returns the current capture mode. - \since 1.1 */ /*! @@ -171,21 +163,18 @@ QCameraControl::~QCameraControl() with the status changed to QCamera::StartingStatus. This allows the capture settings to be applied before camera is started. Than change the status to QCamera::StartedStatus when the capture mode change is done. - \since 1.1 */ /*! \fn bool QCameraControl::isCaptureModeSupported(QCamera::CaptureMode mode) const = 0; Returns true if the capture \a mode is suported. - \since 1.1 */ /*! \fn QCameraControl::captureModeChanged(QCamera::CaptureMode mode) Signal emitted when the camera capture \a mode changes. - \since 1.1 */ /*! @@ -198,7 +187,6 @@ QCameraControl::~QCameraControl() before the settings are changed and restarted after. Otherwise the backend should apply the change in the current state, with the camera status indicating the progress, if necessary. - \since 1.1 */ /*! diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index 969fd7658..4ca75d38d 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 You can adjust a number of parameters that will affect images and video taken with the corresponding QCamera object. @@ -100,7 +99,6 @@ QCameraExposureControl::~QCameraExposureControl() \fn QCamera::ExposureMode QCameraExposureControl::exposureMode() const Returns the exposure mode. - \since 1.1 */ @@ -108,7 +106,6 @@ QCameraExposureControl::~QCameraExposureControl() \fn void QCameraExposureControl::setExposureMode(QCameraExposure::ExposureMode mode) Set the exposure mode to \a mode. - \since 1.1 */ @@ -116,27 +113,23 @@ QCameraExposureControl::~QCameraExposureControl() \fn bool QCameraExposureControl::isExposureModeSupported(QCameraExposure::ExposureMode mode) const Returns true if the exposure \a mode is supported. - \since 1.1 */ /*! \fn QCameraExposure::MeteringMode QCameraExposureControl::meteringMode() const Returns the current metering mode. - \since 1.1 */ /*! \fn void QCameraExposureControl::setMeteringMode(QCameraExposure::MeteringMode mode) Set the metering mode to \a mode. - \since 1.1 */ /*! \fn bool QCameraExposureControl::isMeteringModeSupported(QCameraExposure::MeteringMode mode) const Returns true if the metering \a mode is supported. - \since 1.1 */ /*! @@ -183,21 +176,18 @@ QCameraExposureControl::~QCameraExposureControl() \fn QCameraExposureControl::isParameterSupported(ExposureParameter parameter) const Returns true is exposure \a parameter is supported by backend. - \since 1.1 */ /*! \fn QCameraExposureControl::exposureParameter(ExposureParameter parameter) const Returns the exposure \a parameter value, or invalid QVariant() if the value is unknown or not supported. - \since 1.1 */ /*! \fn QCameraExposureControl::exposureParameterFlags(ExposureParameter parameter) const Returns the properties of exposure \a parameter. - \since 1.1 */ @@ -205,7 +195,6 @@ QCameraExposureControl::~QCameraExposureControl() \fn QCameraExposureControl::supportedParameterRange(ExposureParameter parameter) const Returns the list of supported \a parameter values; - \since 1.1 */ /*! @@ -216,28 +205,24 @@ QCameraExposureControl::~QCameraExposureControl() and if possible report the actual value to user with QCameraExposureControl::exposureParameter(). Returns true if parameter is supported and value is correct. - \since 1.1 */ /*! \fn QCameraExposureControl::extendedParameterName(ExposureParameter parameter) Returns the extended exposure \a parameter name. - \since 1.1 */ /*! \fn void QCameraExposureControl::flashReady(bool ready) Signal emitted when flash state changes, flash is charged \a ready. - \since 1.1 */ /*! \fn void QCameraExposureControl::exposureParameterChanged(int parameter) Signal emitted when the exposure \a parameter has changed. - \since 1.1 */ /*! @@ -245,7 +230,6 @@ QCameraExposureControl::~QCameraExposureControl() \fn void QCameraExposureControl::exposureParameterRangeChanged(int parameter) Signal emitted when the exposure \a parameter range has changed. - \since 1.1 */ diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp index eaa7ca917..a2b2d6b62 100644 --- a/src/multimedia/controls/qcameraflashcontrol.cpp +++ b/src/multimedia/controls/qcameraflashcontrol.cpp @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE \ingroup multimedia-serv \inmodule QtMultimedia - \since 1.1 \inmodule QtMultimedia @@ -98,7 +97,6 @@ QCameraFlashControl::~QCameraFlashControl() \fn QCamera::FlashModes QCameraFlashControl::flashMode() const Returns the current flash mode. - \since 1.1 */ /*! @@ -109,7 +107,6 @@ QCameraFlashControl::~QCameraFlashControl() Usually a single QCameraExposure::FlashMode flag is used, but some non conflicting flags combination are also allowed, like QCameraExposure::FlashManual | QCameraExposure::FlashSlowSyncRearCurtain. - \since 1.1 */ @@ -119,21 +116,18 @@ QCameraFlashControl::~QCameraFlashControl() Return true if the reqested flash \a mode is supported. Some QCameraExposure::FlashMode values can be combined, for example QCameraExposure::FlashManual | QCameraExposure::FlashSlowSyncRearCurtain - \since 1.1 */ /*! \fn bool QCameraFlashControl::isFlashReady() const Returns true if flash is charged. - \since 1.1 */ /*! \fn void QCameraFlashControl::flashReady(bool ready) Signal emitted when flash state changes to \a ready. - \since 1.1 */ #include "moc_qcameraflashcontrol.cpp" diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index d05639147..1e580a5c4 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as defined in QCameraFocusControl_iid. @@ -94,7 +93,6 @@ QCameraFocusControl::~QCameraFocusControl() \fn QCameraFocus::FocusMode QCameraFocusControl::focusMode() const Returns the focus mode being used. - \since 1.1 */ @@ -102,7 +100,6 @@ QCameraFocusControl::~QCameraFocusControl() \fn void QCameraFocusControl::setFocusMode(QCameraFocus::FocusMode mode) Set the focus mode to \a mode. - \since 1.1 */ @@ -110,7 +107,6 @@ QCameraFocusControl::~QCameraFocusControl() \fn bool QCameraFocusControl::isFocusModeSupported(QCameraFocus::FocusMode mode) const Returns true if focus \a mode is supported. - \since 1.1 */ @@ -118,7 +114,6 @@ QCameraFocusControl::~QCameraFocusControl() \fn qreal QCameraFocusControl::maximumOpticalZoom() const Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported. - \since 1.1 */ @@ -126,7 +121,6 @@ QCameraFocusControl::~QCameraFocusControl() \fn qreal QCameraFocusControl::maximumDigitalZoom() const Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported. - \since 1.1 */ @@ -134,14 +128,12 @@ QCameraFocusControl::~QCameraFocusControl() \fn qreal QCameraFocusControl::opticalZoom() const Return the current optical zoom value. - \since 1.1 */ /*! \fn qreal QCameraFocusControl::digitalZoom() const Return the current digital zoom value. - \since 1.1 */ @@ -149,28 +141,24 @@ QCameraFocusControl::~QCameraFocusControl() \fn void QCameraFocusControl::zoomTo(qreal optical, qreal digital) Sets \a optical and \a digital zoom values. - \since 1.1 */ /*! \fn QCameraFocusControl::focusPointMode() const Returns the camera focus point selection mode. - \since 1.1 */ /*! \fn QCameraFocusControl::setFocusPointMode(QCameraFocus::FocusPointMode mode) Sets the camera focus point selection \a mode. - \since 1.1 */ /*! \fn QCameraFocusControl::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const Returns true if the camera focus point \a mode is supported. - \since 1.1 */ /*! @@ -180,7 +168,6 @@ QCameraFocusControl::~QCameraFocusControl() QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center. Custom focus point is used only in FocusPointCustom focus mode. - \since 1.1 */ /*! @@ -192,7 +179,6 @@ QCameraFocusControl::~QCameraFocusControl() it should use the nearest supported focus point, and return the actual focus point with QCameraFocusControl::focusZones(). - \since 1.1 \sa QCameraFocusControl::customFocusPoint(), QCameraFocusControl::focusZones() */ @@ -200,28 +186,24 @@ QCameraFocusControl::~QCameraFocusControl() \fn QCameraFocusControl::focusZones() const Returns the list of zones, the camera is using for focusing or focused on. - \since 1.1 */ /*! \fn void QCameraFocusControl::opticalZoomChanged(qreal zoom) Signal emitted when the optical \a zoom value changed. - \since 1.1 */ /*! \fn void QCameraFocusControl::digitalZoomChanged(qreal zoom) Signal emitted when the digital \a zoom value changed. - \since 1.1 */ /*! \fn void QCameraFocusControl::maximumOpticalZoomChanged(qreal zoom) Signal emitted when the maximum supported optical \a zoom value changed. - \since 1.1 */ /*! @@ -231,7 +213,6 @@ QCameraFocusControl::~QCameraFocusControl() The maximum supported zoom value can depend on other camera settings, like capture mode or resolution. - \since 1.1 */ @@ -242,7 +223,6 @@ QCameraFocusControl::~QCameraFocusControl() Usually the zones list is changed when the camera is focused. - \since 1.1 \sa QCameraFocusControl::focusZones() */ diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index aa265e12d..f86c50ed0 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -52,7 +52,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 @@ -96,14 +95,12 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() hardware initialized, flash is charged, etc). Returns true if the camera is ready for capture; and false if it is not. - \since 1.1 */ /*! \fn QCameraImageCaptureControl::readyForCaptureChanged(bool ready) Signals that a capture control's \a ready state has changed. - \since 1.1 */ /*! @@ -116,14 +113,12 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() Returns the capture request id number, which is used later with imageExposed(), imageCaptured() and imageSaved() signals. - \since 1.1 */ /*! \fn QCameraImageCaptureControl::cancelCapture() Cancel pending capture requests. - \since 1.1 */ /*! @@ -132,7 +127,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() Signals that an image with it \a requestId has just been exposed. This signal can be used for the shutter sound or other indicaton. - \since 1.1 */ /*! @@ -140,7 +134,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() Signals that an image with it \a requestId has been captured and a \a preview is available. - \since 1.1 */ /*! @@ -150,7 +143,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() This signal is emitted for metadata \a value with a \a key listed in QtMultimedia::MetaData enum. This signal should be emitted between imageExposed and imageSaved signals. - \since 1.2 */ /*! @@ -160,14 +152,12 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimedia::MetaData enum. This signal should be emitted between imageExposed and imageSaved signals. - \since 1.2 */ /*! \fn QCameraImageCaptureControl::imageAvailable(int requestId, const QVideoFrame &buffer) Signals that a captured \a buffer with a \a requestId is available. - \since 1.2 */ /*! @@ -175,21 +165,18 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() Signals that a captured image with a \a requestId has been saved to \a fileName. - \since 1.1 */ /*! \fn QCameraImageCaptureControl::driveMode() const Returns the current camera drive mode. - \since 1.1 */ /*! \fn QCameraImageCaptureControl::setDriveMode(QCameraImageCapture::DriveMode mode) Sets the current camera drive \a mode. - \since 1.1 */ @@ -198,7 +185,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() Signals the capture request \a id failed with \a error code and message \a errorString. - \since 1.1 \sa QCameraImageCapture::Error */ diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index bc287aca8..967b0d38f 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -60,7 +60,6 @@ namespace \class QCameraImageProcessingControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 \brief The QCameraImageProcessingControl class provides an abstract class @@ -106,20 +105,17 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() /*! \fn QCameraImageProcessingControl::whiteBalanceMode() const Return the white balance mode being used. - \since 1.1 */ /*! \fn QCameraImageProcessingControl::setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceMode mode) Set the white balance mode to \a mode - \since 1.1 */ /*! \fn QCameraImageProcessingControl::isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceMode mode) const Returns true if the white balance \a mode is supported. The backend should support at least QCameraImageProcessing::WhiteBalanceAuto mode. - \since 1.1 */ /*! @@ -131,13 +127,11 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() but some parameter may not be available depending on other camera settings, like presets. In such case the currently supported parameters should be returned. - \since 1.1 */ /*! \fn QCameraImageProcessingControl::processingParameter(ProcessingParameter parameter) const Returns the image processing \a parameter value. - \since 1.1 */ /*! @@ -154,7 +148,6 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() For sharpening and denoising the range is 0..100, 0 for sharpening or denoising disabled and 100 for maximum sharpening/denoising applied. - \since 1.1 */ /*! diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp index 13ab28e11..7ce0766cd 100644 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ b/src/multimedia/controls/qcameralockscontrol.cpp @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.1 This service is provided by a QMediaService object via QMediaService::control(). It is used by QCamera. @@ -97,35 +96,30 @@ QCameraLocksControl::~QCameraLocksControl() \fn QCameraLocksControl::supportedLocks() const Returns the lock types, the camera supports. - \since 1.1 */ /*! \fn QCameraLocksControl::lockStatus(QCamera::LockType lock) const Returns the camera \a lock status. - \since 1.1 */ /*! \fn QCameraLocksControl::searchAndLock(QCamera::LockTypes locks) Request camera \a locks. - \since 1.1 */ /*! \fn QCameraLocksControl::unlock(QCamera::LockTypes locks) Unlock camera \a locks. - \since 1.1 */ /*! \fn QCameraLocksControl::lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason) Signals the \a lock \a status was changed with a specified \a reason. - \since 1.1 */ diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index f86fc3ec3..11d8d3c70 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QImageEncoderControl class provides access to the settings of a media service that performs image encoding. @@ -102,21 +101,18 @@ QImageEncoderControl::~QImageEncoderControl() If the encoder supports arbitrary resolutions within the supported resolutions range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.0 */ /*! \fn QImageEncoderControl::supportedImageCodecs() const Returns a list of supported image codecs. - \since 1.0 */ /*! \fn QImageEncoderControl::imageCodecDescription(const QString &codec) const Returns a description of an image \a codec. - \since 1.0 */ /*! @@ -127,14 +123,12 @@ QImageEncoderControl::~QImageEncoderControl() The returned value may be different tha passed to QImageEncoderControl::setImageSettings() if the settings contains the default or undefined parameters. In this case if the undefined parameters are already resolved, they should be returned. - \since 1.0 */ /*! \fn QImageEncoderControl::setImageSettings(const QImageEncoderSettings &settings) Sets the selected image encoder \a settings. - \since 1.0 */ #include "moc_qimageencodercontrol.cpp" diff --git a/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp b/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp index 68eadd885..a5f3d0910 100644 --- a/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp +++ b/src/multimedia/controls/qmediabackgroundplaybackcontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QMediaBackgroundPlaybackControl \inmodule QtMultimedia \ingroup multimedia - \since 5.0 \brief The QMediaBackgroundPlaybackControl class provides access to the background playback @@ -99,21 +98,18 @@ QMediaBackgroundPlaybackControl::QMediaBackgroundPlaybackControl(QObject *parent contextId is an unique string set by the application and is used by the background daemon to distinguish and manage different context for different application. - \since 1.0 */ /*! \fn QMediaBackgroundPlaybackControl::acquire() Try to acquire the playback resource for current application - \since 1.0 */ /*! \fn QMediaBackgroundPlaybackControl::release() Give up the playback resource if current applicaiton holds it. - \since 1.0 */ /*! @@ -124,7 +120,6 @@ QMediaBackgroundPlaybackControl::QMediaBackgroundPlaybackControl(QObject *parent By default this property is false - \since 1.0 */ /*! @@ -132,7 +127,6 @@ QMediaBackgroundPlaybackControl::QMediaBackgroundPlaybackControl(QObject *parent Signals that the playback resource is acquired - \since 1.0 */ /*! @@ -140,7 +134,6 @@ QMediaBackgroundPlaybackControl::QMediaBackgroundPlaybackControl(QObject *parent Signals that the playback resource is lost - \since 1.0 */ #include "moc_qmediabackgroundplaybackcontrol.cpp" diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 62cb6470e..44b7220b4 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 If a QMediaService supports writing encoded data it will implement QMediaContainerControl. This control provides information about the output @@ -97,28 +96,24 @@ QMediaContainerControl::~QMediaContainerControl() \fn QMediaContainerControl::supportedContainers() const Returns a list of MIME types of supported container formats. - \since 1.0 */ /*! \fn QMediaContainerControl::containerMimeType() const Returns the MIME type of the selected container format. - \since 1.0 */ /*! \fn QMediaContainerControl::setContainerMimeType(const QString &mimeType) Sets the current container format to the format identified by the given \a mimeType. - \since 1.0 */ /*! \fn QMediaContainerControl::containerDescription(const QString &mimeType) const Returns a description of the container format identified by the given \a mimeType. - \since 1.0 */ #include "moc_qmediacontainercontrol.cpp" diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp index 84363e00c..ec0ed76ff 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.cpp @@ -46,7 +46,6 @@ \class QMediaGaplessPlaybackControl \inmodule QtMultimedia \ingroup multimedia - \since 5.0 \brief The QMediaGaplessPlaybackControl class provides access to the gapless playback related control of a QMediaService. @@ -93,14 +92,12 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): \fn QMediaGaplessPlaybackControl::nextMedia() const Returns the content of the next media - \since 1.0 */ /*! \fn QMediaGaplessPlaybackControl::setNextMedia(const QMediaContent& media) Sets the next media for smooth transition. - \since 1.0 */ /*! @@ -109,7 +106,6 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): Signals that the next media has changed (either explicitly via \l setNextMedia() or when the player clears the next media while advancing to it). - \since 1.0 \sa nextMedia() */ @@ -118,7 +114,6 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): Signals when the player advances to the next media (the content of next media will be cleared). - \since 1.0 \sa nextMedia() */ @@ -129,7 +124,6 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): If crossfading is not supported, \l setCrossfadTime() will be ignored and \l crossfadeTime() will always return 0. - \since 1.0 */ /*! @@ -144,14 +138,12 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): A crossfade time of zero or negative will result in gapless playback (suitable for some continuous media). - \since 1.0 */ /*! \fn QMediaGaplessPlaybackControl::crossfadeTime() const Returns current crossfade time in seconds. - \since 1.0 */ /*! @@ -159,7 +151,6 @@ QMediaGaplessPlaybackControl::QMediaGaplessPlaybackControl(QObject *parent): Signals that the crossfade time has changed. - \since 1.0 \sa crossfadeTime() */ diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp index 403110ed1..f592fb3a4 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \brief The QMediaNetworkAccessControl class allows the setting of the Network Access Point for media related activities. \ingroup multimedia-serv \inmodule QtMultimedia - \since 1.2 The functionality provided by this control allows the setting of a Network Access Point. @@ -79,7 +78,6 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl() It is assumed the list is given in highest to lowest preference order. By calling this function all previous configurations will be invalidated and replaced with the new list. - \since 1.2 */ /* @@ -94,7 +92,6 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl() \fn QMediaNetworkAccessControl::configurationChanged(const QNetworkConfiguration &configuration) This signal is emitted when the current active network configuration changes to \a configuration. - \since 1.2 */ diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index 6d3918793..7035c3063 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE \class QMediaPlayerControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMediaPlayerControl class provides access to the media playing @@ -102,7 +101,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::state() const Returns the state of a player control. - \since 1.0 */ /*! @@ -110,7 +108,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that the \a state of a player control has changed. - \since 1.0 \sa state() */ @@ -118,7 +115,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::mediaStatus() const Returns the status of the current media. - \since 1.0 */ /*! @@ -126,7 +122,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that the \a status of the current media has changed. - \since 1.0 \sa mediaStatus() */ @@ -135,7 +130,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::duration() const Returns the duration of the current media in milliseconds. - \since 1.0 */ /*! @@ -143,7 +137,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that the \a duration of the current media has changed. - \since 1.0 \sa duration() */ @@ -151,7 +144,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::position() const Returns the current playback position in milliseconds. - \since 1.0 */ /*! @@ -159,7 +151,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Sets the playback \a position of the current media. This will initiate a seek and it may take some time for playback to reach the position set. - \since 1.0 */ /*! @@ -170,7 +161,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): This is only emitted in when there has been a discontinous change in the playback postion, such as a seek or the position being reset. - \since 1.0 \sa position() */ @@ -178,14 +168,12 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::volume() const Returns the audio volume of a player control. - \since 1.0 */ /*! \fn QMediaPlayerControl::setVolume(int volume) Sets the audio \a volume of a player control. - \since 1.0 */ /*! @@ -193,7 +181,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals the audio \a volume of a player control has changed. - \since 1.0 \sa volume() */ @@ -201,14 +188,12 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn QMediaPlayerControl::isMuted() const Returns the mute state of a player control. - \since 1.0 */ /*! \fn QMediaPlayerControl::setMuted(bool mute) Sets the \a mute state of a player control. - \since 1.0 */ /*! @@ -216,7 +201,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals a change in the \a mute status of a player control. - \since 1.0 \sa isMuted() */ @@ -225,7 +209,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Returns the buffering progress of the current media. Progress is measured in the percentage of the buffer filled. - \since 1.0 */ /*! @@ -233,7 +216,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that buffering \a progress has changed. - \since 1.0 \sa bufferStatus() */ @@ -243,7 +225,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Identifies if there is audio output available for the current media. Returns true if audio output is available and false otherwise. - \since 1.0 */ /*! @@ -251,7 +232,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that there has been a change in the availability of \a audio output. - \since 1.0 \sa isAudioAvailable() */ @@ -261,7 +241,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Identifies if there is video output available for the current media. Returns true if video output is available and false otherwise. - \since 1.0 */ /*! @@ -269,7 +248,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that there has been a change in the availability of \a video output. - \since 1.0 \sa isVideoAvailable() */ @@ -279,7 +257,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Identifies if the current media is seekable. Returns true if it possible to seek within the current media, and false otherwise. - \since 1.0 */ /*! @@ -287,7 +264,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that the \a seekable state of a player control has changed. - \since 1.0 \sa isSeekable() */ @@ -299,7 +275,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Usually for local files this is a continuous interval equal to [0..duration()] or an empty time range if seeking is not supported, but for network sources it refers to the buffered parts of the media. - \since 1.0 */ /*! @@ -307,7 +282,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signals that the available media playback \a ranges have changed. - \since 1.0 \sa QMediaPlayerControl::availablePlaybackRanges() */ @@ -315,21 +289,18 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): \fn qreal QMediaPlayerControl::playbackRate() const Returns the rate of playback. - \since 1.0 */ /*! \fn QMediaPlayerControl::setPlaybackRate(qreal rate) Sets the \a rate of playback. - \since 1.0 */ /*! \fn QMediaPlayerControl::media() const Returns the current media source. - \since 1.0 */ /*! @@ -337,7 +308,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Returns the current media stream. This is only a valid if a stream was passed to setMedia(). - \since 1.0 \sa setMedia() */ @@ -351,14 +321,12 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Setting the media to a null QMediaContent will cause the control to discard all information relating to the current media source and to cease all I/O operations related to that media. - \since 1.0 */ /*! \fn QMediaPlayerControl::mediaChanged(const QMediaContent& content) Signals that the current media \a content has changed. - \since 1.0 */ /*! @@ -369,7 +337,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): If successful the player control will immediately enter the \l {QMediaPlayer::PlayingState} {playing} state. - \since 1.0 \sa state() */ @@ -381,7 +348,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): If sucessful the player control will immediately enter the \l {QMediaPlayer::PausedState} {paused} state. - \since 1.0 \sa state(), play(), stop() */ @@ -392,21 +358,18 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): If successful the player control will immediately enter the \l {QMediaPlayer::StoppedState} {stopped} state. - \since 1.0 */ /*! \fn QMediaPlayerControl::error(int error, const QString &errorString) Signals that an \a error has occurred. The \a errorString provides a more detailed explanation. - \since 1.0 */ /*! \fn QMediaPlayerControl::playbackRateChanged(qreal rate) Signal emitted when playback rate changes to \a rate. - \since 1.0 */ #include "moc_qmediaplayercontrol.cpp" diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp index 8c4bfd111..a024045c8 100644 --- a/src/multimedia/controls/qmediaplaylistcontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QMediaPlaylistControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMediaPlaylistControl class provides access to the playlist @@ -100,7 +99,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() \fn QMediaPlaylistControl::playlistProvider() const Returns the playlist used by this media player. - \since 1.0 */ /*! @@ -114,21 +112,18 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Returns true if player can use this passed playlist; otherwise returns false. - \since 1.0 */ /*! \fn QMediaPlaylistControl::currentIndex() const Returns position of the current media source in the playlist. - \since 1.0 */ /*! \fn QMediaPlaylistControl::setCurrentIndex(int position) Jump to the item at the given \a position. - \since 1.0 */ /*! @@ -140,7 +135,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Returned value depends on the size of playlist, current position and playback mode. - \since 1.0 \sa QMediaPlaylist::playbackMode */ @@ -150,7 +144,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Returns the index of item, which were current after calling previous() \a step times. - \since 1.0 \sa QMediaPlaylist::playbackMode */ @@ -158,14 +151,12 @@ QMediaPlaylistControl::~QMediaPlaylistControl() \fn QMediaPlaylistControl::next() Moves to the next item in playlist. - \since 1.0 */ /*! \fn QMediaPlaylistControl::previous() Returns to the previous item in playlist. - \since 1.0 */ /*! @@ -173,7 +164,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Returns the playlist navigation mode. - \since 1.0 \sa QMediaPlaylist::PlaybackMode */ @@ -182,7 +172,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Sets the playback \a mode. - \since 1.0 \sa QMediaPlaylist::PlaybackMode */ @@ -190,28 +179,24 @@ QMediaPlaylistControl::~QMediaPlaylistControl() \fn QMediaPlaylistControl::playlistProviderChanged() Signal emitted when the playlist provider has changed. - \since 1.0 */ /*! \fn QMediaPlaylistControl::currentIndexChanged(int position) Signal emitted when the playlist \a position is changed. - \since 1.0 */ /*! \fn QMediaPlaylistControl::playbackModeChanged(QMediaPlaylist::PlaybackMode mode) Signal emitted when the playback \a mode is changed. - \since 1.0 */ /*! \fn QMediaPlaylistControl::currentMediaChanged(const QMediaContent& content) Signal emitted when current media changes to \a content. - \since 1.0 */ #include "moc_qmediaplaylistcontrol.cpp" diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp index 091e5cf45..b91ce33d3 100644 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QMediaPlaylistSourceControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMediaPlaylistSourceControl class provides access to the playlist playback @@ -102,7 +101,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() Returns the current playlist. Should return a null pointer if no playlist is assigned. - \since 1.0 */ /*! @@ -112,7 +110,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() If a null pointer is passed, the playlist source should be disabled. The current media should be replaced with the current item of the media playlist. - \since 1.0 */ @@ -120,7 +117,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() \fn QMediaPlaylistSourceControl::playlistChanged(QMediaPlaylist* playlist) Signal emitted when the playlist has changed to \a playlist. - \since 1.0 */ #include "moc_qmediaplaylistsourcecontrol.cpp" diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 4a7df9065..cccc6c5e2 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE \class QMediaRecorderControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMediaRecorderControl class provides access to the recording @@ -101,7 +100,6 @@ QMediaRecorderControl::~QMediaRecorderControl() \fn QUrl QMediaRecorderControl::outputLocation() const Returns the current output location being used. - \since 1.0 */ /*! @@ -113,42 +111,36 @@ QMediaRecorderControl::~QMediaRecorderControl() The \a location can be relative or empty; in this case the service should use the system specific place and file naming scheme. After recording has stated, QMediaRecorderControl::outputLocation() should return the actual output location. - \since 1.0 */ /*! \fn int QMediaRecorderControl::state() const Return the current recording state. - \since 1.0 */ /*! \fn qint64 QMediaRecorderControl::duration() const Return the current duration in milliseconds. - \since 1.0 */ /*! \fn void QMediaRecorderControl::record() Start recording. - \since 1.0 */ /*! \fn void QMediaRecorderControl::pause() Pause recording. - \since 1.0 */ /*! \fn void QMediaRecorderControl::stop() Stop recording. - \since 1.0 */ /*! @@ -156,21 +148,18 @@ QMediaRecorderControl::~QMediaRecorderControl() Commits the encoder settings and performs pre-initialization to reduce delays when recording is started. - \since 1.0 */ /*! \fn bool QMediaRecorderControl::isMuted() const Returns true if the recorder is muted, and false if it is not. - \since 1.0 */ /*! \fn void QMediaRecorderControl::setMuted(bool muted) Sets the \a muted state of a media recorder. - \since 1.0 */ @@ -178,7 +167,6 @@ QMediaRecorderControl::~QMediaRecorderControl() \fn void QMediaRecorderControl::stateChanged(QMediaRecorder::State state) Signals that the \a state of a media recorder has changed. - \since 1.0 */ /*! @@ -187,21 +175,18 @@ QMediaRecorderControl::~QMediaRecorderControl() Signals that the \a duration of the recorded media has changed. This only emitted when there is a discontinuous change in the duration such as being reset to 0. - \since 1.0 */ /*! \fn void QMediaRecorderControl::mutedChanged(bool muted) Signals that the \a muted state of a media recorder has changed. - \since 1.0 */ /*! \fn void QMediaRecorderControl::error(int error, const QString &errorString) Signals that an \a error has occurred. The \a errorString describes the error. - \since 1.0 */ #include "moc_qmediarecordercontrol.cpp" diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index b5e140f9b..056ad7c80 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -64,7 +64,6 @@ namespace \ingroup multimedia-serv \brief The QMediaStreamsControl class provides a media stream selection control. - \since 1.0 The QMediaStreamsControl class provides descriptions of the available media streams and allows individual streams to be activated and deactivated. @@ -83,7 +82,6 @@ namespace Defines the interface name of the QMediaStreamsControl class. \relates QMediaStreamsControl - \since 1.0 */ /*! @@ -117,14 +115,12 @@ QMediaStreamsControl::~QMediaStreamsControl() \fn QMediaStreamsControl::streamCount() Returns the number of media streams. - \since 1.0 */ /*! \fn QMediaStreamsControl::streamType(int stream) Return the type of a media \a stream. - \since 1.0 */ /*! @@ -133,14 +129,12 @@ QMediaStreamsControl::~QMediaStreamsControl() Returns the meta-data value of \a key for a given \a stream. Useful metadata keya are QtMultimedia::Title, QtMultimedia::Description and QtMultimedia::Language. - \since 1.0 */ /*! \fn QMediaStreamsControl::isActive(int stream) Returns true if the media \a stream is active. - \since 1.0 */ /*! @@ -151,21 +145,18 @@ QMediaStreamsControl::~QMediaStreamsControl() Setting the active state of a media stream to true will activate it. If any other stream of the same type was previously active it will be deactivated. Setting the active state fo a media stream to false will deactivate it. - \since 1.0 */ /*! \fn QMediaStreamsControl::streamsChanged() The signal is emitted when the available streams list is changed. - \since 1.0 */ /*! \fn QMediaStreamsControl::activeStreamsChanged() The signal is emitted when the active streams list is changed. - \since 1.0 */ #include "moc_qmediastreamscontrol.cpp" diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 3b12a4316..f122a2d2f 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QMetaDataReaderControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMetaDataReaderControl class provides read access to the @@ -108,21 +107,18 @@ QMetaDataReaderControl::~QMetaDataReaderControl() Identifies if meta-data is available from a media service. Returns true if the meta-data is available and false otherwise. - \since 1.0 */ /*! \fn QVariant QMetaDataReaderControl::metaData(QtMultimedia::MetaData key) const Returns the meta-data for the given \a key. - \since 1.0 */ /*! \fn QMetaDataReaderControl::availableMetaData() const Returns a list of keys there is meta-data available for. - \since 1.0 */ /*! @@ -132,14 +128,12 @@ QMetaDataReaderControl::~QMetaDataReaderControl() The valid selection of keys for extended meta-data is determined by the provider and the meaning and type may differ between providers. - \since 1.0 */ /*! \fn QMetaDataReaderControl::availableExtendedMetaData() const Returns a list of keys there is extended meta-data available for. - \since 1.0 */ @@ -147,7 +141,6 @@ QMetaDataReaderControl::~QMetaDataReaderControl() \fn void QMetaDataReaderControl::metaDataChanged() Signal the changes of meta-data. - \since 1.0 */ /*! @@ -155,7 +148,6 @@ QMetaDataReaderControl::~QMetaDataReaderControl() Signal the availability of meta-data has changed, \a available will be true if the multimedia object has meta-data. - \since 1.0 */ #include "moc_qmetadatareadercontrol.cpp" diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index ca92e67a8..c7dcb5c70 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \class QMetaDataWriterControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QMetaDataWriterControl class provides write access to the @@ -107,7 +106,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() Identifies if meta-data is available from a media service. Returns true if the meta-data is available and false otherwise. - \since 1.0 */ /*! @@ -116,21 +114,18 @@ QMetaDataWriterControl::~QMetaDataWriterControl() Identifies if a media service's meta-data can be edited. Returns true if the meta-data is writable and false otherwise. - \since 1.0 */ /*! \fn QVariant QMetaDataWriterControl::metaData(QtMultimedia::MetaData key) const Returns the meta-data for the given \a key. - \since 1.0 */ /*! \fn void QMetaDataWriterControl::setMetaData(QtMultimedia::MetaData key, const QVariant &value) Sets the \a value of the meta-data element with the given \a key. - \since 1.0 */ /*! @@ -146,7 +141,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() The valid selection of keys for extended meta-data is determined by the provider and the meaning and type may differ between providers. - \since 1.0 */ /*! @@ -156,14 +150,12 @@ QMetaDataWriterControl::~QMetaDataWriterControl() The valid selection of keys for extended meta-data is determined by the provider and the meaning and type may differ between providers. - \since 1.0 */ /*! \fn QMetaDataWriterControl::availableExtendedMetaData() const Returns a list of keys there is extended meta-data available for. - \since 1.0 */ @@ -171,7 +163,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() \fn void QMetaDataWriterControl::metaDataChanged() Signal the changes of meta-data. - \since 1.0 */ /*! @@ -179,7 +170,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() Signal the availability of meta-data has changed, \a available will be true if the multimedia object has meta-data. - \since 1.0 */ /*! @@ -187,7 +177,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() Signal a change in the writable status of meta-data, \a writable will be true if meta-data elements can be added or adjusted. - \since 1.0 */ #include "moc_qmetadatawritercontrol.cpp" diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp index 72ca587b9..38a26d4dc 100644 --- a/src/multimedia/controls/qradiodatacontrol.cpp +++ b/src/multimedia/controls/qradiodatacontrol.cpp @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE \class QRadioDataControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 5.0 \brief The QRadioDataControl class provides access to the RDS functionality of the @@ -96,119 +95,102 @@ QRadioDataControl::~QRadioDataControl() \fn bool QRadioDataControl::isAvailable() const Returns true if the radio service is ready to use. - \since 5.0 */ /*! \fn QtMultimedia::AvailabilityError QRadioDataControl::availabilityError() const Returns the error state of the radio service. - \since 5.0 */ /*! \fn QRadioData::Error QRadioDataControl::error() const Returns the error state of a radio data. - \since 5.0 */ /*! \fn QString QRadioDataControl::errorString() const Returns a string describing a radio data's error state. - \since 5.0 */ /*! \fn void QRadioDataControl::error(QRadioData::Error error) Signals that an \a error has occurred. - \since 5.0 */ /*! \fn int QRadioDataControl::stationId() Returns the current Program Identification - \since 5.0 */ /*! \fn QRadioData::ProgramType QRadioDataControl::programType() Returns the current Program Type - \since 5.0 */ /*! \fn QString QRadioDataControl::programTypeName() Returns the current Program Type Name - \since 5.0 */ /*! \fn QString QRadioDataControl::stationName() Returns the current Program Service - \since 5.0 */ /*! \fn QString QRadioDataControl::radioText() Returns the current Radio Text - \since 5.0 */ /*! \fn void QRadioDataControl::setAlternativeFrequenciesEnabled(bool enabled) Sets the Alternative Frequency to \a enabled - \since 5.0 */ /*! \fn bool QRadioDataControl::isAlternativeFrequenciesEnabled() Returns true if Alternative Frequency is currently enabled - \since 5.0 */ /*! \fn void QRadioDataControl::stationIdChanged(QString stationId) Signals that the Program Identification \a stationId has changed - \since 5.0 */ /*! \fn void QRadioDataControl::programTypeChanged(QRadioData::ProgramType programType) Signals that the Program Type \a programType has changed - \since 5.0 */ /*! \fn void QRadioDataControl::programTypeNameChanged(QString programTypeName) Signals that the Program Type Name \a programTypeName has changed - \since 5.0 */ /*! \fn void QRadioDataControl::stationNameChanged(QString stationName) Signals that the Program Service \a stationName has changed - \since 5.0 */ /*! \fn void QRadioDataControl::radioTextChanged(QString radioText) Signals that the Radio Text \a radioText has changed - \since 5.0 */ #include "moc_qradiodatacontrol.cpp" diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp index 9b16d4919..fba568910 100644 --- a/src/multimedia/controls/qradiotunercontrol.cpp +++ b/src/multimedia/controls/qradiotunercontrol.cpp @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE \class QRadioTunerControl \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QRadioTunerControl class provides access to the radio tuning @@ -102,35 +101,30 @@ QRadioTunerControl::~QRadioTunerControl() \fn bool QRadioTunerControl::isAvailable() const Returns true if the radio service is ready to use. - \since 1.0 */ /*! \fn QtMultimedia::AvailabilityError QRadioTunerControl::availabilityError() const Returns the error state of the radio service. - \since 1.0 */ /*! \fn QRadioTuner::State QRadioTunerControl::state() const Returns the current radio tuner state. - \since 1.0 */ /*! \fn QRadioTuner::Band QRadioTunerControl::band() const Returns the frequency band a radio tuner is tuned to. - \since 1.0 */ /*! \fn void QRadioTunerControl::bandChanged(QRadioTuner::Band band) Signals that the frequency \a band a radio tuner is tuned to has changed. - \since 1.0 */ /*! @@ -139,7 +133,6 @@ QRadioTunerControl::~QRadioTunerControl() Sets the frequecy \a band a radio tuner is tuned to. Changing the frequency band will reset the frequency to the minimum frequency of the new band. - \since 1.0 */ /*! @@ -148,14 +141,12 @@ QRadioTunerControl::~QRadioTunerControl() Identifies if a frequency \a band is supported. Returns true if the band is supported, and false if it is not. - \since 1.0 */ /*! \fn int QRadioTunerControl::frequency() const Returns the frequency a radio tuner is tuned to. - \since 1.0 */ /*! @@ -163,21 +154,18 @@ QRadioTunerControl::~QRadioTunerControl() Returns the number of Hertz to increment the frequency by when stepping through frequencies within a given \a band. - \since 1.0 */ /*! \fn QPair<int,int> QRadioTunerControl::frequencyRange(QRadioTuner::Band band) const Returns a frequency \a band's minimum and maximum frequency. - \since 1.0 */ /*! \fn void QRadioTunerControl::setFrequency(int frequency) Sets the \a frequency a radio tuner is tuned to. - \since 1.0 */ /*! @@ -186,7 +174,6 @@ QRadioTunerControl::~QRadioTunerControl() Identifies if a radio tuner is receiving a stereo signal. Returns true if the tuner is receiving a stereo signal, and false if it is not. - \since 1.0 */ /*! @@ -194,7 +181,6 @@ QRadioTunerControl::~QRadioTunerControl() Returns a radio tuner's stereo mode. - \since 1.0 \sa QRadioTuner::StereoMode */ @@ -203,7 +189,6 @@ QRadioTunerControl::~QRadioTunerControl() Sets a radio tuner's stereo \a mode. - \since 1.0 \sa QRadioTuner::StereoMode */ @@ -211,21 +196,18 @@ QRadioTunerControl::~QRadioTunerControl() \fn int QRadioTunerControl::signalStrength() const Return a radio tuner's current signal strength as a percentage. - \since 1.0 */ /*! \fn int QRadioTunerControl::volume() const Returns the volume of a radio tuner's audio output as a percentage. - \since 1.0 */ /*! \fn void QRadioTunerControl::setVolume(int volume) Sets the percentage \a volume of a radio tuner's audio output. - \since 1.0 */ /*! @@ -234,14 +216,12 @@ QRadioTunerControl::~QRadioTunerControl() Identifies if a radio tuner's audio output is muted. Returns true if the audio is muted, and false if it is not. - \since 1.0 */ /*! \fn void QRadioTunerControl::setMuted(bool muted) Sets the \a muted state of a radio tuner's audio output. - \since 1.0 */ /*! @@ -250,70 +230,60 @@ QRadioTunerControl::~QRadioTunerControl() Identifies if a radio tuner is currently scanning for signal. Returns true if the tuner is scanning, and false if it is not. - \since 1.0 */ /*! \fn void QRadioTunerControl::searchForward() Starts a forward scan for a signal, starting from the current \l frequency(). - \since 1.0 */ /*! \fn void QRadioTunerControl::searchBackward() Starts a backwards scan for a signal, starting from the current \l frequency(). - \since 1.0 */ /*! \fn void QRadioTunerControl::searchAllStations() Starts a scan through the whole frequency band searching all stations - \since 5.0 */ /*! \fn void QRadioTunerControl::cancelSearch() Stops scanning for a signal. - \since 1.0 */ /*! \fn void QRadioTunerControl::start() Activate the radio device. - \since 1.0 */ /*! \fn QRadioTunerControl::stop() Deactivate the radio device. - \since 1.0 */ /*! \fn QRadioTuner::Error QRadioTunerControl::error() const Returns the error state of a radio tuner. - \since 1.0 */ /*! \fn QString QRadioTunerControl::errorString() const Returns a string describing a radio tuner's error state. - \since 1.0 */ /*! \fn void QRadioTunerControl::stateChanged(QRadioTuner::State state) Signals that the \a state of a radio tuner has changed. - \since 1.0 */ @@ -321,56 +291,48 @@ QRadioTunerControl::~QRadioTunerControl() \fn void QRadioTunerControl::frequencyChanged(int frequency) Signals that the \a frequency a radio tuner is tuned to has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::stereoStatusChanged(bool stereo) Signals that the \a stereo state of a radio tuner has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::searchingChanged(bool searching) Signals that the \a searching state of a radio tuner has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::signalStrengthChanged(int strength) Signals that the percentage \a strength of the signal received by a radio tuner has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::volumeChanged(int volume) Signals that the percentage \a volume of radio tuner's audio output has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::mutedChanged(bool muted) Signals that the \a muted state of a radio tuner's audio output has changed. - \since 1.0 */ /*! \fn void QRadioTunerControl::error(QRadioTuner::Error error) Signals that an \a error has occurred. - \since 1.0 */ /*! \fn void QRadioTunerControl::stationFound(int frequency) Signals that new station with \a frequency was found when scanning - \since 5.0 */ #include "moc_qradiotunercontrol.cpp" diff --git a/src/multimedia/controls/qvideodevicecontrol.cpp b/src/multimedia/controls/qvideodevicecontrol.cpp index c2efca341..4d79de5f2 100644 --- a/src/multimedia/controls/qvideodevicecontrol.cpp +++ b/src/multimedia/controls/qvideodevicecontrol.cpp @@ -49,7 +49,6 @@ QT_BEGIN_NAMESPACE \brief The QVideoDeviceControl class provides an video device selector media control. \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 The QVideoDeviceControl class provides descriptions of the video devices available on a system and allows one to be selected as the endpoint of a @@ -88,63 +87,54 @@ QVideoDeviceControl::~QVideoDeviceControl() \fn QVideoDeviceControl::deviceCount() const Returns the number of available video devices; - \since 1.0 */ /*! \fn QVideoDeviceControl::deviceName(int index) const Returns the name of the video device at \a index. - \since 1.0 */ /*! \fn QVideoDeviceControl::deviceDescription(int index) const Returns a description of the video device at \a index. - \since 1.0 */ /*! \fn QVideoDeviceControl::defaultDevice() const Returns the index of the default video device. - \since 1.0 */ /*! \fn QVideoDeviceControl::selectedDevice() const Returns the index of the selected video device. - \since 1.0 */ /*! \fn QVideoDeviceControl::setSelectedDevice(int index) Sets the selected video device \a index. - \since 1.0 */ /*! \fn QVideoDeviceControl::devicesChanged() Signals that the list of available video devices has changed. - \since 1.0 */ /*! \fn QVideoDeviceControl::selectedDeviceChanged(int index) Signals that the selected video device \a index has changed. - \since 1.0 */ /*! \fn QVideoDeviceControl::selectedDeviceChanged(const QString &name) Signals that the selected video device \a name has changed. - \since 1.0 */ #include "moc_qvideodevicecontrol.cpp" diff --git a/src/multimedia/controls/qvideoencodercontrol.cpp b/src/multimedia/controls/qvideoencodercontrol.cpp index 6a693c569..da806e246 100644 --- a/src/multimedia/controls/qvideoencodercontrol.cpp +++ b/src/multimedia/controls/qvideoencodercontrol.cpp @@ -50,7 +50,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 \brief The QVideoEncoderControl class provides access to the settings of a media service that performs video encoding. @@ -98,14 +97,12 @@ QVideoEncoderControl::~QVideoEncoderControl() \fn QVideoEncoderControl::supportedVideoCodecs() const Returns the list of supported video codecs. - \since 1.0 */ /*! \fn QVideoEncoderControl::videoCodecDescription(const QString &codec) const Returns a description of a video \a codec. - \since 1.0 */ /*! @@ -114,21 +111,18 @@ QVideoEncoderControl::~QVideoEncoderControl() Returns a list of supported encoding options for a video \a codec. The names and types of the options in the list is system dependent. - \since 1.0 */ /*! \fn QVideoEncoderControl::encodingOption(const QString &codec, const QString &option) const Returns the value of a video \a codec \a option. - \since 1.0 */ /*! \fn QVideoEncoderControl::setEncodingOption(const QString &codec, const QString &option, const QVariant &value) Sets the \a value of a \a codec specific \a option. - \since 1.0 */ /*! @@ -145,7 +139,6 @@ QVideoEncoderControl::~QVideoEncoderControl() If the encoder supports arbitrary resolutions within the supported resolutions range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.0 \sa QVideoEncoderSettings::resolution() */ @@ -163,7 +156,6 @@ QVideoEncoderControl::~QVideoEncoderControl() If the encoder supports arbitrary frame rates within the supported range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.0 \sa QVideoEncoderSettings::frameRate() */ @@ -175,14 +167,12 @@ QVideoEncoderControl::~QVideoEncoderControl() The returned value may be different tha passed to QVideoEncoderControl::setVideoSettings() if the settings contains the default or undefined parameters. In this case if the undefined parameters are already resolved, they should be returned. - \since 1.0 */ /*! \fn QVideoEncoderControl::setVideoSettings(const QVideoEncoderSettings &settings) Sets the selected video encoder \a settings. - \since 1.0 */ #include "moc_qvideoencodercontrol.cpp" diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index e49045c5d..dafc2add2 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup multimedia-serv - \since 1.0 Using the surface() property of QVideoRendererControl a QAbstractVideoSurface may be set as the video render target of a @@ -99,14 +98,12 @@ QVideoRendererControl::~QVideoRendererControl() \fn QVideoRendererControl::surface() const Returns the surface a video producer renders to. - \since 1.0 */ /*! \fn QVideoRendererControl::setSurface(QAbstractVideoSurface *surface) Sets the \a surface a video producer renders to. - \since 1.0 */ #include "moc_qvideorenderercontrol.cpp" |