Rename shutterSpeed() to exposureTime()

That's really what it is, and how all other frameworks
name it. Shutter speed is a name that really only works
for old analog cameras.

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

6 files changed, 43 insertions, 38 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 409971c87..4a7ef70d6 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -819,29 +819,35 @@ int QCamera::maximumIsoSensitivity() const
     return d->control ? d->control->maxIso() : -1;
 }
 
-float QCamera::minimumShutterSpeed() const
+/*!
+    The minimal exposure time in seconds.
+*/
+float QCamera::minimumExposureTime() const
 {
     Q_D(const QCamera);
-    return d->control ? d->control->minShutterSpeed() : -1.;
+    return d->control ? d->control->minExposureTime() : -1.;
 }
 
-float QCamera::maximumShutterSpeed() const
+/*!
+    The maximal exposure time in seconds.
+*/
+float QCamera::maximumExposureTime() const
 {
     Q_D(const QCamera);
-    return d->control ? d->control->maxShutterSpeed() : -1.;
+    return d->control ? d->control->maxExposureTime() : -1.;
 }
 
 /*!
     \property QCamera::exposureTime
-    \brief Camera's shutter speed in seconds.
+    \brief Camera's exposure time in seconds.
 
-    \sa supportedShutterSpeeds(), setAutoShutterSpeed(), setManualExposureTime()
+    \sa minimumExposureTime(), maximumExposureTime(), setManualExposureTime()
 */
 
 /*!
-    \fn QCamera::exposureTimeChanged(qreal speed)
+    \fn QCamera::exposureTimeChanged(float time)
 
-    Signals that a camera's shutter \a speed has changed.
+    Signals that a camera's exposure \a time has changed.
 */
 
 /*!
@@ -883,9 +889,8 @@ float QCamera::manualExposureTime() const
 }
 
 /*!
-    Turn on auto shutter speed
+    Use automatically calculated exposure time
 */
-
 void QCamera::setAutoExposureTime()
 {
     Q_D(QCamera);
@@ -946,7 +951,7 @@ void QCamera::setAutoExposureTime()
 /*!
     \fn void QCamera::exposureTimeRangeChanged()
 
-    Signal emitted when the shutter speed range has changed.
+    Signal emitted when the exposure time range has changed.
 */
 
 
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index e169901c3..2dccb1080 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -235,8 +235,8 @@ public:
     int minimumIsoSensitivity() const;
     int maximumIsoSensitivity() const;
 
-    float minimumShutterSpeed() const;
-    float maximumShutterSpeed() const;
+    float minimumExposureTime() const;
+    float maximumExposureTime() const;
 
     WhiteBalanceMode whiteBalanceMode() const;
     Q_INVOKABLE bool isWhiteBalanceModeSupported(WhiteBalanceMode mode) const;
@@ -285,7 +285,7 @@ Q_SIGNALS:
     void flashModeChanged();
     void torchModeChanged();
 
-    void exposureTimeChanged(qreal speed);
+    void exposureTimeChanged(float speed);
     void isoSensitivityChanged(int);
     void exposureCompensationChanged(qreal);
     void exposureModeChanged();
diff --git a/src/multimedia/platform/qplatformcamera_p.h b/src/multimedia/platform/qplatformcamera_p.h
index 6039422a1..990943d2d 100644
--- a/src/multimedia/platform/qplatformcamera_p.h
+++ b/src/multimedia/platform/qplatformcamera_p.h
@@ -122,8 +122,8 @@ public:
     int minIso() const { return m_minIso; }
     int maxIso() const { return m_maxIso; }
     float manualExposureTime() const { return m_exposureTime; }
-    float minShutterSpeed() const { return m_minShutterSpeed; }
-    float maxShutterSpeed() const { return m_maxShutterSpeed; }
+    float minExposureTime() const { return m_minExposureTime; }
+    float maxExposureTime() const { return m_maxExposureTime; }
     QCamera::WhiteBalanceMode whiteBalanceMode() const { return m_whiteBalance; }
     int colorTemperature() const { return m_colorTemperature; }
 
@@ -145,8 +145,8 @@ public:
     void minIsoChanged(int iso) { m_minIso = iso; }
     void maxIsoChanged(int iso) { m_maxIso = iso; }
     void exposureTimeChanged(float speed);
-    void minShutterSpeedChanged(float secs) { m_minShutterSpeed = secs; }
-    void maxShutterSpeedChanged(float secs) { m_maxShutterSpeed = secs; }
+    void minExposureTimeChanged(float secs) { m_minExposureTime = secs; }
+    void maxExposureTimeChanged(float secs) { m_maxExposureTime = secs; }
     void whiteBalanceModeChanged(QCamera::WhiteBalanceMode mode);
     void colorTemperatureChanged(int temperature);
 
@@ -181,8 +181,8 @@ private:
     int m_minIso = -1;
     int m_maxIso = -1;
     float m_exposureTime = -1.;
-    float m_minShutterSpeed = -1.;
-    float m_maxShutterSpeed = -1.;
+    float m_minExposureTime = -1.;
+    float m_maxExposureTime = -1.;
     QCamera::WhiteBalanceMode m_whiteBalance = QCamera::WhiteBalanceAuto;
     int m_colorTemperature = 0;
 };
diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h
index ac0329c68..f10c972f9 100644
--- a/tests/auto/unit/mockbackend/qmockcamera.h
+++ b/tests/auto/unit/mockbackend/qmockcamera.h
@@ -56,8 +56,8 @@ public:
         if (!simpleCamera) {
             minIsoChanged(100);
             maxIsoChanged(800);
-            minShutterSpeedChanged(.001f);
-            maxShutterSpeedChanged(1.f);
+            minExposureTimeChanged(.001f);
+            maxExposureTimeChanged(1.f);
             exposureCompensationRangeChanged(-2, 2);
             maximumZoomFactorChanged(4.);
             setFlashMode(QCamera::FlashAuto);
diff --git a/tests/auto/unit/multimedia/qcamera/CMakeLists.txt b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt
index c1de3d65f..6a78fd572 100644
--- a/tests/auto/unit/multimedia/qcamera/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qcamera/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## tst_qcamera Test:
 #####################################################################
 
-qt_internal_add_test(tst_qmultimediacamera
+qt_internal_add_test(tst_qcamera
     SOURCES
         tst_qcamera.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 946edcce0..2137ac4ca 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -173,8 +173,8 @@ void tst_QCamera::testSimpleCameraExposure()
     QCOMPARE(camera.isoSensitivity(), -1);
 
     QVERIFY(camera.exposureTime() < 0);
-    QCOMPARE(camera.minimumShutterSpeed(), -1.);
-    QCOMPARE(camera.maximumShutterSpeed(), -1.);
+    QCOMPARE(camera.minimumExposureTime(), -1.);
+    QCOMPARE(camera.maximumExposureTime(), -1.);
     camera.setAutoExposureTime();
     QVERIFY(camera.exposureTime() < 0);
     camera.setManualExposureTime(1/128.0);
@@ -384,22 +384,22 @@ void tst_QCamera::testCameraExposure()
     camera.setAutoIsoSensitivity();
     QCOMPARE(camera.isoSensitivity(), 100);
 
-    qreal minShutterSpeed = camera.minimumShutterSpeed();
-    qreal maxShutterSpeed = camera.maximumShutterSpeed();
-    QVERIFY(minShutterSpeed > 0);
-    QVERIFY(maxShutterSpeed > 0);
-    QVERIFY(camera.exposureTime() >= minShutterSpeed);
-    QVERIFY(camera.exposureTime() <= maxShutterSpeed);
+    qreal minExposureTime = camera.minimumExposureTime();
+    qreal maxExposureTime = camera.maximumExposureTime();
+    QVERIFY(minExposureTime > 0);
+    QVERIFY(maxExposureTime > 0);
+    QVERIFY(camera.exposureTime() >= minExposureTime);
+    QVERIFY(camera.exposureTime() <= maxExposureTime);
 
     camera.setAutoExposureTime();
-    QVERIFY(camera.exposureTime() >= minShutterSpeed);
-    QVERIFY(camera.exposureTime() <= maxShutterSpeed);
+    QVERIFY(camera.exposureTime() >= minExposureTime);
+    QVERIFY(camera.exposureTime() <= maxExposureTime);
 
     camera.setManualExposureTime(0);
-    QCOMPARE(camera.exposureTime(), minShutterSpeed);
+    QCOMPARE(camera.exposureTime(), minExposureTime);
 
     camera.setManualExposureTime(10000);
-    QCOMPARE(camera.exposureTime(), maxShutterSpeed);
+    QCOMPARE(camera.exposureTime(), maxExposureTime);
 
     camera.setAutoExposureTime();
 }
@@ -822,14 +822,14 @@ void tst_QCamera::testSignalShutterSpeedChanged()
     QCamera camera;
     session.setCamera(&camera);
 
-    QSignalSpy spySignalShutterSpeedChanged(&camera, SIGNAL(exposureTimeChanged(qreal)));
+    QSignalSpy spySignalExposureTimeChanged(&camera, SIGNAL(exposureTimeChanged(float)));
 
-    QVERIFY(spySignalShutterSpeedChanged.count() ==0);
+    QVERIFY(spySignalExposureTimeChanged.count() ==0);
 
     camera.setManualExposureTime(2.0);//set the ManualShutterSpeed to 2.0
     QTest::qWait(100);
 
-    QVERIFY(spySignalShutterSpeedChanged.count() ==1);
+    QVERIFY(spySignalExposureTimeChanged.count() ==1);
 }
 
 void tst_QCamera::testSignalFlashReady()