Convert QLightSensor::fieldOfView to a proper property

Change-Id: Ic6e5388e0cbc2a0045157873c05aa241ffe5e82d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

3 files changed, 8 insertions, 10 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index b6f724a..88f61f9 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -107,6 +107,10 @@ Module {
         prototype: "QmlSensor"
         exports: ["LightSensor 5.0", "LightSensor 5.1"]
         Property { name: "fieldOfView"; type: "double"; isReadonly: true }
+        Signal {
+            name: "fieldOfViewChanged"
+            Parameter { name: "fieldOfView"; type: "double" }
+        }
     }
     Component {
         name: "QmlLightSensorReading"
diff --git a/src/imports/sensors/qmllightsensor.cpp b/src/imports/sensors/qmllightsensor.cpp
index 1c3fed2..86126a2 100644
--- a/src/imports/sensors/qmllightsensor.cpp
+++ b/src/imports/sensors/qmllightsensor.cpp
@@ -63,6 +63,8 @@ QmlLightSensor::QmlLightSensor(QObject *parent)
     : QmlSensor(parent)
     , m_sensor(new QLightSensor(this))
 {
+    connect(m_sensor, SIGNAL(fieldOfViewChanged(qreal)),
+            this, SIGNAL(fieldOfViewChanged(qreal)));
 }
 
 QmlLightSensor::~QmlLightSensor()
@@ -88,13 +90,7 @@ QSensor *QmlLightSensor::sensor() const
 
 qreal QmlLightSensor::fieldOfView() const
 {
-    return m_sensor->property("fieldOfView").value<qreal>();
-}
-
-void QmlLightSensor::_update()
-{
-    if (fieldOfView() != qreal())
-        Q_EMIT fieldOfViewChanged();
+    return m_sensor->fieldOfView();
 }
 
 /*!
diff --git a/src/imports/sensors/qmllightsensor.h b/src/imports/sensors/qmllightsensor.h
index de7e394..e42d781 100644
--- a/src/imports/sensors/qmllightsensor.h
+++ b/src/imports/sensors/qmllightsensor.h
@@ -58,13 +58,11 @@ public:
 
     qreal fieldOfView() const;
 
-
 Q_SIGNALS:
-    void fieldOfViewChanged();
+    void fieldOfViewChanged(qreal fieldOfView);
 
 private:
     QSensor *sensor() const Q_DECL_OVERRIDE;
-    void _update();
     QLightSensor *m_sensor;
     QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
 };