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, 11 insertions, 11 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 0407be1aa..fa2ca6d25 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -44,7 +44,7 @@
 #include "qmediarecorder.h"
 #include "qmediadevices.h"
 #include "qmediacapturesession.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 #include "qvideosink.h"
 #include <QtMultimediaWidgets/qvideowidget.h>
 #include <QtGui/qscreen.h>
@@ -54,7 +54,7 @@
 /* Globals so that everything is consistent. */
 QCamera *camera = 0;
 QMediaRecorder *recorder = 0;
-QCameraImageCapture *imageCapture = 0;
+QImageCapture *imageCapture = 0;
 
 //! [Camera overview check]
 bool checkCameraAvailability()
@@ -135,7 +135,7 @@ void overview_still()
     QMediaCaptureSession captureSession;
     camera = new QCamera;
     captureSession.setCamera(camera);
-    imageCapture = new QCameraImageCapture(camera);
+    imageCapture = new QImageCapture(camera);
     captureSession.setImageCapture(imageCapture);
 
     camera->start(); // Viewfinder frames start flowing
@@ -216,7 +216,7 @@ void camera_blah()
     preview->show();
     captureSession.setVideoOutput(preview);
 
-    imageCapture = new QCameraImageCapture(camera);
+    imageCapture = new QImageCapture(camera);
     captureSession.setImageCapture(imageCapture);
 
     camera->start();
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index fd76e679e..1e905484e 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -47,7 +47,7 @@
 #include "qplatformmediaplayer_p.h"
 #include "qmediaplayer.h"
 #include "qvideowidget.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 #include "qcamera.h"
 #include "qcameraviewfinder.h"
 #include "qaudiorecorder.h"
@@ -73,7 +73,7 @@ private:
     QMediaRecorder *recorder;
     QCamera *camera;
     QCameraViewfinder *viewfinder;
-    QCameraImageCapture *imageCapture;
+    QImageCapture *imageCapture;
     QString fileName;
 
     QMediaContent image1;
@@ -100,7 +100,7 @@ void MediaExample::recorderSettings()
 void MediaExample::imageSettings()
 {
     //! [Image encoder settings]
-    imageCapture->setFileFormat(QCameraImageCapture::JPEG);
+    imageCapture->setFileFormat(QImageCapture::JPEG);
     imageCapture->setResolution(1600, 1200);
     //! [Image encoder settings]
 }
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 001ca1832..09c7f3632 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -196,7 +196,7 @@ account the camera sensor orientation and the current display orientation.
 \section2 Still Images
 
 After setting up a viewfinder and finding something photogenic,
-to capture an image we need to initialize a new QCameraImageCapture
+to capture an image we need to initialize a new QImageCapture
 object. All that is then needed is to start the camera and capture the image.
 
     \snippet multimedia-snippets/camera.cpp Camera overview capture
@@ -276,7 +276,7 @@ Various operations such as image capture and auto focusing occur
 asynchrously. These operations can often be canceled by the start of a new
 operation as long as this is supported by the camera. For image capture,
 the operation can be canceled by calling
-\l {QCameraImageCapture::cancelCapture()}{cancelCapture()}. For AutoFocus,
+\l {QImageCapture::cancelCapture()}{cancelCapture()}. For AutoFocus,
 autoexposure or white balance cancellation can be done by calling
 \e {QCamera::unlock(QCamera::LockFocus)}.
 
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index c554d5898..d5f0322c3 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -132,7 +132,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l {Camera Example}{camera},
             \l {QML Camera Example}{declarative-camera}
         \li \l Camera
-        \li QCamera, QCameraImageCapture
+        \li QCamera, QImageCapture
     \row
         \li Capturing movies
         \li \l {Camera Example}{camera},
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 5e2f4d98f..598a67456 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -117,7 +117,7 @@
      \li QCamera
      \li Access camera viewfinder.
     \row
-     \li QCameraImageCapture
+     \li QImageCapture
      \li Capture still images with a camera.
     \row
      \li QMediaRecorder