diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-31 14:04:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 03:34:13 +0100 |
| commit | d292f4a7d3f589323f8f2869918829351789b3a3 (patch) | |
| tree | bcc8791e3a66b34a93acf9fd9a97785103138bb4 /src/multimedia/controls | |
| parent | 6a88794db4b35128eeef1f3514203d375dbba280 (diff) | |
Changed QCameraFocus::focusMode type to QFlags based FocusModes
It was intended to be QFlags based from the start.
Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/qcamerafocuscontrol.cpp | 6 | ||||
| -rw-r--r-- | src/multimedia/controls/qcamerafocuscontrol.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index d2679f317..3a0bc2103 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -92,21 +92,21 @@ QCameraFocusControl::~QCameraFocusControl() /*! - \fn QCameraFocus::FocusMode QCameraFocusControl::focusMode() const + \fn QCameraFocus::FocusModes QCameraFocusControl::focusMode() const Returns the focus mode being used. */ /*! - \fn void QCameraFocusControl::setFocusMode(QCameraFocus::FocusMode mode) + \fn void QCameraFocusControl::setFocusMode(QCameraFocus::FocusModes mode) Set the focus mode to \a mode. */ /*! - \fn bool QCameraFocusControl::isFocusModeSupported(QCameraFocus::FocusMode mode) const + \fn bool QCameraFocusControl::isFocusModeSupported(QCameraFocus::FocusModes mode) const Returns true if focus \a mode is supported. */ diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 966bb097e..06e0cfa13 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -61,9 +61,9 @@ class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl public: ~QCameraFocusControl(); - virtual QCameraFocus::FocusMode focusMode() const = 0; - virtual void setFocusMode(QCameraFocus::FocusMode mode) = 0; - virtual bool isFocusModeSupported(QCameraFocus::FocusMode mode) const = 0; + virtual QCameraFocus::FocusModes focusMode() const = 0; + virtual void setFocusMode(QCameraFocus::FocusModes mode) = 0; + virtual bool isFocusModeSupported(QCameraFocus::FocusModes mode) const = 0; virtual QCameraFocus::FocusPointMode focusPointMode() const = 0; virtual void setFocusPointMode(QCameraFocus::FocusPointMode mode) = 0; @@ -74,7 +74,7 @@ public: virtual QCameraFocusZoneList focusZones() const = 0; Q_SIGNALS: - void focusModeChanged(QCameraFocus::FocusMode mode); + void focusModeChanged(QCameraFocus::FocusModes mode); void focusPointModeChanged(QCameraFocus::FocusPointMode mode); void customFocusPointChanged(const QPointF &point); |