Convert QMagnetometer::returnGeoValues to a proper property

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

3 files changed, 39 insertions, 5 deletions

diff --git a/src/sensors/qmagnetometer.cpp b/src/sensors/qmagnetometer.cpp
index 60b2df83..f5f563aa 100644
--- a/src/sensors/qmagnetometer.cpp
+++ b/src/sensors/qmagnetometer.cpp
@@ -210,7 +210,7 @@ char const * const QMagnetometer::type("QMagnetometer");
     Construct the sensor as a child of \a parent.
 */
 QMagnetometer::QMagnetometer(QObject *parent)
-    : QSensor(QMagnetometer::type, parent)
+    : QSensor(QMagnetometer::type, *new QMagnetometerPrivate, parent)
 {
 }
 
@@ -236,10 +236,24 @@ QMagnetometer::~QMagnetometer()
     Set to true to return geomagnetic flux density.
     Set to false (the default) to return raw magnetic flux density.
 
-    Note that you must access this property via QObject::property() and QObject::setProperty().
     The property must be set before calling start().
 */
 
+bool QMagnetometer::returnGeoValues() const
+{
+    Q_D(const QMagnetometer);
+    return d->returnGeoValues;
+}
+
+void QMagnetometer::setReturnGeoValues(bool returnGeoValues)
+{
+    Q_D(QMagnetometer);
+    if (d->returnGeoValues != returnGeoValues) {
+        d->returnGeoValues = returnGeoValues;
+        emit returnGeoValuesChanged(returnGeoValues);
+    }
+}
+
 #include "moc_qmagnetometer.cpp"
 QT_END_NAMESPACE
 
diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h
index b4ed56ad..93b6157f 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -78,19 +78,26 @@ private:
     bool filter(QSensorReading *reading) { return filter(static_cast<QMagnetometerReading*>(reading)); }
 };
 
+class QMagnetometerPrivate;
+
 class Q_SENSORS_EXPORT QMagnetometer : public QSensor
 {
     Q_OBJECT
-#ifdef Q_QDOC
-    Q_PROPERTY(bool returnGeoValues)
-#endif
+    Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged)
 public:
     explicit QMagnetometer(QObject *parent = 0);
     virtual ~QMagnetometer();
     QMagnetometerReading *reading() const { return static_cast<QMagnetometerReading*>(QSensor::reading()); }
     static char const * const type;
 
+    bool returnGeoValues() const;
+    void setReturnGeoValues(bool returnGeoValues);
+
+Q_SIGNALS:
+    void returnGeoValuesChanged(bool returnGeoValues);
+
 private:
+    Q_DECLARE_PRIVATE(QMagnetometer)
     Q_DISABLE_COPY(QMagnetometer)
 };
 
diff --git a/src/sensors/qmagnetometer_p.h b/src/sensors/qmagnetometer_p.h
index 9ac824c1..3c38e6c8 100644
--- a/src/sensors/qmagnetometer_p.h
+++ b/src/sensors/qmagnetometer_p.h
@@ -53,8 +53,21 @@
 // We mean it.
 //
 
+#include "qsensor_p.h"
+
 QT_BEGIN_NAMESPACE
 
+class QMagnetometerPrivate : public QSensorPrivate
+{
+public:
+    QMagnetometerPrivate()
+        : returnGeoValues(false)
+    {
+    }
+
+    bool returnGeoValues;
+};
+
 class QMagnetometerReadingPrivate
 {
 public: