Moved zoom related properties out of QCameraFocusControl

Change-Id: I16f9b80ebbacc0b325530e81c291dc030763b65e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

1 files changed, 16 insertions, 52 deletions

diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp
index abbb015ab..6618d0cfa 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.cpp
+++ b/src/multimedia/controls/qcamerafocuscontrol.cpp
@@ -111,40 +111,6 @@ QCameraFocusControl::~QCameraFocusControl()
   Returns true if focus \a mode is supported.
 */
 
-
-/*!
-  \fn qreal QCameraFocusControl::maximumOpticalZoom() const
-
-  Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported.
-*/
-
-
-/*!
-  \fn qreal QCameraFocusControl::maximumDigitalZoom() const
-
-  Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported.
-*/
-
-
-/*!
-  \fn qreal QCameraFocusControl::opticalZoom() const
-
-  Return the current optical zoom value.
-*/
-
-/*!
-  \fn qreal QCameraFocusControl::digitalZoom() const
-
-  Return the current digital zoom value.
-*/
-
-
-/*!
-  \fn void QCameraFocusControl::zoomTo(qreal optical, qreal digital)
-
-  Sets \a optical and \a digital zoom values.
-*/
-
 /*!
   \fn QCameraFocusControl::focusPointMode() const
 
@@ -191,41 +157,39 @@ QCameraFocusControl::~QCameraFocusControl()
 */
 
 /*!
-    \fn void QCameraFocusControl::opticalZoomChanged(qreal zoom)
+  \fn QCameraFocusControl::focusZonesChanged()
 
-    Signal emitted when the optical \a zoom value changed.
-*/
+  Signal is emitted when the set of zones, camera focused on is changed.
 
-/*!
-    \fn void QCameraFocusControl::digitalZoomChanged(qreal zoom)
+  Usually the zones list is changed when the camera is focused.
 
-    Signal emitted when the digital \a zoom value changed.
+  \sa QCameraFocusControl::focusZones()
 */
 
 /*!
-    \fn void QCameraFocusControl::maximumOpticalZoomChanged(qreal zoom)
+  \fn QCameraFocusControl::focusModeChanged
+
+  Signal is emitted when the focus mode is chaged,
+  usually in result of QCameraFocusControl::setFocusMode call or capture mode changes.
 
-    Signal emitted when the maximum supported optical \a zoom value changed.
+  \sa QCameraFocusControl::focusMode QCameraFocusControl::setFocusMode
 */
 
 /*!
-    \fn void QCameraFocusControl::maximumDigitalZoomChanged(qreal zoom)
+  \fn QCameraFocusControl::focusPointModeChanged
 
-    Signal emitted when the maximum supported digital \a zoom value changed.
+  Signal is emitted when the focus point mode is chaged,
+  usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes.
 
-    The maximum supported zoom value can depend on other camera settings,
-    like capture mode or resolution.
+  \sa QCameraFocusControl::focusPointMode QCameraFocusControl::setFocusPointMode
 */
 
-
 /*!
-  \fn QCameraFocusControl::focusZonesChanged()
+  \fn QCameraFocusControl::customFocusPointChanged
 
-  Signal is emitted when the set of zones, camera focused on is changed.
-
-  Usually the zones list is changed when the camera is focused.
+  Signal is emitted when the custom focus point is changed.
 
-  \sa QCameraFocusControl::focusZones()
+  \sa QCameraFocusControl::customFocusPoint QCameraFocusControl::setCustomFocusPoint
 */