diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-03-13 18:07:12 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-24 14:03:15 +0100 |
commit | 4aeda4943e9532719c49f02a5997f74fe4e0e7c9 (patch) | |
tree | d933adeca548954bcda292ec0c94bf3ab4f15c49 /src/imports/multimedia/qdeclarativecamerafocus.cpp | |
parent | 904881d4a338b6259bb18320b0d09f79abe2aa5e (diff) |
Fix enums for QML camera types.
CameraExposure, CameraFlash and CameraFocus had signals and functions
using enum-type arguments declared in QDeclarativeCamera. This doesn't
work since an enum and a function using it both need to be declared in
the same class in order to work from QML.
The relevant enums have been duplicated (not moved, in order to
preserve QML source compatibility) from QDeclarativeCamera to
QDeclarativeCameraExposure, QDeclarativeCameraFlash and
QDeclarativeCameraFocus.
Change-Id: Ib307d7c6c9dbc59b1b82782913397160be38d4cd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 7f0133b6a..b474599b5 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -161,9 +161,9 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus() and \l focusZones property provide information and control over how automatic focusing is performed. */ -QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const +QDeclarativeCameraFocus::FocusMode QDeclarativeCameraFocus::focusMode() const { - return QDeclarativeCamera::FocusMode(int(m_focus->focusMode())); + return QDeclarativeCameraFocus::FocusMode(int(m_focus->focusMode())); } /*! @@ -172,12 +172,12 @@ QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const Returns true if the supplied \a mode is a supported focus mode, and false otherwise. */ -bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusMode mode) const +bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCameraFocus::FocusMode mode) const { return m_focus->isFocusModeSupported(QCameraFocus::FocusModes(int(mode))); } -void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode) +void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCameraFocus::FocusMode mode) { if (mode != focusMode()) { m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode))); @@ -221,12 +221,12 @@ void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode) \li Focus to the custom point, defined by the customFocusPoint property. \endtable */ -QDeclarativeCamera::FocusPointMode QDeclarativeCameraFocus::focusPointMode() const +QDeclarativeCameraFocus::FocusPointMode QDeclarativeCameraFocus::focusPointMode() const { - return QDeclarativeCamera::FocusPointMode(m_focus->focusPointMode()); + return QDeclarativeCameraFocus::FocusPointMode(m_focus->focusPointMode()); } -void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCamera::FocusPointMode mode) +void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCameraFocus::FocusPointMode mode) { if (mode != focusPointMode()) { m_focus->setFocusPointMode(QCameraFocus::FocusPointMode(mode)); @@ -240,7 +240,7 @@ void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCamera::FocusPointMo Returns true if the supplied \a mode is a supported focus point mode, and false otherwise. */ -bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::FocusPointMode mode) const +bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCameraFocus::FocusPointMode mode) const { return m_focus->isFocusPointModeSupported(QCameraFocus::FocusPointMode(mode)); } |