Remove QCamera::Status

The enum is not really useful. Instead isActive() and error()
provide all the information required.

Change-Id: I2856c833745e79f74bb2a9d95f0ef65eafd24413
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

4 files changed, 9 insertions, 56 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 75e06a4a4..7bcc0dc72 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -164,10 +164,8 @@ void tst_QCameraBackend::testCameraStates()
 
     QSignalSpy errorSignal(&camera, SIGNAL(errorOccurred(QCamera::Error, const QString &)));
     QSignalSpy activeChangedSignal(&camera, SIGNAL(activeChanged(bool)));
-    QSignalSpy statusChangedSignal(&camera, SIGNAL(statusChanged(QCamera::Status)));
 
     QCOMPARE(camera.isActive(), false);
-    QCOMPARE(camera.status(), QCamera::InactiveStatus);
 
     // Camera should not startup with a null QCameraDevice as device
     camera.start();
@@ -182,14 +180,10 @@ void tst_QCameraBackend::testCameraStates()
     QCOMPARE(camera.isActive(), true);
     QTRY_COMPARE(activeChangedSignal.size(), 1);
     QCOMPARE(activeChangedSignal.last().first().value<bool>(), true);
-    QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
-    QCOMPARE(statusChangedSignal.last().first().value<QCamera::Status>(), QCamera::ActiveStatus);
 
     camera.stop();
     QCOMPARE(camera.isActive(), false);
     QCOMPARE(activeChangedSignal.last().first().value<bool>(), false);
-    QTRY_COMPARE(camera.status(), QCamera::InactiveStatus);
-    QCOMPARE(statusChangedSignal.last().first().value<QCamera::Status>(), QCamera::InactiveStatus);
 
     QCOMPARE(camera.errorString(), QString());
 }
@@ -212,7 +206,6 @@ void tst_QCameraBackend::testCameraStartParallel()
     camera2.start();
 
     QCOMPARE(camera1.isActive(), true);
-    QTRY_COMPARE(camera1.status(), QCamera::ActiveStatus);
     QCOMPARE(camera1.error(), QCamera::NoError);
     QCOMPARE(camera2.isActive(), true);
     QCOMPARE(camera2.error(), QCamera::NoError);
@@ -250,7 +243,7 @@ void tst_QCameraBackend::testCameraCapture()
     camera.start();
 
     QTRY_VERIFY(imageCapture.isReadyForCapture());
-    QCOMPARE(camera.status(), QCamera::ActiveStatus);
+    QVERIFY(camera.isActive());
     QCOMPARE(errorSignal.size(), 0);
 
     int id = imageCapture.captureToFile();
@@ -289,7 +282,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
 
     camera.setActive(true);
 
-    QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
+    QTRY_VERIFY(camera.isActive());
 
     QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
     QSignalSpy imageAvailableSignal(&imageCapture, SIGNAL(imageAvailable(int,QVideoFrame)));
@@ -377,7 +370,7 @@ void tst_QCameraBackend::testExposureCompensation()
 
     //exposure compensation should be preserved during start
     camera.start();
-    QTRY_COMPARE(camera.status(), QCamera::ActiveStatus);
+    QTRY_VERIFY(camera.isActive());
 
     QCOMPARE(camera.exposureCompensation(), 1.0);
 
@@ -407,7 +400,7 @@ void tst_QCameraBackend::testExposureMode()
     }
 
     camera.stop();
-    QTRY_COMPARE(camera.status(), QCamera::InactiveStatus);
+    QTRY_VERIFY(!camera.isActive());
 
     // Auto
     camera.setExposureMode(QCamera::ExposureAuto);
@@ -472,7 +465,7 @@ void tst_QCameraBackend::testVideoRecording()
     }
     QTRY_VERIFY(camera->isActive());
 
