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/camera | |
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/camera')
-rw-r--r-- | src/multimedia/camera/qcamera.cpp | 39 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraexposure.cpp | 31 | ||||
-rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 19 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 31 | ||||
-rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 17 |
5 files changed, 0 insertions, 137 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 89ab537cb..97c105ab4 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -82,7 +82,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup camera - \since 1.1 QCamera can be used with QVideoWidget for viewfinder display, QMediaRecorder for video recording and QCameraImageCapture for image taking. @@ -407,7 +406,6 @@ QCamera::~QCamera() /*! Return true if the camera service is ready to use. - \since 1.1 */ bool QCamera::isAvailable() const { @@ -416,7 +414,6 @@ bool QCamera::isAvailable() const /*! Returns the error state of the camera service. - \since 1.1 */ QtMultimedia::AvailabilityError QCamera::availabilityError() const @@ -437,7 +434,6 @@ QtMultimedia::AvailabilityError QCamera::availabilityError() const /*! Returns the camera exposure control object. - \since 1.1 */ QCameraExposure *QCamera::exposure() const { @@ -446,7 +442,6 @@ QCameraExposure *QCamera::exposure() const /*! Returns the camera focus control object. - \since 1.1 */ QCameraFocus *QCamera::focus() const { @@ -455,7 +450,6 @@ QCameraFocus *QCamera::focus() const /*! Returns the camera image processing control object. - \since 1.1 */ QCameraImageProcessing *QCamera::imageProcessing() const { @@ -465,7 +459,6 @@ QCameraImageProcessing *QCamera::imageProcessing() const /*! Sets the QVideoWidget based camera \a viewfinder. The previously set viewfinder is detached. - \since 1.1 */ // QVideoWidget is forward declared @@ -486,7 +479,6 @@ void QCamera::setViewfinder(QVideoWidget *viewfinder) /*! Sets the QGraphicsVideoItem based camera \a viewfinder. The previously set viewfinder is detached. - \since 1.1 */ // QGraphicsVideoItem is forward declared void QCamera::setViewfinder(QGraphicsVideoItem *viewfinder) @@ -509,7 +501,6 @@ void QCamera::setViewfinder(QGraphicsVideoItem *viewfinder) If a viewfinder has already been set on the camera the new surface will replace it. - \since 1.2 */ void QCamera::setViewfinder(QAbstractVideoSurface *surface) @@ -528,7 +519,6 @@ void QCamera::setViewfinder(QAbstractVideoSurface *surface) /*! Returns the error state of the object. - \since 1.1 */ QCamera::Error QCamera::error() const @@ -538,7 +528,6 @@ QCamera::Error QCamera::error() const /*! Returns a string describing a camera's error state. - \since 1.1 */ QString QCamera::errorString() const { @@ -548,7 +537,6 @@ QString QCamera::errorString() const /*! Returns true if the capture \a mode is suported. - \since 1.1 */ bool QCamera::isCaptureModeSupported(QCamera::CaptureMode mode) const { @@ -566,7 +554,6 @@ bool QCamera::isCaptureModeSupported(QCamera::CaptureMode mode) const chaging capture mode is likely to lead to camera status chaged to QCamera::LoadedStatus, QCamera::LoadingStatus, and when the camera is ready to QCamera::ActiveStatus. - \since 1.1 */ QCamera::CaptureMode QCamera::captureMode() const @@ -596,7 +583,6 @@ void QCamera::setCaptureMode(QCamera::CaptureMode mode) While the camera state is changed to QCamera::ActiveState, starting the camera service can be asynchronous with the actual status reported with QCamera::status property. - \since 1.1 */ void QCamera::start() { @@ -607,7 +593,6 @@ void QCamera::start() /*! Stops the camera. The camera state is changed from QCamera::ActiveState to QCamera::LoadedState. - \since 1.1 */ void QCamera::stop() { @@ -625,7 +610,6 @@ void QCamera::stop() In all the other cases it's possible to start the camera directly from unloaded state. - \since 1.1 */ void QCamera::load() { @@ -636,7 +620,6 @@ void QCamera::load() /*! Close the camera device and deallocate the related resources. The camera state is changed to QCamera::UnloadedStatus. - \since 1.1 */ void QCamera::unload() { @@ -647,7 +630,6 @@ void QCamera::unload() /*! Returns a list of camera device's available from the default service provider. - \since 1.1 */ QList<QByteArray> QCamera::availableDevices() @@ -657,7 +639,6 @@ QList<QByteArray> QCamera::availableDevices() /*! Returns the description of the \a device. - \since 1.1 */ QString QCamera::deviceDescription(const QByteArray &device) @@ -681,7 +662,6 @@ QCamera::Status QCamera::status() const /*! Returns the lock types, camera supports. - \since 1.1 */ QCamera::LockTypes QCamera::supportedLocks() const { @@ -690,7 +670,6 @@ QCamera::LockTypes QCamera::supportedLocks() const /*! Returns the requested lock types. - \since 1.1 */ QCamera::LockTypes QCamera::requestedLocks() const { @@ -699,7 +678,6 @@ QCamera::LockTypes QCamera::requestedLocks() const /*! Returns the status of requested camera settings locks. - \since 1.1 */ QCamera::LockStatus QCamera::lockStatus() const { @@ -708,7 +686,6 @@ QCamera::LockStatus QCamera::lockStatus() const /*! Returns the status of camera settings \a lock. - \since 1.1 */ QCamera::LockStatus QCamera::lockStatus(QCamera::LockType lockType) const { @@ -750,7 +727,6 @@ QCamera::LockStatus QCamera::lockStatus(QCamera::LockType lockType) const It's also acceptable to relock already locked settings, depending on the lock parameter this initiates new focusing, exposure or white balance calculation. - \since 1.1 */ void QCamera::searchAndLock(QCamera::LockTypes locks) { @@ -774,7 +750,6 @@ void QCamera::searchAndLock(QCamera::LockTypes locks) /*! Lock all the supported camera settings. - \since 1.1 */ void QCamera::searchAndLock() { @@ -783,7 +758,6 @@ void QCamera::searchAndLock() /*! Unlocks the camera settings specified with \a locks or cancel the current locking if one is active. - \since 1.1 */ void QCamera::unlock(QCamera::LockTypes locks) { @@ -807,7 +781,6 @@ void QCamera::unlock(QCamera::LockTypes locks) /*! Unlock all the requested camera locks. - \since 1.1 */ void QCamera::unlock() { @@ -844,7 +817,6 @@ void QCamera::unlock() /*! \property QCamera::state \brief The current state of the camera object. - \since 1.1 */ /*! @@ -889,7 +861,6 @@ void QCamera::unlock() /*! \property QCamera::status \brief The current status of the camera object. - \since 1.1 */ @@ -897,7 +868,6 @@ void QCamera::unlock() \enum QCamera::CaptureMode \value CaptureStillImage Camera is configured for still frames capture. \value CaptureVideo Camera is configured for video capture. - \since 1.1 */ /*! @@ -916,34 +886,29 @@ void QCamera::unlock() /*! \property QCamera::lockStatus \brief The overall status for all the requested camera locks. - \since 1.1 */ /*! \fn void QCamera::locked() Signals all the requested camera settings are locked. - \since 1.1 */ /*! \fn void QCamera::lockFailed() Signals locking of at least one requested camera settings failed. - \since 1.1 */ /*! \fn QCamera::lockStatusChanged(QCamera::LockStatus status, QCamera::LockChangeReason reason) Signals the overall \a status for all the requested camera locks was changed with specified \a reason. - \since 1.1 */ /*! \fn QCamera::lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason) Signals the \a lock \a status was changed with specified \a reason. - \since 1.1 */ /*! @@ -1001,14 +966,12 @@ void QCamera::unlock() \fn void QCamera::error(QCamera::Error value) Signal emitted when error state changes to \a value. - \since 1.1 */ /*! \fn void QCamera::captureModeChanged(QCamera::CaptureMode mode) Signals the capture \a mode has changed. - \since 1.1 */ /*! @@ -1019,7 +982,6 @@ void QCamera::unlock() Usually the state changes is caused by calling load(), unload(), start() and stop(), but the state can also be changed change as a result of camera error. - \since 1.1 */ /*! @@ -1027,7 +989,6 @@ void QCamera::unlock() Signals the camera \a status has changed. - \since 1.1 */ QT_END_NAMESPACE diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp index d839f379e..7870aba27 100644 --- a/src/multimedia/camera/qcameraexposure.cpp +++ b/src/multimedia/camera/qcameraexposure.cpp @@ -59,7 +59,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup camera - \since 1.1 */ @@ -189,7 +188,6 @@ QCameraExposure::~QCameraExposure() /*! Returns true if exposure settings are supported by this camera. - \since 1.1 */ bool QCameraExposure::isAvailable() const { @@ -205,7 +203,6 @@ bool QCameraExposure::isAvailable() const but some non conflicting flags combination are also allowed, like QCameraExposure::FlashManual | QCameraExposure::FlashSlowSyncRearCurtain. - \since 1.1 \sa QCameraExposure::isFlashModeSupported(), QCameraExposure::isFlashReady() */ @@ -222,7 +219,6 @@ void QCameraExposure::setFlashMode(QCameraExposure::FlashModes mode) /*! Returns true if the flash \a mode is supported. - \since 1.1 */ bool QCameraExposure::isFlashModeSupported(QCameraExposure::FlashModes mode) const @@ -244,7 +240,6 @@ bool QCameraExposure::isFlashReady() const \property QCameraExposure::exposureMode \brief The exposure mode being used. - \since 1.1 \sa QCameraExposure::isExposureModeSupported() */ @@ -261,7 +256,6 @@ void QCameraExposure::setExposureMode(QCameraExposure::ExposureMode mode) /*! Returns true if the exposure \a mode is supported. - \since 1.1 */ bool QCameraExposure::isExposureModeSupported(QCameraExposure::ExposureMode mode) const @@ -275,7 +269,6 @@ bool QCameraExposure::isExposureModeSupported(QCameraExposure::ExposureMode mode \brief Exposure compensation in EV units. Exposure compensation property allows to adjust the automatically calculated exposure. - \since 1.1 */ qreal QCameraExposure::exposureCompensation() const @@ -296,7 +289,6 @@ void QCameraExposure::setExposureCompensation(qreal ev) \property QCameraExposure::meteringMode \brief The metering mode being used. - \since 1.1 \sa QCameraExposure::isMeteringModeSupported() */ @@ -323,7 +315,6 @@ void QCameraExposure::setMeteringMode(QCameraExposure::MeteringMode mode) which is typically the default spot metering point. The spot metering point is only used with spot metering mode. - \since 1.1 */ QPointF QCameraExposure::spotMeteringPoint() const @@ -340,7 +331,6 @@ void QCameraExposure::setSpotMeteringPoint(const QPointF &point) /*! Returns true if the metering \a mode is supported. - \since 1.1 */ bool QCameraExposure::isMeteringModeSupported(QCameraExposure::MeteringMode mode) const { @@ -360,7 +350,6 @@ int QCameraExposure::isoSensitivity() const If the camera supports arbitrary ISO sensitivities within the supported range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.1 */ QList<int> QCameraExposure::supportedIsoSensitivities(bool *continuous) const { @@ -390,7 +379,6 @@ QList<int> QCameraExposure::supportedIsoSensitivities(bool *continuous) const /*! \fn QCameraExposure::setManualIsoSensitivity(int iso) Sets the manual sensitivity to \a iso - \since 1.1 */ void QCameraExposure::setManualIsoSensitivity(int iso) @@ -402,7 +390,6 @@ void QCameraExposure::setManualIsoSensitivity(int iso) /*! \fn QCameraExposure::setAutoIsoSensitivity() Turn on auto sensitivity - \since 1.1 */ void QCameraExposure::setAutoIsoSensitivity() @@ -415,7 +402,6 @@ void QCameraExposure::setAutoIsoSensitivity() \property QCameraExposure::shutterSpeed \brief Camera's shutter speed in seconds. - \since 1.1 \sa supportedShutterSpeeds(), setAutoShutterSpeed(), setManualShutterSpeed() */ @@ -423,7 +409,6 @@ void QCameraExposure::setAutoIsoSensitivity() \fn QCameraExposure::shutterSpeedChanged(qreal speed) Signals that a camera's shutter \a speed has changed. - \since 1.1 */ /*! @@ -431,14 +416,12 @@ void QCameraExposure::setAutoIsoSensitivity() \brief The sensor ISO sensitivity. \sa supportedIsoSensitivities(), setAutoIsoSensitivity(), setManualIsoSensitivity() - \since 1.1 */ /*! \property QCameraExposure::aperture \brief Lens aperture is specified as an F number, the ratio of the focal length to effective aperture diameter. - \since 1.1 \sa supportedApertures(), setAutoAperture(), setManualAperture() */ @@ -458,7 +441,6 @@ qreal QCameraExposure::aperture() const If the camera supports arbitrary aperture values within the supported range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.1 */ QList<qreal> QCameraExposure::supportedApertures(bool * continuous) const { @@ -488,7 +470,6 @@ QList<qreal> QCameraExposure::supportedApertures(bool * continuous) const /*! \fn QCameraExposure::setManualAperture(qreal aperture) Sets the manual camera \a aperture value. - \since 1.1 */ void QCameraExposure::setManualAperture(qreal aperture) @@ -500,7 +481,6 @@ void QCameraExposure::setManualAperture(qreal aperture) /*! \fn QCameraExposure::setAutoAperture() Turn on auto aperture - \since 1.1 */ void QCameraExposure::setAutoAperture() @@ -511,7 +491,6 @@ void QCameraExposure::setAutoAperture() /*! Returns the current shutter speed in seconds. - \since 1.1 */ qreal QCameraExposure::shutterSpeed() const @@ -527,7 +506,6 @@ qreal QCameraExposure::shutterSpeed() const If the camera supports arbitrary shutter speed values within the supported range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.1 */ QList<qreal> QCameraExposure::supportedShutterSpeeds(bool *continuous) const { @@ -556,7 +534,6 @@ QList<qreal> QCameraExposure::supportedShutterSpeeds(bool *continuous) const /*! Set the manual shutter speed to \a seconds - \since 1.1 */ void QCameraExposure::setManualShutterSpeed(qreal seconds) @@ -567,7 +544,6 @@ void QCameraExposure::setManualShutterSpeed(qreal seconds) /*! Turn on auto shutter speed - \since 1.1 */ void QCameraExposure::setAutoShutterSpeed() @@ -622,28 +598,24 @@ void QCameraExposure::setAutoShutterSpeed() /*! \property QCameraExposure::flashReady \brief Indicates if the flash is charged and ready to use. - \since 1.1 */ /*! \fn void QCameraExposure::flashReady(bool ready) Signal the flash \a ready status has changed. - \since 1.1 */ /*! \fn void QCameraExposure::apertureChanged(qreal value) Signal emitted when aperature changes to \a value. - \since 1.1 */ /*! \fn void QCameraExposure::apertureRangeChanged() Signal emitted when aperature range has changed. - \since 1.1 */ @@ -651,7 +623,6 @@ void QCameraExposure::setAutoShutterSpeed() \fn void QCameraExposure::shutterSpeedRangeChanged() Signal emitted when the shutter speed range has changed. - \since 1.1 */ @@ -659,14 +630,12 @@ void QCameraExposure::setAutoShutterSpeed() \fn void QCameraExposure::isoSensitivityChanged(int value) Signal emitted when sensitivity changes to \a value. - \since 1.1 */ /*! \fn void QCameraExposure::exposureCompensationChanged(qreal value) Signal emitted when the exposure compensation changes to \a value. - \since 1.1 */ #include "moc_qcameraexposure.cpp" diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 73c2bcc6d..3b7f3b042 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -111,7 +111,6 @@ public: \inmodule QtMultimedia \ingroup camera - \since 1.1 For cameras that support autofocusing, in order for a camera to autofocus on part of a sensor frame, it considers different zones within the frame. Which @@ -244,7 +243,6 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) \inmodule QtMultimedia \ingroup camera - \since 1.1 On hardware that supports it, this class lets you adjust the focus or zoom (both optical and digital). This also includes things @@ -348,7 +346,6 @@ QCameraFocus::~QCameraFocus() Returns true if focus related settings are supported by this camera. You may need to also check if any specific features are supported. - \since 1.1 */ bool QCameraFocus::isAvailable() const { @@ -359,7 +356,6 @@ bool QCameraFocus::isAvailable() const \property QCameraFocus::focusMode \brief The current camera focus mode. - \since 1.1 This controls the way the camera lens assembly is configured. @@ -379,7 +375,6 @@ void QCameraFocus::setFocusMode(QCameraFocus::FocusMode mode) /*! Returns true if the focus \a mode is supported by camera. - \since 1.1 */ bool QCameraFocus::isFocusModeSupported(QCameraFocus::FocusMode mode) const @@ -390,7 +385,6 @@ bool QCameraFocus::isFocusModeSupported(QCameraFocus::FocusMode mode) const /*! \property QCameraFocus::focusPointMode \brief The current camera focus point selection mode. - \since 1.1 If the camera focus mode is set to use an autofocusing mode, this property controls the way the camera will select areas @@ -416,7 +410,6 @@ void QCameraFocus::setFocusPointMode(QCameraFocus::FocusPointMode mode) /*! Returns true if focus point \a mode is supported. - \since 1.1 */ bool QCameraFocus::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const { @@ -433,7 +426,6 @@ bool QCameraFocus::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center. The custom focus point property is used only in \c FocusPointCustom focus mode. - \since 1.1 */ QPointF QCameraFocus::customFocusPoint() const @@ -462,7 +454,6 @@ void QCameraFocus::setCustomFocusPoint(const QPointF &point) The coordinates system is the same as for custom focus points: QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center. - \since 1.1 */ QCameraFocusZoneList QCameraFocus::focusZones() const { @@ -475,7 +466,6 @@ QCameraFocusZoneList QCameraFocus::focusZones() const Returns the maximum optical zoom. This will be \c 1.0 on cameras that do not support optical zoom. - \since 1.1 */ qreal QCameraFocus::maximumOpticalZoom() const @@ -487,7 +477,6 @@ qreal QCameraFocus::maximumOpticalZoom() const Returns the maximum digital zoom This will be \c 1.0 on cameras that do not support digital zoom. - \since 1.1 */ qreal QCameraFocus::maximumDigitalZoom() const @@ -499,7 +488,6 @@ qreal QCameraFocus::maximumDigitalZoom() const \property QCameraFocus::opticalZoom \brief The current optical zoom value. - \since 1.1 \sa QCameraFocus::digitalZoom */ @@ -512,7 +500,6 @@ qreal QCameraFocus::opticalZoom() const \property QCameraFocus::digitalZoom \brief The current digital zoom value. - \since 1.1 \sa QCameraFocus::opticalZoom */ qreal QCameraFocus::digitalZoom() const @@ -527,7 +514,6 @@ qreal QCameraFocus::digitalZoom() const Since there may be a physical component to move, the change in zoom value may not be instantaneous. - \since 1.1 */ void QCameraFocus::zoomTo(qreal optical, qreal digital) { @@ -563,21 +549,18 @@ void QCameraFocus::zoomTo(qreal optical, qreal digital) \fn void QCameraFocus::opticalZoomChanged(qreal value) Signal emitted when optical zoom value changes to new \a value. - \since 1.1 */ /*! \fn void QCameraFocus::digitalZoomChanged(qreal value) Signal emitted when digital zoom value changes to new \a value. - \since 1.1 */ /*! \fn void QCameraFocus::maximumOpticalZoomChanged(qreal zoom) Signal emitted when the maximum supported optical \a zoom value changed. - \since 1.1 */ /*! @@ -587,7 +570,6 @@ void QCameraFocus::zoomTo(qreal optical, qreal digital) The maximum supported zoom value can depend on other camera settings, like capture mode or resolution. - \since 1.1 */ @@ -599,7 +581,6 @@ void QCameraFocus::zoomTo(qreal optical, qreal digital) This can change when a zone is focused or loses focus, or new focus zones have been detected. - \since 1.1 */ diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 6cb350cce..b90d620a1 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE \class QCameraImageCapture \inmodule QtMultimedia \ingroup camera - \since 1.1 \brief The QCameraImageCapture class is used for the recording of media content. @@ -182,7 +181,6 @@ QCameraImageCapture::~QCameraImageCapture() /*! \reimp - \since 1.1 */ QMediaObject *QCameraImageCapture::mediaObject() const { @@ -191,7 +189,6 @@ QMediaObject *QCameraImageCapture::mediaObject() const /*! \reimp - \since 1.1 */ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) { @@ -299,7 +296,6 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject) /*! Returns true if the images capture service ready to use. - \since 1.1 */ bool QCameraImageCapture::isAvailable() const { @@ -311,7 +307,6 @@ bool QCameraImageCapture::isAvailable() const /*! Returns the availability error code. - \since 1.1 */ QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const { @@ -324,7 +319,6 @@ QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const /*! Returns the current error state. - \since 1.1 \sa errorString() */ @@ -336,7 +330,6 @@ QCameraImageCapture::Error QCameraImageCapture::error() const /*! Returns a string describing the current error state. - \since 1.1 \sa error() */ @@ -348,7 +341,6 @@ QString QCameraImageCapture::errorString() const /*! Returns a list of supported image codecs. - \since 1.1 */ QStringList QCameraImageCapture::supportedImageCodecs() const { @@ -358,7 +350,6 @@ QStringList QCameraImageCapture::supportedImageCodecs() const /*! Returns a description of an image \a codec. - \since 1.1 */ QString QCameraImageCapture::imageCodecDescription(const QString &codec) const { @@ -375,7 +366,6 @@ QString QCameraImageCapture::imageCodecDescription(const QString &codec) const If the encoder supports arbitrary resolutions within the supported range, *\a continuous is set to true, otherwise *\a continuous is set to false. - \since 1.1 \sa QImageEncoderSettings::resolution() */ QList<QSize> QCameraImageCapture::supportedResolutions(const QImageEncoderSettings &settings, bool *continuous) const @@ -390,7 +380,6 @@ QList<QSize> QCameraImageCapture::supportedResolutions(const QImageEncoderSettin /*! Returns the image encoder settings being used. - \since 1.1 \sa setEncodingSettings() */ @@ -406,7 +395,6 @@ QImageEncoderSettings QCameraImageCapture::encodingSettings() const If some parameters are not specified, or null settings are passed, the encoder choose the default encoding parameters. - \since 1.1 \sa encodingSettings() */ @@ -430,7 +418,6 @@ void QCameraImageCapture::setEncodingSettings(const QImageEncoderSettings &setti /*! Returns the list of supported buffer image capture formats. - \since 1.1 \sa bufferFormat() setBufferFormat() */ QList<QVideoFrame::PixelFormat> QCameraImageCapture::supportedBufferFormats() const @@ -444,7 +431,6 @@ QList<QVideoFrame::PixelFormat> QCameraImageCapture::supportedBufferFormats() co /*! Returns the buffer image capture format being used. - \since 1.2 \sa supportedBufferCaptureFormats() setBufferCaptureFormat() */ QVideoFrame::PixelFormat QCameraImageCapture::bufferFormat() const @@ -458,7 +444,6 @@ QVideoFrame::PixelFormat QCameraImageCapture::bufferFormat() const /*! Sets the buffer image capture format to be used. - \since 1.2 \sa bufferCaptureFormat() supportedBufferCaptureFormats() captureDestination() */ void QCameraImageCapture::setBufferFormat(const QVideoFrame::PixelFormat format) @@ -470,7 +455,6 @@ void QCameraImageCapture::setBufferFormat(const QVideoFrame::PixelFormat format) /*! Returns true if the image capture \a destination is supported; otherwise returns false. - \since 1.2 \sa captureDestination() setCaptureDestination() */ bool QCameraImageCapture::isCaptureDestinationSupported(QCameraImageCapture::CaptureDestinations destination) const @@ -484,7 +468,6 @@ bool QCameraImageCapture::isCaptureDestinationSupported(QCameraImageCapture::Cap /*! Returns the image capture destination being used. - \since 1.2 \sa isCaptureDestinationSupported() setCaptureDestination() */ QCameraImageCapture::CaptureDestinations QCameraImageCapture::captureDestination() const @@ -498,7 +481,6 @@ QCameraImageCapture::CaptureDestinations QCameraImageCapture::captureDestination /*! Sets the capture \a destination to be used. - \since 1.2 \sa isCaptureDestinationSupported() captureDestination() */ void QCameraImageCapture::setCaptureDestination(QCameraImageCapture::CaptureDestinations destination) @@ -512,7 +494,6 @@ void QCameraImageCapture::setCaptureDestination(QCameraImageCapture::CaptureDest /*! \property QCameraImageCapture::readyForCapture Indicates the service is ready to capture a an image immediately. - \since 1.1 */ bool QCameraImageCapture::isReadyForCapture() const @@ -527,7 +508,6 @@ bool QCameraImageCapture::isReadyForCapture() const \fn QCameraImageCapture::readyForCaptureChanged(bool ready) Signals that a camera's \a ready for capture state has changed. - \since 1.1 */ @@ -544,7 +524,6 @@ bool QCameraImageCapture::isReadyForCapture() const QCameraImageCapture::capture returns the capture Id parameter, used with imageExposed(), imageCaptured() and imageSaved() signals. - \since 1.1 */ int QCameraImageCapture::capture(const QString &file) { @@ -567,7 +546,6 @@ int QCameraImageCapture::capture(const QString &file) /*! Cancel incomplete capture requests. Already captured and queused for proicessing images may be discarded. - \since 1.1 */ void QCameraImageCapture::cancelCapture() { @@ -608,28 +586,24 @@ void QCameraImageCapture::cancelCapture() Signals that the capture request \a id has failed with an \a error and \a errorString description. - \since 1.1 */ /*! \fn QCameraImageCapture::bufferFormatChanged(QVideoFrame::PixelFormat format) Signal emitted when the buffer \a format for the buffer image capture has changed. - \since 1.2 */ /*! \fn QCameraImageCapture::captureDestinationChanged(CaptureDestinations destination) Signal emitted when the capture \a destination has changed. - \since 1.2 */ /*! \fn QCameraImageCapture::imageExposed(int id) Signal emitted when the frame with request \a id was exposed. - \since 1.1 */ /*! @@ -637,7 +611,6 @@ void QCameraImageCapture::cancelCapture() Signal emitted when the frame with request \a id was captured, but not processed and saved yet. Frame \a preview can be displayed to user. - \since 1.1 */ /*! @@ -647,7 +620,6 @@ void QCameraImageCapture::cancelCapture() This signal is emitted for metadata \a value with a \a key listed in QtMultimedia::MetaData enum. This signal is emitted between imageExposed and imageSaved signals. - \since 1.2 */ /*! @@ -657,7 +629,6 @@ void QCameraImageCapture::cancelCapture() This signal is emitted for extended metadata \a value with a \a key not listed in QtMultimedia::MetaData enum. This signal is emitted between imageExposed and imageSaved signals. - \since 1.2 */ @@ -665,14 +636,12 @@ void QCameraImageCapture::cancelCapture() \fn QCameraImageCapture::imageAvailable(int id, const QVideoFrame &buffer) Signal emitted when the frame with request \a id is available as \a buffer. - \since 1.2 */ /*! \fn QCameraImageCapture::imageSaved(int id, const QString &fileName) Signal emitted when the frame with request \a id was saved to \a fileName. - \since 1.1 */ diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index cfd2c881a..ae6bd7384 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -75,7 +75,6 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimedia \ingroup camera - \since 1.1 After capturing the data for a camera frame, the camera hardware and software performs various image processing tasks to produce a final @@ -149,7 +148,6 @@ QCameraImageProcessing::~QCameraImageProcessing() /*! Returns true if image processing related settings are supported by this camera. - \since 1.1 */ bool QCameraImageProcessing::isAvailable() const { @@ -159,7 +157,6 @@ bool QCameraImageProcessing::isAvailable() const /*! Returns the white balance mode being used. - \since 1.1 */ QCameraImageProcessing::WhiteBalanceMode QCameraImageProcessing::whiteBalanceMode() const @@ -169,7 +166,6 @@ QCameraImageProcessing::WhiteBalanceMode QCameraImageProcessing::whiteBalanceMod /*! Sets the white balance to \a mode. - \since 1.1 */ void QCameraImageProcessing::setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceMode mode) @@ -180,7 +176,6 @@ void QCameraImageProcessing::setWhiteBalanceMode(QCameraImageProcessing::WhiteBa /*! Returns true if the white balance \a mode is supported. - \since 1.1 */ bool QCameraImageProcessing::isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceMode mode) const @@ -192,7 +187,6 @@ bool QCameraImageProcessing::isWhiteBalanceModeSupported(QCameraImageProcessing: Returns the current color temperature if the current white balance mode is \c WhiteBalanceManual. For other modes the return value is undefined. - \since 1.1 */ int QCameraImageProcessing::manualWhiteBalance() const @@ -208,7 +202,6 @@ int QCameraImageProcessing::manualWhiteBalance() const /*! Sets manual white balance to \a colorTemperature. This is used when whiteBalanceMode() is set to \c WhiteBalanceManual. The units are Kelvin. - \since 1.1 */ void QCameraImageProcessing::setManualWhiteBalance(int colorTemperature) @@ -222,7 +215,6 @@ void QCameraImageProcessing::setManualWhiteBalance(int colorTemperature) /*! Returns the contrast adjustment setting. - \since 1.1 */ int QCameraImageProcessing::contrast() const { @@ -238,7 +230,6 @@ int QCameraImageProcessing::contrast() const Set the contrast adjustment to \a value. Valid contrast adjustment values range between -100 and 100, with a default of 0. - \since 1.1 */ void QCameraImageProcessing::setContrast(int value) { @@ -249,7 +240,6 @@ void QCameraImageProcessing::setContrast(int value) /*! Returns the saturation adjustment value. - \since 1.1 */ int QCameraImageProcessing::saturation() const { @@ -265,7 +255,6 @@ int QCameraImageProcessing::saturation() const Sets the saturation adjustment value to \a value. Valid saturation values range between -100 and 100, with a default of 0. - \since 1.1 */ void QCameraImageProcessing::setSaturation(int value) @@ -279,7 +268,6 @@ void QCameraImageProcessing::setSaturation(int value) Identifies if sharpening is supported. Returns true if sharpening is supported; and false if it is not. - \since 1.1 */ bool QCameraImageProcessing::isSharpeningSupported() const { @@ -294,7 +282,6 @@ bool QCameraImageProcessing::isSharpeningSupported() const This may be \c DefaultSharpening if no particular sharpening level has been applied. - \since 1.1 */ int QCameraImageProcessing::sharpeningLevel() const { @@ -316,7 +303,6 @@ int QCameraImageProcessing::sharpeningLevel() const to perform. Otherwise a level of 0 will disable sharpening, and a level of 100 corresponds to maximum sharpening applied. - \since 1.1 */ void QCameraImageProcessing::setSharpeningLevel(int level) @@ -329,7 +315,6 @@ void QCameraImageProcessing::setSharpeningLevel(int level) /*! Returns true if denoising is supported. - \since 1.1 */ bool QCameraImageProcessing::isDenoisingSupported() const { @@ -343,7 +328,6 @@ bool QCameraImageProcessing::isDenoisingSupported() const Returns the denoising level. This may be \c DefaultDenoising if no particular value has been set. - \since 1.1 */ int QCameraImageProcessing::denoisingLevel() const { @@ -365,7 +349,6 @@ int QCameraImageProcessing::denoisingLevel() const to perform. Otherwise a level of 0 will disable denoising, and a level of 100 corresponds to maximum denoising applied. - \since 1.1 */ void QCameraImageProcessing::setDenoisingLevel(int level) { |