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>

3 files changed, 25 insertions, 20 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;
 };