summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/camera/camera.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-06-15 16:09:34 +0200
committerLars Knoll <lars.knoll@qt.io>2021-06-17 13:40:52 +0200
commit83a031c56b74d68fe6d349f78c48a1681e40374e (patch)
treefd4cd75d49009ed21c525564070c11492645afe2 /examples/multimediawidgets/camera/camera.cpp
parent8fc76abb75b8a97bb5ef695d4bc8d59c6ef0c0b5 (diff)
Rename QCameraImageCapture to QImageCapture
Fixup the backend class and file names while we're at it. Change-Id: Ib0928dfebb6f127b7a43683b2907420c95af6599 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'examples/multimediawidgets/camera/camera.cpp')
-rw-r--r--examples/multimediawidgets/camera/camera.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 043afeb29..89667ab43 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -105,7 +105,7 @@ void Camera::setCamera(const QCameraDevice &cameraDevice)
m_captureSession.setEncoder(m_mediaEncoder.data());
connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState);
- m_imageCapture = new QCameraImageCapture;
+ m_imageCapture = new QImageCapture;
m_captureSession.setImageCapture(m_imageCapture);
connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
@@ -118,10 +118,10 @@ void Camera::setCamera(const QCameraDevice &cameraDevice)
updateCameraActive(m_camera->isActive());
updateRecorderState(m_mediaEncoder->recorderState());
- connect(m_imageCapture, &QCameraImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
- connect(m_imageCapture, &QCameraImageCapture::imageCaptured, this, &Camera::processCapturedImage);
- connect(m_imageCapture, &QCameraImageCapture::imageSaved, this, &Camera::imageSaved);
- connect(m_imageCapture, &QCameraImageCapture::errorOccurred, this, &Camera::displayCaptureError);
+ connect(m_imageCapture, &QImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
+ connect(m_imageCapture, &QImageCapture::imageCaptured, this, &Camera::processCapturedImage);
+ connect(m_imageCapture, &QImageCapture::imageSaved, this, &Camera::imageSaved);
+ connect(m_imageCapture, &QImageCapture::errorOccurred, this, &Camera::displayCaptureError);
readyForCapture(m_imageCapture->isReadyForCapture());
updateCaptureMode();
@@ -233,7 +233,7 @@ void Camera::takeImage()
m_imageCapture->captureToFile();
}
-void Camera::displayCaptureError(int id, const QCameraImageCapture::Error error, const QString &errorString)
+void Camera::displayCaptureError(int id, const QImageCapture::Error error, const QString &errorString)
{
Q_UNUSED(id);
Q_UNUSED(error);