Merge QCameraLocksControl into QCameraControl

Change-Id: I228b7ef5dbb3e782a4cf39605e2f33b3c93ba8a5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 83 insertions, 143 deletions

diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri
index edf537eeb..0c439f5ab 100644
--- a/tests/auto/unit/qmultimedia_common/mockcamera.pri
+++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri
@@ -6,7 +6,6 @@ INCLUDEPATH += $$PWD \
 
 HEADERS *= \
     ../qmultimedia_common/mockcameraservice.h \
-    ../qmultimedia_common/mockcameralockscontrol.h \
     ../qmultimedia_common/mockcamerafocuscontrol.h \
     ../qmultimedia_common/mockcameraimageprocessingcontrol.h \
     ../qmultimedia_common/mockcameraimagecapturecontrol.h \
diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
index 95e9be7b3..fb686f92f 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
@@ -30,6 +30,7 @@
 #define MOCKCAMERACONTROL_H
 
 #include "qcameracontrol.h"
+#include <qtimer.h>
 
 class MockCameraControl : public QCameraControl
 {
@@ -92,11 +93,6 @@ public:
         return mode == QCamera::CaptureStillImage || mode == QCamera::CaptureVideo;
     }
 
-    QCamera::LockTypes supportedLocks() const
-    {
-        return QCamera::LockExposure | QCamera::LockFocus | QCamera::LockWhiteBalance;
-    }
-
     bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
     {
         Q_UNUSED(status);
@@ -108,6 +104,66 @@ public:
             return m_propertyChangesSupported;
     }
 
+    QCamera::LockTypes supportedLocks() const
+    {
+        return QCamera::LockExposure | QCamera::LockFocus;
+    }
+
+    QCamera::LockStatus lockStatus(QCamera::LockType lock) const
+    {
+        switch (lock) {
+        case QCamera::LockExposure:
+            return m_exposureLock;
+        case QCamera::LockFocus:
+            return m_focusLock;
+        default:
+            return QCamera::Unlocked;
+        }
+    }
+
+    void searchAndLock(QCamera::LockTypes locks)
+    {
+        if (locks & QCamera::LockExposure) {
+            QCamera::LockStatus newStatus = locks & QCamera::LockFocus ? QCamera::Searching : QCamera::Locked;
+
+            if (newStatus != m_exposureLock)
+                emit lockStatusChanged(QCamera::LockExposure,
+                                       m_exposureLock = newStatus,
+                                       QCamera::UserRequest);
+        }
+
+        if (locks & QCamera::LockFocus) {
+            emit lockStatusChanged(QCamera::LockFocus,
+                                   m_focusLock = QCamera::Searching,
+                                   QCamera::UserRequest);
+
+            QTimer::singleShot(5, this, SLOT(focused()));
+        }
+    }
+
+    void unlock(QCamera::LockTypes locks) {
+        if (locks & QCamera::LockFocus && m_focusLock != QCamera::Unlocked) {
+            emit lockStatusChanged(QCamera::LockFocus,
+                                   m_focusLock = QCamera::Unlocked,
+                                   QCamera::UserRequest);
+        }
+
+        if (locks & QCamera::LockExposure && m_exposureLock != QCamera::Unlocked) {
+            emit lockStatusChanged(QCamera::LockExposure,
+                                   m_exposureLock = QCamera::Unlocked,
+                                   QCamera::UserRequest);
+        }
+    }
+
+    /* helper method to emit the signal with LockChangeReason */
+    void setLockChangeReason (QCamera::LockChangeReason lockChangeReason)
+    {
+        emit lockStatusChanged(QCamera::NoLock,
+                               QCamera::Unlocked,
+                               lockChangeReason);
+
+    }
+
     /* helper method to emit the signal error */
     void setError(QCamera::Error err, QString errorString)
     {
@@ -125,6 +181,28 @@ public:
     QCamera::CaptureModes m_captureMode;
     QCamera::Status m_status;
     bool m_propertyChangesSupported;
+
+
+private slots:
+    void focused()
+    {
+        if (m_focusLock == QCamera::Searching) {
+            emit lockStatusChanged(QCamera::LockFocus,
+                                   m_focusLock = QCamera::Locked,
+                                   QCamera::UserRequest);
+        }
+
+        if (m_exposureLock == QCamera::Searching) {
+            emit lockStatusChanged(QCamera::LockExposure,
+                                   m_exposureLock = QCamera::Locked,
+                                   QCamera::UserRequest);
+        }
+    }
+
+
+private:
+    QCamera::LockStatus m_focusLock = QCamera::Unlocked;
+    QCamera::LockStatus m_exposureLock = QCamera::Unlocked;
 };
 
 
