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>

5 files changed, 22 insertions, 22 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);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index c165aa201..d5920a0f3 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -52,7 +52,7 @@
 #define CAMERA_H
 
 #include <QCamera>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QMediaRecorder>
 #include <QScopedPointer>
 #include <QMediaMetaData>
@@ -91,7 +91,7 @@ private slots:
     void setMuted(bool);
 
     void takeImage();
-    void displayCaptureError(int, QCameraImageCapture::Error, const QString &errorString);
+    void displayCaptureError(int, QImageCapture::Error, const QString &errorString);
 
     void configureCaptureSettings();
     void configureVideoSettings();
@@ -135,7 +135,7 @@ private:
     QMediaCaptureSession m_captureSession;
     QScopedPointer<QCamera> m_camera;
     QScopedPointer<QAudioInput> m_audioInput;
-    QCameraImageCapture *m_imageCapture;
+    QImageCapture *m_imageCapture;
     QScopedPointer<QMediaRecorder> m_mediaEncoder;
 
     bool m_isCapturingImage = false;
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index 68e19aac3..476eef085 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -48,7 +48,7 @@ the image or video clip is to be saved. It will also store the image and video
 settings.
 
 The Camera class contains an instance of \l {QCamera}, the API class interface to
-the hardware. It also has an instance of \l {QCameraImageCapture} to take still images
+the hardware. It also has an instance of \l {QImageCapture} to take still images
 and an instance of \l {QMediaRecorder} to record video. It also contains the user
 interface object.
 
@@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}.
 
 \e{setCamera()} sets up various connections between the user interface and the functionality
 of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera},
-\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
+\l {QImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
 and video recording visual tabs are enabled and finally the
 \l {QCamera::start()}{start()} function of the \l{QCamera} object is called.
 
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index fa619638d..a14e519e7 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
@@ -53,11 +53,11 @@
 
 #include <QComboBox>
 #include <QDebug>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QCamera>
 #include <QMediaCaptureSession>
 
-ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) :
+ImageSettings::ImageSettings(QImageCapture *imageCapture, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ImageSettingsUi),
     imagecapture(imageCapture)
@@ -66,13 +66,13 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
 
     //image codecs
     ui->imageCodecBox->addItem(tr("Default image format"), QVariant(QString()));
-    const auto supportedImageFormats = QCameraImageCapture::supportedFormats();
+    const auto supportedImageFormats = QImageCapture::supportedFormats();
     for (const auto &f : supportedImageFormats) {
-        QString description = QCameraImageCapture::fileFormatDescription(f);
-        ui->imageCodecBox->addItem(QCameraImageCapture::fileFormatName(f) + ": " + description, QVariant::fromValue(f));
+        QString description = QImageCapture::fileFormatDescription(f);
+        ui->imageCodecBox->addItem(QImageCapture::fileFormatName(f) + ": " + description, QVariant::fromValue(f));
     }
 
-    ui->imageQualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality));
+    ui->imageQualitySlider->setRange(0, int(QImageCapture::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
     const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraDevice().photoResolutions();
@@ -105,8 +105,8 @@ void ImageSettings::changeEvent(QEvent *e)
 
 void ImageSettings::applyImageSettings() const
 {
-    imagecapture->setFileFormat(boxValue(ui->imageCodecBox).value<QCameraImageCapture::FileFormat>());
-    imagecapture->setQuality(QCameraImageCapture::Quality(ui->imageQualitySlider->value()));
+    imagecapture->setFileFormat(boxValue(ui->imageCodecBox).value<QImageCapture::FileFormat>());
+    imagecapture->setQuality(QImageCapture::Quality(ui->imageQualitySlider->value()));
     imagecapture->setResolution(boxValue(ui->imageResolutionBox).toSize());
 }
 
diff --git a/examples/multimediawidgets/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h
index c155c5531..6564bd91c 100644
--- a/examples/multimediawidgets/camera/imagesettings.h
+++ b/examples/multimediawidgets/camera/imagesettings.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
-class QCameraImageCapture;
+class QImageCapture;
 namespace Ui { class ImageSettingsUi; }
 QT_END_NAMESPACE
 
@@ -64,7 +64,7 @@ class ImageSettings : public QDialog
     Q_OBJECT
 
 public:
-    explicit ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent = nullptr);
+    explicit ImageSettings(QImageCapture *imageCapture, QWidget *parent = nullptr);
     ~ImageSettings();
 
     void applyImageSettings() const;
@@ -80,7 +80,7 @@ private:
     void selectComboBoxItem(QComboBox *box, const QVariant &value);
 
     Ui::ImageSettingsUi *ui;
-    QCameraImageCapture *imagecapture;
+    QImageCapture *imagecapture;
 };
 
 #endif // IMAGESETTINGS_H