QCamera: Deprecate 'error' signal, use 'errorOccurred' instead

[ChangeLog][Deprecation Notice] QCamera::error() (the signal) is deprecated; superseded by errorOccurred()

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

6 files changed, 22 insertions, 10 deletions

diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 7730c9900..379a6f39e 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-void QDeclarativeCamera::_q_error(QCamera::Error errorCode)
+void QDeclarativeCamera::_q_errorOccurred(QCamera::Error errorCode)
 {
     emit error(Error(errorCode), errorString());
     emit errorChanged();
@@ -197,7 +197,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) :
             this, SIGNAL(lockStatusChanged()));
     connect(m_camera, &QCamera::stateChanged, this, &QDeclarativeCamera::_q_updateState);
     connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged()));
-    connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error)));
+    connect(m_camera, SIGNAL(errorOccurred(QCamera::Error)), this, SLOT(_q_errorOccurred(QCamera::Error)));
     connect(m_camera, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)),
             this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus)));
 
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 97afa5b53..b22b9d059 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -332,7 +332,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void _q_updateState(QCamera::State);
-    void _q_error(QCamera::Error);
+    void _q_errorOccurred(QCamera::Error);
     void _q_availabilityChanged(QMultimedia::AvailabilityStatus);
 
 protected:
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 40441f332..79412b961 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -109,6 +109,7 @@ void QCameraPrivate::_q_error(int error, const QString &errorString)
     this->error = QCamera::Error(error);
     this->errorString = errorString;
 
+    emit q->errorOccurred(this->error);
     emit q->error(this->error);
 }
 
@@ -823,7 +824,7 @@ void QCamera::setCaptureMode(QCamera::CaptureModes mode)
     Starts the camera.
 
     State is changed to QCamera::ActiveState if camera is started
-    successfully, otherwise error() signal is emitted.
+    successfully, otherwise errorOccurred() signal is emitted.
 
     While the camera state is changed to QCamera::ActiveState,
     starting the camera service can be asynchronous with the actual
@@ -1271,6 +1272,14 @@ void QCamera::unlock()
 
 /*!
     \fn void QCamera::error(QCamera::Error value)
+    \obsolete
+
+    Use errorOccurred() instead.
+*/
+
+/*!
+    \fn void QCamera::errorOccurred(QCamera::Error value)
+    \since 5.15
 
     Signal emitted when error state changes to \a value.
 */
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index b2582cd19..97cf4509b 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -242,7 +242,10 @@ Q_SIGNALS:
     void lockStatusChanged(QCamera::LockStatus status, QCamera::LockChangeReason reason);
     void lockStatusChanged(QCamera::LockType lock, QCamera::LockStatus status, QCamera::LockChangeReason reason);
 
+#if QT_DEPRECATED_SINCE(5,15)
     void error(QCamera::Error);
+#endif
+    void errorOccurred(QCamera::Error);
 
 private:
     Q_DISABLE_COPY(QCamera)
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 27fc014aa..068b30653 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -214,7 +214,7 @@ void tst_QCameraBackend::testCameraStates()
     QCamera camera;
     QCameraImageCapture imageCapture(&camera);
 
-    QSignalSpy errorSignal(&camera, SIGNAL(error(QCamera::Error)));
+    QSignalSpy errorSignal(&camera, SIGNAL(errorOccurred(QCamera::Error)));
     QSignalSpy stateChangedSignal(&camera, SIGNAL(stateChanged(QCamera::State)));
     QSignalSpy statusChangedSignal(&camera, SIGNAL(statusChanged(QCamera::Status)));
 
@@ -262,8 +262,8 @@ void tst_QCameraBackend::testCameraStartError()
 {
     QCamera camera1(QCameraInfo::defaultCamera());
     QCamera camera2(QCameraInfo::defaultCamera());
-    QSignalSpy errorSpy1(&camera1, QOverload<QCamera::Error>::of(&QCamera::error));
-    QSignalSpy errorSpy2(&camera2, QOverload<QCamera::Error>::of(&QCamera::error));
+    QSignalSpy errorSpy1(&camera1, &QCamera::errorOccurred);
+    QSignalSpy errorSpy2(&camera2, &QCamera::errorOccurred);
 
     camera1.start();
     camera2.start();
@@ -283,7 +283,7 @@ void tst_QCameraBackend::testCaptureMode()
 {
     QCamera camera;
 
-    QSignalSpy errorSignal(&camera, SIGNAL(error(QCamera::Error)));
+    QSignalSpy errorSignal(&camera, SIGNAL(errorOccurred(QCamera::Error)));
     QSignalSpy stateChangedSignal(&camera, SIGNAL(stateChanged(QCamera::State)));
     QSignalSpy captureModeSignal(&camera, SIGNAL(captureModeChanged(QCamera::CaptureModes)));
 
@@ -631,7 +631,7 @@ void tst_QCameraBackend::testVideoRecording()
 
     QMediaRecorder recorder(camera.data());
 
-    QSignalSpy errorSignal(camera.data(), SIGNAL(error(QCamera::Error)));
+    QSignalSpy errorSignal(camera.data(), SIGNAL(errorOccurred(QCamera::Error)));
     QSignalSpy recorderErrorSignal(&recorder, SIGNAL(error(QMediaRecorder::Error)));
     QSignalSpy recorderStatusSignal(&recorder, SIGNAL(statusChanged(QMediaRecorder::Status)));
 
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp
index 4b6202173..643b552f9 100644
--- a/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@ -2039,7 +2039,7 @@ void tst_QCamera::testErrorSignal()
 
     QCamera camera;
 
-    QSignalSpy spyError(&camera, SIGNAL(error(QCamera::Error)));
+    QSignalSpy spyError(&camera, SIGNAL(errorOccurred(QCamera::Error)));
 
     /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
     service.mockControl->setError(QCamera::CameraError,QString("Camera Error"));