diff options
author | Peter Yard <peter.yard@nokia.com> | 2011-03-16 10:33:19 +1000 |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2011-03-16 10:33:19 +1000 |
commit | 2f9996bc94cdb127ff148041d44e16ff2adfd8d0 (patch) | |
tree | eae6ca03e5744819a0f8571d00cf581c9ee6b486 | |
parent | 4f4cbebe151e24abb255d748d9c83717ec89d957 (diff) |
Docs: QTMOBILITY-1415 Remove technology preview comments from camera class docs.
-rw-r--r-- | src/multimedia/qcamera.cpp | 17 | ||||
-rw-r--r-- | src/multimedia/qcameracontrol.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcameraexposure.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcameraexposurecontrol.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcameraflashcontrol.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcamerafocus.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/qcamerafocuscontrol.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcameraimagecapturecontrol.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/qcameraimageprocessing.cpp | 7 | ||||
-rw-r--r-- | src/multimedia/qcameraimageprocessingcontrol.cpp | 10 | ||||
-rw-r--r-- | src/multimedia/qcameralockscontrol.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/qcameraviewfinder.cpp | 9 |
12 files changed, 21 insertions, 83 deletions
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp index fa07b5ccaa..422a23f65f 100644 --- a/src/multimedia/qcamera.cpp +++ b/src/multimedia/qcamera.cpp @@ -78,22 +78,17 @@ public: /*! \class QCamera - + \brief The QCamera class provides interface for system camera devices. \inmodule QtMultimediaKit \ingroup camera QCamera can be used with QVideoWidget for viewfinder display, - QMediaRecorder for video recording and QCameraImageCapture for images taking. + QMediaRecorder for video recording and QCameraImageCapture for image taking. \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. */ @@ -104,7 +99,7 @@ public: QCameraPrivate(): QMediaObjectPrivate(), provider(0), - control(0), + control(0), viewfinder(0), capture(0), state(QCamera::UnloadedState), @@ -123,7 +118,7 @@ public: QMediaServiceProvider *provider; QCameraControl *control; - QCameraLocksControl *locksControl; + QCameraLocksControl *locksControl; QCameraExposure *cameraExposure; QCameraFocus *cameraFocus; @@ -649,7 +644,7 @@ QCamera::LockTypes QCamera::requestedLocks() const Returns the status of requested camera settings locks. */ QCamera::LockStatus QCamera::lockStatus() const -{ +{ return d_func()->lockStatus; } @@ -674,7 +669,7 @@ QCamera::LockStatus QCamera::lockStatus(QCamera::LockType lockType) const /*! \fn void QCamera::searchAndLock(QCamera::LockTypes locks) - + Locks the camera settings with the requested \a locks, including focusing in the single autofocus mode, exposure and white balance if the exposure and white balance modes are not manual. diff --git a/src/multimedia/qcameracontrol.cpp b/src/multimedia/qcameracontrol.cpp index 1aef4e518c..5a8856b5f7 100644 --- a/src/multimedia/qcameracontrol.cpp +++ b/src/multimedia/qcameracontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraControl - + \brief The QCameraControl class is an abstract base class for classes that control still cameras or video cameras. @@ -62,11 +62,6 @@ QT_BEGIN_NAMESPACE defined in QCameraControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. \sa QMediaService::requestControl(), QCamera */ diff --git a/src/multimedia/qcameraexposure.cpp b/src/multimedia/qcameraexposure.cpp index 4a2760121c..c31fa46f8d 100644 --- a/src/multimedia/qcameraexposure.cpp +++ b/src/multimedia/qcameraexposure.cpp @@ -54,17 +54,12 @@ QT_BEGIN_NAMESPACE /*! \class QCameraExposure - + \brief The QCameraExposure class provides interface for exposure related camera settings. \inmodule QtMultimediaKit \ingroup camera -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. */ //#define DEBUG_EXPOSURE_CHANGES 1 diff --git a/src/multimedia/qcameraexposurecontrol.cpp b/src/multimedia/qcameraexposurecontrol.cpp index 7e70c5882d..bb89d4ea7b 100644 --- a/src/multimedia/qcameraexposurecontrol.cpp +++ b/src/multimedia/qcameraexposurecontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraExposureControl - + \brief The QCameraExposureControl class supplies control for exposure related camera parameters. @@ -57,11 +57,6 @@ QT_BEGIN_NAMESPACE The interface name of QCameraExposureControl is \c com.nokia.Qt.QCameraExposureControl/1.0 as defined in QCameraExposureControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has not undergone -the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. \sa QCamera */ diff --git a/src/multimedia/qcameraflashcontrol.cpp b/src/multimedia/qcameraflashcontrol.cpp index d8716c06c3..3a869689bc 100644 --- a/src/multimedia/qcameraflashcontrol.cpp +++ b/src/multimedia/qcameraflashcontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraFlashControl - + \brief The QCameraFlashControl class supplies a camera flash control. \ingroup camera @@ -55,11 +55,6 @@ QT_BEGIN_NAMESPACE The interface name of QCameraFlashControl is \c com.nokia.Qt.QCameraFlashControl/1.0 as defined in QCameraFlashControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has not undergone -the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. \sa QCamera */ diff --git a/src/multimedia/qcamerafocus.cpp b/src/multimedia/qcamerafocus.cpp index dcb72f4650..65a48db624 100644 --- a/src/multimedia/qcamerafocus.cpp +++ b/src/multimedia/qcamerafocus.cpp @@ -166,18 +166,13 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status) /*! \class QCameraFocus - + \brief The QCameraFocus class provides interface for focus and zoom related camera settings. \inmodule QtMultimediaKit \ingroup camera -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. */ @@ -190,7 +185,7 @@ public: QCameraFocus *q_ptr; QCamera *camera; - QCameraFocusControl *focusControl; + QCameraFocusControl *focusControl; }; diff --git a/src/multimedia/qcamerafocuscontrol.cpp b/src/multimedia/qcamerafocuscontrol.cpp index 282296137b..dc3f900b4a 100644 --- a/src/multimedia/qcamerafocuscontrol.cpp +++ b/src/multimedia/qcamerafocuscontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraFocusControl - + \brief The QCameraFocusControl class supplies control for focusing related camera parameters. @@ -57,11 +57,6 @@ QT_BEGIN_NAMESPACE The interface name of QCameraFocusControl is \c com.nokia.Qt.QCameraFocusControl/1.0 as defined in QCameraFocusControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has not undergone -the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. \sa QMediaService::requestControl(), QCamera */ diff --git a/src/multimedia/qcameraimagecapturecontrol.cpp b/src/multimedia/qcameraimagecapturecontrol.cpp index 25c150aab4..b9f8c87053 100644 --- a/src/multimedia/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/qcameraimagecapturecontrol.cpp @@ -46,23 +46,18 @@ QT_BEGIN_NAMESPACE /*! \class QCameraImageCaptureControl - + \brief The QCameraImageCaptureControl class provides a control interface for image capture services. \inmodule QtMultimediaKit \ingroup camera - + The interface name of QCameraImageCaptureControl is \c com.nokia.Qt.QCameraImageCaptureControl/1.0 as defined in QCameraImageCaptureControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has not undergone -the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. \sa QMediaService::requestControl() */ diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp index 75f98d0502..df1b17c39c 100644 --- a/src/multimedia/qcameraimageprocessing.cpp +++ b/src/multimedia/qcameraimageprocessing.cpp @@ -57,18 +57,13 @@ QT_BEGIN_NAMESPACE /*! \class QCameraImageProcessing - + \brief The QCameraImageProcessing class provides interface for focus and zoom related camera settings. \inmodule QtMultimediaKit \ingroup camera -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. */ diff --git a/src/multimedia/qcameraimageprocessingcontrol.cpp b/src/multimedia/qcameraimageprocessingcontrol.cpp index 2b40d4c6a0..d79fa374e8 100644 --- a/src/multimedia/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/qcameraimageprocessingcontrol.cpp @@ -49,21 +49,15 @@ QT_BEGIN_NAMESPACE \inmodule QtMultimediaKit \ingroup multimedia-serv - + \brief The QCameraImageProcessingControl class provides an abstract class for controlling image processing parameters, like white balance, contrast, saturation, sharpening and denoising. - + The interface name of QCameraImageProcessingControl is \c com.nokia.Qt.QCameraImageProcessingControl/1.0 as defined in QCameraImageProcessingControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has not undergone -the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. - \sa QMediaService::requestControl(), QCamera */ diff --git a/src/multimedia/qcameralockscontrol.cpp b/src/multimedia/qcameralockscontrol.cpp index a81d7370cd..fd2683fe14 100644 --- a/src/multimedia/qcameralockscontrol.cpp +++ b/src/multimedia/qcameralockscontrol.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \class QCameraLocksControl - + \brief The QCameraLocksControl class is an abstract base class for classes that control still cameras or video cameras. @@ -62,12 +62,6 @@ QT_BEGIN_NAMESPACE defined in QCameraLocksControl_iid. -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. - \sa QMediaService::requestControl(), QCamera */ diff --git a/src/multimedia/qcameraviewfinder.cpp b/src/multimedia/qcameraviewfinder.cpp index 391d14cedc..5707e1a0c4 100644 --- a/src/multimedia/qcameraviewfinder.cpp +++ b/src/multimedia/qcameraviewfinder.cpp @@ -53,19 +53,14 @@ QT_USE_NAMESPACE /*! \class QCameraViewfinder - - \brief The QCameraViewfinder class provides camera viewfinder widget. + + \brief The QCameraViewfinder class provides a camera viewfinder widget. \inmodule QtMultimediaKit \ingroup camera \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera -The Camera API of Qt Mobility is still in \bold Technology Preview. It has -not undergone the same level of review and testing as the rest of the APIs. - -The API exposed by the classes in this component are not stable, and will -undergo modification or removal prior to the final release of Qt Mobility. */ class QCameraViewfinderPrivate : public QVideoWidgetPrivate |