9 files changed, 38 insertions, 38 deletions
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index 0f7806fac..e15a04cc6 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -447,7 +447,7 @@ void QAndroidCameraSession::applyImageSettings()
         return;
 
     // only supported format right now.
-    m_actualImageSettings.setFormat(QCameraImageCapture::JPEG);
+    m_actualImageSettings.setFormat(QImageCapture::JPEG);
 
     const QSize requestedResolution = m_requestedImageSettings.resolution();
     const QList<QSize> supportedResolutions = m_camera->getSupportedPictureSizes();
@@ -469,19 +469,19 @@ void QAndroidCameraSession::applyImageSettings()
 
     int jpegQuality = 100;
     switch (m_requestedImageSettings.quality()) {
-    case QCameraImageCapture::VeryLowQuality:
+    case QImageCapture::VeryLowQuality:
         jpegQuality = 20;
         break;
-    case QCameraImageCapture::LowQuality:
+    case QImageCapture::LowQuality:
         jpegQuality = 40;
         break;
-    case QCameraImageCapture::NormalQuality:
+    case QImageCapture::NormalQuality:
         jpegQuality = 60;
         break;
-    case QCameraImageCapture::HighQuality:
+    case QImageCapture::HighQuality:
         jpegQuality = 80;
         break;
-    case QCameraImageCapture::VeryHighQuality:
+    case QImageCapture::VeryHighQuality:
         jpegQuality = 100;
         break;
     }
@@ -507,7 +507,7 @@ int QAndroidCameraSession::capture(const QString &fileName)
     ++m_lastImageCaptureId;
 
     if (!isReadyForCapture()) {
-        emit imageCaptureError(m_lastImageCaptureId, QCameraImageCapture::NotReadyError,
+        emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError,
                                tr("Camera not ready"));
         return m_lastImageCaptureId;
     }
@@ -530,7 +530,7 @@ int QAndroidCameraSession::capture(const QString &fileName)
 
 void QAndroidCameraSession::onCameraTakePictureFailed()
 {
-    emit imageCaptureError(m_currentImageCaptureId, QCameraImageCapture::ResourceError,
+    emit imageCaptureError(m_currentImageCaptureId, QImageCapture::ResourceError,
                            tr("Failed to capture image"));
 
     // Preview needs to be restarted and the preview call back must be setup again
@@ -654,11 +654,11 @@ void QAndroidCameraSession::processCapturedImage(int id,
 
                 emit imageSaved(id, actualFileName);
             } else {
-                emit imageCaptureError(id, QCameraImageCapture::OutOfSpaceError, file.errorString());
+                emit imageCaptureError(id, QImageCapture::OutOfSpaceError, file.errorString());
             }
         } else {
             const QString errorMessage = tr("Could not open destination file: %1").arg(actualFileName);
-            emit imageCaptureError(id, QCameraImageCapture::ResourceError, errorMessage);
+            emit imageCaptureError(id, QImageCapture::ResourceError, errorMessage);
         }
     } else {
         QVideoFrame frame(new QMemoryVideoBuffer(data, -1), QVideoFrameFormat(resolution, QVideoFrameFormat::Format_Jpeg));
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
index 29f73b004..195a90bfb 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
@@ -53,11 +53,11 @@
 //
 
 #include <qcamera.h>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QSet>
 #include <QMutex>
 #include <private/qmediastoragelocation_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index 97b436ee3..99ebcc3b7 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -45,7 +45,7 @@
 #include "qandroidcameracontrol_p.h"
 #include "qandroidcamerasession_p.h"
 #include "qandroidcameravideorenderercontrol_p.h"
-#include "qandroidcameraimagecapturecontrol_p.h"
+#include "qandroidimagecapture_p.h"
 #include "qmediadevices.h"
 #include "qaudiodevice.h"
 
@@ -94,14 +94,14 @@ void QAndroidCaptureService::setCamera(QPlatformCamera *camera)
         emit cameraChanged();
 }
 
-QPlatformCameraImageCapture *QAndroidCaptureService::imageCapture()
+QPlatformImageCapture *QAndroidCaptureService::imageCapture()
 {
     return m_imageCaptureControl;
 }
 
