slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed QCameraFocus::focusMode type to QFlags based FocusModes

Browse Source 
It was intended to be QFlags based from the start.

Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Dmytro Poplavskiy
2012-01-31 14:04:53 +10:00
committed by Qt by Nokia
parent 6a88794db4
commit d292f4a7d3
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/multimedia/controls/qcamerafocuscontrol.cpp
View File

@@ -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.
*/

8
src/multimedia/controls/qcamerafocuscontrol.h
View File

@@ -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);