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

12
src/multimedia/camera/qcamerafocus.cpp
View File

@@ -91,9 +91,9 @@ public:
QCameraFocusFakeFocusControl(QObject *parent) :
QCameraFocusControl(parent) {}
QCameraFocus::FocusMode focusMode() const { return QCameraFocus::AutoFocus; }
void setFocusMode(QCameraFocus::FocusMode) { qWarning("Focus mode selection is not supported"); }
bool isFocusModeSupported(QCameraFocus::FocusMode) const { return false; }
QCameraFocus::FocusModes focusMode() const { return QCameraFocus::AutoFocus; }
void setFocusMode(QCameraFocus::FocusModes) { qWarning("Focus mode selection is not supported"); }
bool isFocusModeSupported(QCameraFocus::FocusModes) const { return false; }
QCameraFocus::FocusPointMode focusPointMode() const { return QCameraFocus::FocusPointAuto; }
void setFocusPointMode(QCameraFocus::FocusPointMode) { qWarning("Focus points mode selection is not supported"); }
@@ -416,12 +416,12 @@ bool QCameraFocus::isAvailable() const
\sa QCameraFocus::isFocusModeSupported()
*/
QCameraFocus::FocusMode QCameraFocus::focusMode() const
QCameraFocus::FocusModes QCameraFocus::focusMode() const
{
return d_func()->focusControl->focusMode();
}
void QCameraFocus::setFocusMode(QCameraFocus::FocusMode mode)
void QCameraFocus::setFocusMode(QCameraFocus::FocusModes mode)
{
d_func()->focusControl->setFocusMode(mode);
}
@@ -430,7 +430,7 @@ void QCameraFocus::setFocusMode(QCameraFocus::FocusMode mode)
Returns true if the focus \a mode is supported by camera.
*/
bool QCameraFocus::isFocusModeSupported(FocusMode mode) const
bool QCameraFocus::isFocusModeSupported(FocusModes mode) const
{
return d_func()->focusControl->isFocusModeSupported(mode);
}