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

8
tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h
View File

@@ -60,18 +60,18 @@ public:
~MockCameraFocusControl() {}
QCameraFocus::FocusMode focusMode() const
QCameraFocus::FocusModes focusMode() const
{
return m_focusMode;
}
void setFocusMode(QCameraFocus::FocusMode mode)
void setFocusMode(QCameraFocus::FocusModes mode)
{
if (isFocusModeSupported(mode))
m_focusMode = mode;
}
bool isFocusModeSupported(QCameraFocus::FocusMode mode) const
bool isFocusModeSupported(QCameraFocus::FocusModes mode) const
{
return mode == QCameraFocus::AutoFocus || mode == QCameraFocus::ContinuousFocus;
}
@@ -127,7 +127,7 @@ public:
}
private:
QCameraFocus::FocusMode m_focusMode;
QCameraFocus::FocusModes m_focusMode;
QCameraFocus::FocusPointMode m_focusPointMode;
QPointF m_focusPoint;
// to emit focus zone changed signal