-void QAndroidCaptureService::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void QAndroidCaptureService::setImageCapture(QPlatformImageCapture *imageCapture)
 {
-    QAndroidCameraImageCaptureControl *control = static_cast<QAndroidCameraImageCaptureControl *>(imageCapture);
+    QAndroidImageCapture *control = static_cast<QAndroidImageCapture *>(imageCapture);
     if (m_imageCaptureControl == control)
         return;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index 6e8dc5460..0f87965e1 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -61,7 +61,7 @@ class QAndroidMediaEncoder;
 class QAndroidCaptureSession;
 class QAndroidCameraControl;
 class QAndroidCameraSession;
-class QAndroidCameraImageCaptureControl;
+class QAndroidImageCapture;
 
 class QAndroidCaptureService : public QPlatformMediaCaptureSession
 {
@@ -74,8 +74,8 @@ public:
     QPlatformCamera *camera() override;
     void setCamera(QPlatformCamera *camera) override;
 
-    QPlatformCameraImageCapture *imageCapture() override;
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *imageCapture() override;
+    void setImageCapture(QPlatformImageCapture *imageCapture) override;
 
     QPlatformMediaEncoder *mediaEncoder() override;
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -94,7 +94,7 @@ private:
     QAndroidCaptureSession *m_captureSession = nullptr;
     QAndroidCameraControl *m_cameraControl = nullptr;
     QAndroidCameraSession *m_cameraSession = nullptr;
-    QAndroidCameraImageCaptureControl *m_imageCaptureControl;
+    QAndroidImageCapture *m_imageCaptureControl;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidimagecapture.cpp
index c75d2b28b..a782ec9e0 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidimagecapture.cpp
@@ -37,50 +37,50 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameraimagecapturecontrol_p.h"
+#include "qandroidimagecapture_p.h"
 
 #include "qandroidcamerasession_p.h"
 #include "qandroidcaptureservice_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QAndroidCameraImageCaptureControl::QAndroidCameraImageCaptureControl(QCameraImageCapture *parent)
-    : QPlatformCameraImageCapture(parent)
+QAndroidImageCapture::QAndroidImageCapture(QImageCapture *parent)
+    : QPlatformImageCapture(parent)
 {
 }
 
-bool QAndroidCameraImageCaptureControl::isReadyForCapture() const
+bool QAndroidImageCapture::isReadyForCapture() const
 {
     return m_session->isReadyForCapture();
 }
 
-int QAndroidCameraImageCaptureControl::capture(const QString &fileName)
+int QAndroidImageCapture::capture(const QString &fileName)
 {
     return m_session->capture(fileName);
 }
 
-int QAndroidCameraImageCaptureControl::captureToBuffer()
+int QAndroidImageCapture::captureToBuffer()
 {
     // ### implement me!
     const QLatin1String errorMessage("Capturing to buffer not supported.");
     QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                               Q_ARG(int, -1),
-                              Q_ARG(int, QCameraImageCapture::NotSupportedFeatureError),
+                              Q_ARG(int, QImageCapture::NotSupportedFeatureError),
                               Q_ARG(QString, errorMessage));
     return -1;
 }
 
-QImageEncoderSettings QAndroidCameraImageCaptureControl::imageSettings() const
+QImageEncoderSettings QAndroidImageCapture::imageSettings() const
 {
     return m_session->imageSettings();
 }
 
-void QAndroidCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings)
+void QAndroidImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 {
     m_session->setImageSettings(settings);
 }
 
-void QAndroidCameraImageCaptureControl::setCaptureSession(QPlatformMediaCaptureSession *session)
+void QAndroidImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
 {
     QAndroidCaptureService *captureSession = static_cast<QAndroidCaptureService *>(session);
     if (m_service == captureSession)
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidimagecapture_p.h
index 9db1a66e1..c5697b601 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidimagecapture_p.h
@@ -51,18 +51,18 @@
 // We mean it.
 //
 
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 class QAndroidCaptureService;
 
-class QAndroidCameraImageCaptureControl : public QPlatformCameraImageCapture
+class QAndroidImageCapture : public QPlatformImageCapture
 {
     Q_OBJECT
 public:
-    explicit QAndroidCameraImageCaptureControl(QCameraImageCapture *parent = nullptr);
+    explicit QAndroidImageCapture(QImageCapture *parent = nullptr);
 
     bool isReadyForCapture() const override;
 
diff --git a/src/multimedia/platform/android/qandroidformatsinfo.cpp b/src/multimedia/platform/android/qandroidformatsinfo.cpp
index 4d31cc15d..0e421b658 100644
--- a/src/multimedia/platform/android/qandroidformatsinfo.cpp
+++ b/src/multimedia/platform/android/qandroidformatsinfo.cpp
@@ -53,7 +53,7 @@ QAndroidFormatInfo::QAndroidFormatInfo()
     };
     encoders = decoders;
 
-    imageFormats << QCameraImageCapture::JPEG;
+    imageFormats << QImageCapture::JPEG;
 }
 
 QAndroidFormatInfo::~QAndroidFormatInfo()
diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp
index 1a8a10a43..95b8bd39e 100644
--- a/src/multimedia/platform/android/qandroidintegration.cpp
+++ b/src/multimedia/platform/android/qandroidintegration.cpp
@@ -47,7 +47,7 @@
 #include "private/androidsurfaceview_p.h"
 #include "private/androidcamera_p.h"
 #include "private/qandroidcameracontrol_p.h"
-#include "private/qandroidcameraimagecapturecontrol_p.h"
+#include "private/qandroidimagecapture_p.h"
 #include "private/qandroidmediaencoder_p.h"
 #include "private/androidmediarecorder_p.h"
 #include "private/qandroidformatsinfo_p.h"
@@ -104,9 +104,9 @@ QPlatformMediaEncoder *QAndroidIntegration::createEncoder(QMediaRecorder *encode
     return new QAndroidMediaEncoder(encoder);
 }
 
-QPlatformCameraImageCapture *QAndroidIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QAndroidIntegration::createImageCapture(QImageCapture *imageCapture)
 {
-    return new QAndroidCameraImageCaptureControl(imageCapture);
+    return new QAndroidImageCapture(imageCapture);
 }
 
 QPlatformAudioOutput *QAndroidIntegration::createAudioOutput(QAudioOutput *q)
diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h
index 6df40672c..a242dc19a 100644
--- a/src/multimedia/platform/android/qandroidintegration_p.h
+++ b/src/multimedia/platform/android/qandroidintegration_p.h
@@ -70,7 +70,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override;
     QPlatformCamera *createCamera(QCamera *camera) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *encoder) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override;
 
     QPlatformAudioOutput *createAudioOutput(QAudioOutput *q) override;