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>

diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index dd3027d..5248e0e 100644 (file)
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -107,17 +107,17 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus()
 */
 QDeclarativeCamera::FocusModes QDeclarativeCameraFocus::focusMode() const
 {
-    return QDeclarativeCamera::FocusModes(m_focus->focusMode());
+    return QDeclarativeCamera::FocusModes(int(m_focus->focusMode()));
 }
 
 bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusModes mode) const
 {
-    return m_focus->isFocusModeSupported(QCameraFocus::FocusMode(int(mode)));
+    return m_focus->isFocusModeSupported(QCameraFocus::FocusModes(int(mode)));
 }
 
 void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusModes mode)
 {
-    m_focus->setFocusMode(QCameraFocus::FocusMode(int(mode)));
+    m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode)));
 }
 
 /*!

diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 2967766..851befe 100644 (file)
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -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);
 }

diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 7dc3038..c14efa4 100644 (file)
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -101,7 +101,7 @@ class Q_MULTIMEDIA_EXPORT QCameraFocus : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode)
+    Q_PROPERTY(FocusModes focusMode READ focusMode WRITE setFocusMode)
     Q_PROPERTY(FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode)
     Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint)
     Q_PROPERTY(QCameraFocusZoneList focusZones READ focusZones NOTIFY focusZonesChanged)
@@ -130,9 +130,9 @@ public:
 
     bool isAvailable() const;
 
-    FocusMode focusMode() const;
-    void setFocusMode(FocusMode mode);
-    bool isFocusModeSupported(FocusMode mode) const;
+    FocusModes focusMode() const;
+    void setFocusMode(FocusModes mode);
+    bool isFocusModeSupported(FocusModes mode) const;
 
     FocusPointMode focusPointMode() const;
     void setFocusPointMode(FocusPointMode mode);

diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp
index d2679f3..3a0bc21 100644 (file)
--- 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 966bb09..06e0cfa 100644 (file)
--- 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);
 

diff --git a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h
index b860834..0538a5f 100644 (file)
--- a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h
@@ -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