-    QTRY_COMPARE(camera->status(), QCamera::ActiveStatus);
+    QTRY_VERIFY(camera->isActive());
     QTRY_COMPARE(recorder.status(), QMediaRecorder::StoppedStatus);
 
     for (int recordings = 0; recordings < 2; ++recordings) {
diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h
index f10c972f9..2184f464a 100644
--- a/tests/auto/unit/mockbackend/qmockcamera.h
+++ b/tests/auto/unit/mockbackend/qmockcamera.h
@@ -50,7 +50,6 @@ public:
 
     QMockCamera(QCamera *parent)
         : QPlatformCamera(parent),
-          m_status(QCamera::InactiveStatus),
           m_propertyChangesSupported(false)
     {
         if (!simpleCamera) {
@@ -71,25 +70,15 @@ public:
         if (m_active == active)
             return;
         m_active = active;
-        setStatus(active ? QCamera::ActiveStatus : QCamera::InactiveStatus);
         emit activeChanged(active);
     }
 
-    QCamera::Status status() const override { return m_status; }
-
     /* helper method to emit the signal error */
     void setError(QCamera::Error err, QString errorString)
     {
         emit error(err, errorString);
     }
 
-    /* helper method to emit the signal statusChaged */
-    void setStatus(QCamera::Status newStatus)
-    {
-        m_status = newStatus;
-        emit statusChanged(newStatus);
-    }
-
     void setCamera(const QCameraDevice &camera) override
     {
         m_camera = camera;
@@ -183,7 +172,6 @@ public:
     }
 
     bool m_active = false;
-    QCamera::Status m_status;
     QCameraDevice m_camera;
     bool m_propertyChangesSupported;
 };
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 2137ac4ca..7d231276b 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -76,7 +76,6 @@ private slots:
     void testErrorSignal();
     void testError();
     void testErrorString();
-    void testStatus();
 
 
     // Test cases to for focus handling
@@ -445,14 +444,11 @@ void tst_QCamera::testCameraEncodingProperyChange()
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
-    QSignalSpy statusChangedSignal(&camera, SIGNAL(statusChanged(QCamera::Status)));
+    QSignalSpy activeChangedSignal(&camera, SIGNAL(activeChanged(bool)));
 
     camera.start();
     QCOMPARE(camera.isActive(), true);
-    QCOMPARE(camera.status(), QCamera::ActiveStatus);
-
-    QCOMPARE(statusChangedSignal.count(), 1);
-    statusChangedSignal.clear();
+    QCOMPARE(activeChangedSignal.count(), 1);
 }
 
 void tst_QCamera::testSetVideoOutput()
@@ -543,8 +539,6 @@ void tst_QCamera::testSetVideoOutputDestruction()
 
 void tst_QCamera::testEnumDebug()
 {
-    QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveStatus");
-    qDebug() << QCamera::ActiveStatus;
     QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError");
     qDebug() << QCamera::CameraError;
 //    QTest::ignoreMessage(QtDebugMsg, "QCameraDevice::FrontFace");
@@ -705,27 +699,6 @@ void tst_QCamera::testErrorString()
     QVERIFY(camera.errorString() == QString("CameraError Error"));
 }
 
-/* Test case for verifying Status of QCamera. */
-void tst_QCamera::testStatus()
-{
-    QMediaCaptureSession session;
-    QCamera camera;
-    session.setCamera(&camera);
-    auto *service = integration.lastCaptureService();
-
-    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
-    service->mockCameraControl->setStatus(QCamera::StartingStatus);
-    QVERIFY(camera.status() == QCamera::StartingStatus);
-
-    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
-    service->mockCameraControl->setStatus(QCamera::StartingStatus);
-    QVERIFY(camera.status() == QCamera::StartingStatus);
-
-    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
-    service->mockCameraControl->setStatus(QCamera::UnavailableStatus);
-    QVERIFY(camera.status() == QCamera::UnavailableStatus);
-}
-
 //Added this code to cover QCamera::FocusModeHyperfocal and QCamera::FocusModeAutoNear
 //As the FocusModeHyperfocal and FocusModeAutoNear are not supported we can not set the focus mode to these Focus Modes
 void tst_QCamera::testFocusMode()
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 3314ad547..26facdd9a 100644
--- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -80,13 +80,12 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
-    QSignalSpy statusChangedSignal(&camera, SIGNAL(statusChanged(QCamera::Status)));
+    QSignalSpy activeChangedSignal(&camera, SIGNAL(activeChanged(bool)));
 
     camera.start();
     QCOMPARE(camera.isActive(), true);
-    QCOMPARE(camera.status(), QCamera::ActiveStatus);
 
-    QCOMPARE(statusChangedSignal.count(), 1);
+    QCOMPARE(activeChangedSignal.count(), 1);
 }
 
 void tst_QCameraWidgets::testSetVideoOutput()