Rename QCamera::cameraInfo to cameraDevice

And take the opportunity to clean up variable naming as well.

Change-Id: I510cc8295b8d35554534a3c2ac9d83bf6f5a9d65
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

2 files changed, 16 insertions, 16 deletions

diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 3fa1cdc6e..0407be1aa 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -110,18 +110,18 @@ void overview_viewfinder_orientation()
     //! [Camera overview viewfinder orientation]
     // Assuming a QImage has been created from the QVideoFrame that needs to be presented
     QImage videoFrame;
-    QCameraDevice cameraInfo(camera); // needed to get the camera sensor position and orientation
+    QCameraDevice cameraDevice(camera); // needed to get the camera sensor position and orientation
 
     // Get the current display orientation
     const QScreen *screen = QGuiApplication::primaryScreen();
     const int screenAngle = screen->angleBetween(screen->nativeOrientation(), screen->orientation());
 
     int rotation;
-    if (cameraInfo.position() == QCameraDevice::BackFace) {
-        rotation = (cameraInfo.orientation() - screenAngle) % 360;
+    if (cameraDevice.position() == QCameraDevice::BackFace) {
+        rotation = (cameraDevice.orientation() - screenAngle) % 360;
     } else {
         // Front position, compensate the mirror
-        rotation = (360 - cameraInfo.orientation() + screenAngle) % 360;
+        rotation = (360 - cameraDevice.orientation() + screenAngle) % 360;
     }
 
     // Rotate the frame so it always shows in the correct orientation
@@ -174,8 +174,8 @@ void camera_listing()
 {
     //! [Camera listing]
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : cameras)
-        qDebug() << cameraInfo.description();
+    for (const QCameraDevice &cameraDevice : cameras)
+        qDebug() << cameraDevice.description();
     //! [Camera listing]
 }
 
@@ -183,9 +183,9 @@ void camera_selection()
 {
     //! [Camera selection]
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : cameras) {
-        if (cameraInfo.description() == "mycamera")
-            camera = new QCamera(cameraInfo);
+    for (const QCameraDevice &cameraDevice : cameras) {
+        if (cameraDevice.description() == "mycamera")
+            camera = new QCamera(cameraDevice);
     }
     //! [Camera selection]
 }
@@ -194,14 +194,14 @@ void camera_info()
 {
     //! [Camera info]
     QCamera myCamera;
-    QCameraDevice cameraInfo = camera->cameraInfo();
+    QCameraDevice cameraDevice = camera->cameraDevice();
 
-    if (cameraInfo.position() == QCameraDevice::FrontFace)
+    if (cameraDevice.position() == QCameraDevice::FrontFace)
         qDebug() << "The camera is on the front face of the hardware system.";
-    else if (cameraInfo.position() == QCameraDevice::BackFace)
+    else if (cameraDevice.position() == QCameraDevice::BackFace)
         qDebug() << "The camera is on the back face of the hardware system.";
 
-    qDebug() << "The camera sensor orientation is " << cameraInfo.orientation() << " degrees.";
+    qDebug() << "The camera sensor orientation is " << cameraDevice.orientation() << " degrees.";
     //! [Camera info]
 }
 
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index f1f33d79a..001ca1832 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -116,12 +116,12 @@ In C++:
 
      \snippet multimedia-snippets/camera.cpp Camera selection
 
-In QML, you can set the \c Camera \l{Camera::cameraInfo}{cameraInfo} property. All available cameras can
+In QML, you can set the \c Camera \l{Camera::cameraDevice}{cameraDevice} property. All available cameras can
 be retrieved from \l{QtMultimedia::MediaDevices::availableCameras}{MediaDevices.availableCameras}:
 
 \qml
 Camera {
-    cameraInfo: QtMultimedia.availableCameras[0]
+    cameraDevice: QtMultimedia.availableCameras[0]
 }
 \endqml
 
@@ -140,7 +140,7 @@ Camera {
 }
 \endqml
 
-If neither cameraInfo nor position is specified, the default camera will be used. On desktop
+If neither cameraDevice nor position is specified, the default camera will be used. On desktop
 platforms, the default camera is set by the user in the system settings. On a mobile device, the
 back-facing camera is usually the default camera. You can get information about the default camera
 using \l QCameraDevice::defaultCamera() in C++ or