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>

3 files changed, 24 insertions, 24 deletions

diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 613b2f138..75e06a4a4 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -60,8 +60,8 @@ public slots:
     void cleanupTestCase();
 
 private slots:
-    void testCameraInfo();
-    void testCtorWithCameraInfo();
+    void testCameraDevice();
+    void testCtorWithCameraDevice();
     void testCtorWithPosition();
 
     void testCameraStates();
@@ -88,7 +88,7 @@ void tst_QCameraBackend::cleanupTestCase()
 {
 }
 
-void tst_QCameraBackend::testCameraInfo()
+void tst_QCameraBackend::testCameraDevice()
 {
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
     if (cameras.isEmpty()) {
@@ -104,13 +104,13 @@ void tst_QCameraBackend::testCameraInfo()
     }
 }
 
-void tst_QCameraBackend::testCtorWithCameraInfo()
+void tst_QCameraBackend::testCtorWithCameraDevice()
 {
     {
-        // loading an invalid CameraInfo should fail
+        // loading an invalid CameraDevice should fail
         QCamera camera(QCameraDevice{});
         QCOMPARE(camera.error(), QCamera::CameraError);
-        QVERIFY(camera.cameraInfo().isNull());
+        QVERIFY(camera.cameraDevice().isNull());
     }
 
     if (noCamera)
@@ -120,13 +120,13 @@ void tst_QCameraBackend::testCtorWithCameraInfo()
         QCameraDevice info = QMediaDevices::defaultVideoInput();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), info);
+        QCOMPARE(camera.cameraDevice(), info);
     }
     {
         QCameraDevice info = QMediaDevices::videoInputs().first();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), info);
+        QCOMPARE(camera.cameraDevice(), info);
     }
 }
 
@@ -157,7 +157,7 @@ void tst_QCameraBackend::testCameraStates()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    camera.setCameraInfo(QCameraDevice());
+    camera.setCameraDevice(QCameraDevice());
     QCameraImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
@@ -175,7 +175,7 @@ void tst_QCameraBackend::testCameraStates()
 
     if (noCamera)
         QSKIP("No camera available");
-    camera.setCameraInfo(QMediaDevices::defaultVideoInput());
+    camera.setCameraDevice(QMediaDevices::defaultVideoInput());
     QCOMPARE(camera.error(), QCamera::NoError);
 
     camera.start();
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 5e227f64a..946edcce0 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -577,36 +577,36 @@ void tst_QCamera::testConstructor()
         QCamera camera;
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 
     {
         QCamera camera(QCameraDevice::FrontFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), frontCamera);
+        QCOMPARE(camera.cameraDevice(), frontCamera);
     }
 
     {
         QCamera camera(QMediaDevices::defaultVideoInput());
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 
     {
-        QCameraDevice cameraInfo = QMediaDevices::videoInputs().at(0);
-        QCamera camera(cameraInfo);
+        QCameraDevice cameraDevice = QMediaDevices::videoInputs().at(0);
+        QCamera camera(cameraDevice);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), cameraInfo);
+        QCOMPARE(camera.cameraDevice(), cameraDevice);
     }
 
     {
         QCamera camera(QCameraDevice::BackFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), backCamera);
+        QCOMPARE(camera.cameraDevice(), backCamera);
     }
 
     {
@@ -614,7 +614,7 @@ void tst_QCamera::testConstructor()
         QCamera camera(QCameraDevice::UnspecifiedPosition);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 }
 
diff --git a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
index 458c77efa..c8f93330f 100644
--- a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
+++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
@@ -74,7 +74,7 @@ void tst_QCameraDevice::constructor()
     {
         // default camera
         QCamera camera;
-        QCameraDevice info(camera.cameraInfo());
+        QCameraDevice info(camera.cameraDevice());
         QVERIFY(!info.isNull());
         QCOMPARE(info.id(), QStringLiteral("default"));
         QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
@@ -90,7 +90,7 @@ void tst_QCameraDevice::constructor()
     QVERIFY(!info.isNull());
 
     QCamera camera(info);
-    QCOMPARE(info, camera.cameraInfo());
+    QCOMPARE(info, camera.cameraDevice());
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("back"));
     QCOMPARE(info.description(), QStringLiteral("backCamera"));
@@ -113,7 +113,7 @@ void tst_QCameraDevice::defaultCamera()
     QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     QCamera camera(info);
-    QCOMPARE(camera.cameraInfo(), info);
+    QCOMPARE(camera.cameraDevice(), info);
 }
 
 void tst_QCameraDevice::availableCameras()
@@ -152,13 +152,13 @@ void tst_QCameraDevice::equality_operators()
 
     {
         QCamera camera(defaultCamera);
-        QVERIFY(camera.cameraInfo() == defaultCamera);
-        QVERIFY(camera.cameraInfo() == cameras.at(0));
+        QVERIFY(camera.cameraDevice() == defaultCamera);
+        QVERIFY(camera.cameraDevice() == cameras.at(0));
     }
 
     {
         QCamera camera(cameras.at(1));
-        QVERIFY(camera.cameraInfo() == cameras.at(1));
+        QVERIFY(camera.cameraDevice() == cameras.at(1));
     }
 }