diff --git a/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h b/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h
deleted file mode 100644
index a520ad055..000000000
--- a/tests/auto/unit/qmultimedia_common/mockcameralockscontrol.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef MOCKCAMERALOCKCONTROL_H
-#define MOCKCAMERALOCKCONTROL_H
-
-#include <QTimer>
-#include "qcameralockscontrol.h"
-
-class MockCameraLocksControl : public QCameraLocksControl
-{
-    Q_OBJECT
-public:
-    MockCameraLocksControl(QObject *parent = 0):
-            QCameraLocksControl(parent),
-            m_focusLock(QCamera::Unlocked),
-            m_exposureLock(QCamera::Unlocked)
-    {
-    }
-
-    ~MockCameraLocksControl() {}
-
-    QCamera::LockTypes supportedLocks() const
-    {
-        return QCamera::LockExposure | QCamera::LockFocus;
-    }
-
-    QCamera::LockStatus lockStatus(QCamera::LockType lock) const
-    {
-        switch (lock) {
-        case QCamera::LockExposure:
-            return m_exposureLock;
-        case QCamera::LockFocus:
-            return m_focusLock;
-        default:
-            return QCamera::Unlocked;
-        }
-    }
-
-    void searchAndLock(QCamera::LockTypes locks)
-    {
-        if (locks & QCamera::LockExposure) {
-            QCamera::LockStatus newStatus = locks & QCamera::LockFocus ? QCamera::Searching : QCamera::Locked;
-
-            if (newStatus != m_exposureLock)
-                emit lockStatusChanged(QCamera::LockExposure,
-                                       m_exposureLock = newStatus,
-                                       QCamera::UserRequest);
-        }
-
-        if (locks & QCamera::LockFocus) {
-            emit lockStatusChanged(QCamera::LockFocus,
-                                   m_focusLock = QCamera::Searching,
-                                   QCamera::UserRequest);
-
-            QTimer::singleShot(5, this, SLOT(focused()));
-        }
-    }
-
-    void unlock(QCamera::LockTypes locks) {
-        if (locks & QCamera::LockFocus && m_focusLock != QCamera::Unlocked) {
-            emit lockStatusChanged(QCamera::LockFocus,
-                                   m_focusLock = QCamera::Unlocked,
-                                   QCamera::UserRequest);
-        }
-
-        if (locks & QCamera::LockExposure && m_exposureLock != QCamera::Unlocked) {
-            emit lockStatusChanged(QCamera::LockExposure,
-                                   m_exposureLock = QCamera::Unlocked,
-                                   QCamera::UserRequest);
-        }
-    }
-
-    /* helper method to emit the signal with LockChangeReason */
-    void setLockChangeReason (QCamera::LockChangeReason lockChangeReason)
-    {
-        emit lockStatusChanged(QCamera::NoLock,
-                               QCamera::Unlocked,
-                               lockChangeReason);
-
-    }
-
-private slots:
-    void focused()
-    {
-        if (m_focusLock == QCamera::Searching) {
-            emit lockStatusChanged(QCamera::LockFocus,
-                                   m_focusLock = QCamera::Locked,
-                                   QCamera::UserRequest);
-        }
-
-        if (m_exposureLock == QCamera::Searching) {
-            emit lockStatusChanged(QCamera::LockExposure,
-                                   m_exposureLock = QCamera::Locked,
-                                   QCamera::UserRequest);
-        }
-    }
-
-
-private:
-    QCamera::LockStatus m_focusLock;
-    QCamera::LockStatus m_exposureLock;
-};
-
-
-#endif // MOCKCAMERALOCKCONTROL_H
diff --git a/tests/auto/unit/qmultimedia_common/mockcameraservice.h b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
index 11dcb39f1..6c1665d05 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameraservice.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameraservice.h
@@ -30,7 +30,6 @@
 #define MOCKCAMERASERVICE_H
 
 #include "qmediaservice.h"
-#include "../qmultimedia_common/mockcameralockscontrol.h"
 #include "../qmultimedia_common/mockcamerafocuscontrol.h"
 #include "../qmultimedia_common/mockcameraimageprocessingcontrol.h"
 #include "../qmultimedia_common/mockcameraimagecapturecontrol.h"
@@ -79,7 +78,6 @@ public:
     MockCameraService(): QMediaService(0)
     {
         mockControl = new MockCameraControl(this);
-        mockLocksControl = new MockCameraLocksControl(this);
         mockExposureControl = new MockCameraExposureControl(this);
         mockFocusControl = new MockCameraFocusControl(this);
         mockCaptureControl = new MockCaptureControl(mockControl, this);
@@ -103,9 +101,6 @@ public:
         if (qstrcmp(iid, QCameraControl_iid) == 0)
             return mockControl;
 
-        if (qstrcmp(iid, QCameraLocksControl_iid) == 0)
-            return mockLocksControl;
-
         if (qstrcmp(iid, QCameraExposureControl_iid) == 0)
             return mockExposureControl;
 
@@ -156,7 +151,6 @@ public:
     }
 
     MockCameraControl *mockControl;
-    MockCameraLocksControl *mockLocksControl;
     MockCaptureControl *mockCaptureControl;
     MockCaptureBufferFormatControl *mockCaptureBufferControl;
     MockCameraExposureControl *mockExposureControl;