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>

4 files changed, 9 insertions, 9 deletions

diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 552990496..043afeb29 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -93,9 +93,9 @@ Camera::Camera()
     setCamera(QMediaDevices::defaultVideoInput());
 }
 
-void Camera::setCamera(const QCameraDevice &cameraInfo)
+void Camera::setCamera(const QCameraDevice &cameraDevice)
 {
-    m_camera.reset(new QCamera(cameraInfo));
+    m_camera.reset(new QCamera(cameraDevice));
     m_captureSession.setCamera(m_camera.data());
 
     connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive);
@@ -358,11 +358,11 @@ void Camera::updateCameras()
 {
     ui->menuDevices->clear();
     const QList<QCameraDevice> availableCameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : availableCameras) {
-        QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup);
+    for (const QCameraDevice &cameraDevice : availableCameras) {
+        QAction *videoDeviceAction = new QAction(cameraDevice.description(), videoDevicesGroup);
         videoDeviceAction->setCheckable(true);
-        videoDeviceAction->setData(QVariant::fromValue(cameraInfo));
-        if (cameraInfo == QMediaDevices::defaultVideoInput())
+        videoDeviceAction->setData(QVariant::fromValue(cameraDevice));
+        if (cameraDevice == QMediaDevices::defaultVideoInput())
             videoDeviceAction->setChecked(true);
 
         ui->menuDevices->addAction(videoDeviceAction);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 2b19dae86..c165aa201 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -80,7 +80,7 @@ public slots:
     void saveMetaData();
 
 private slots:
-    void setCamera(const QCameraDevice &cameraInfo);
+    void setCamera(const QCameraDevice &cameraDevice);
 
     void startCamera();
     void stopCamera();
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index 8e58fc7d4..fa619638d 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
@@ -75,7 +75,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
     ui->imageQualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
-    const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraInfo().photoResolutions();
+    const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraDevice().photoResolutions();
     for (const QSize &resolution : supportedResolutions) {
         ui->imageResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
                                         QVariant(resolution));
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 22b82fb60..03c4f74c1 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -92,7 +92,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent)
 
 
     ui->videoResolutionBox->addItem(tr("Default"));
-    auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraInfo().photoResolutions(); // ### Should use resolutions from video formats
+    auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraDevice().photoResolutions(); // ### Should use resolutions from video formats
     for (const QSize &resolution : supportedResolutions) {
         ui->videoResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
                                         QVariant(resolution));