Clean up QCamera error enum

We only really need two error values, the others don't
make a whole lot of sense.

Change-Id: I8f798b1ed930ea876442390776528a32b3532e30
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 15 insertions, 19 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index c52f574b7..8813858ab 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -123,8 +123,7 @@ void tst_QCameraBackend::testCtorWithDevice()
 
     //loading non existing camera should fail
     camera = new QCamera(QUuid::createUuid().toByteArray());
-    QCOMPARE(camera->error(), QCamera::ServiceMissingError);
-
+    QCOMPARE(camera->error(), QCamera::CameraError);
     delete camera;
 }
 
@@ -148,14 +147,14 @@ void tst_QCameraBackend::testCtorWithCameraInfo()
     {
         // loading an invalid CameraInfo should fail
         QCamera *camera = new QCamera(QCameraInfo());
-        QCOMPARE(camera->error(), QCamera::ServiceMissingError);
+        QCOMPARE(camera->error(), QCamera::CameraError);
         QVERIFY(QCameraInfo(*camera).isNull());
         delete camera;
     }
     {
         // loading non existing camera should fail
         QCamera camera(QCameraInfo(QUuid::createUuid().toByteArray()));
-        QCOMPARE(camera.error(), QCamera::ServiceMissingError);
+        QCOMPARE(camera.error(), QCamera::CameraError);
         QVERIFY(QCameraInfo(camera).isNull());
     }
 }
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp
index 7e7b3c2d5..f2b55e9f7 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@ -1783,7 +1783,7 @@ void tst_QCamera::testQCameraIsNotAvailable()
     provider->service = nullptr;
     QCamera camera("random");
 
-    QCOMPARE(camera.error(), QCamera::ServiceMissingError);
+    QCOMPARE(camera.error(), QCamera::CameraError);
     QVERIFY(!camera.isAvailable());
     QCOMPARE(camera.availability(), QMultimedia::ServiceMissing);
 }
@@ -1961,18 +1961,18 @@ void tst_QCamera::testErrorSignal()
     spyError.clear();
 
     /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
-    service.mockControl->setError(QCamera::InvalidRequestError,QString("InvalidRequestError Error"));
+    service.mockControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
     QVERIFY(spyError.count() == 1);
     err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0));
-    QVERIFY(err == QCamera::InvalidRequestError);
+    QVERIFY(err == QCamera::CameraError);
 
     spyError.clear();
 
     /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
-    service.mockControl->setError(QCamera::NotSupportedFeatureError,QString("NotSupportedFeatureError Error"));
+    service.mockControl->setError(QCamera::CameraError,QString("NotSupportedFeatureError Error"));
     QVERIFY(spyError.count() == 1);
     err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0));
-    QVERIFY(err == QCamera::NotSupportedFeatureError);
+    QVERIFY(err == QCamera::CameraError);
 
 }
 
@@ -1989,12 +1989,12 @@ void tst_QCamera::testError()
     QVERIFY(camera.error() == QCamera::CameraError);
 
     /* Set the QCameraControl error and verify if it is set correctly in QCamera */
-    service.mockControl->setError(QCamera::InvalidRequestError,QString("InvalidRequestError Error"));
-    QVERIFY(camera.error() == QCamera::InvalidRequestError);
+    service.mockControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
+    QVERIFY(camera.error() == QCamera::CameraError);
 
     /* Set the QCameraControl error and verify if it is set correctly in QCamera */
-    service.mockControl->setError(QCamera::NotSupportedFeatureError,QString("NotSupportedFeatureError Error"));
-    QVERIFY(camera.error() == QCamera::NotSupportedFeatureError);
+    service.mockControl->setError(QCamera::CameraError,QString("CameraError Error"));
+    QVERIFY(camera.error() == QCamera::CameraError);
 
 }
 
@@ -2011,12 +2011,12 @@ void tst_QCamera::testErrorString()
     QVERIFY(camera.errorString() == QString("Camera Error"));
 
     /* Set the QCameraControl error and verify if it is set correctly in QCamera */
-    service.mockControl->setError(QCamera::InvalidRequestError,QString("InvalidRequestError Error"));
+    service.mockControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
     QVERIFY(camera.errorString() == QString("InvalidRequestError Error"));
 
     /* Set the QCameraControl error and verify if it is set correctly in QCamera */
-    service.mockControl->setError(QCamera::NotSupportedFeatureError,QString("NotSupportedFeatureError Error"));
-    QVERIFY(camera.errorString() == QString("NotSupportedFeatureError Error"));
+    service.mockControl->setError(QCamera::CameraError,QString("CameraError Error"));
+    QVERIFY(camera.errorString() == QString("CameraError Error"));
 }
 
 /* Test case for verifying Status of QCamera. */
diff --git a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
index 3c8172be4..5f9ed6c9f 100644
--- a/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockcameracontrol.h
@@ -107,9 +107,6 @@ public:
             case QCamera::ActiveState:
                 m_status = QCamera::ActiveStatus;
                 break;
-            default:
-                emit error(QCamera::NotSupportedFeatureError, "State not supported.");
-                return;
             }
 
             emit stateChanged(m_state);