Add a QAmbientTemperatureSensor class.

Port the Blackberry backend to use it.

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

5 files changed, 236 insertions, 0 deletions

diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index bd879f8..974f714 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -56,6 +56,17 @@ Module {
         Property { name: "lightLevel"; type: "QAmbientLightReading::LightLevel"; isReadonly: true }
     }
     Component {
+        name: "QmlAmbientTemperatureReading"
+        prototype: "QmlSensorReading"
+        exports: ["AmbientTemperatureReading 5.1"]
+        Property { name: "temperature"; type: "double"; isReadonly: true }
+    }
+    Component {
+        name: "QmlAmbientTemperatureSensor"
+        prototype: "QmlSensor"
+        exports: ["AmbientTemperatureSensor 5.1"]
+    }
+    Component {
         name: "QmlCompass"
         prototype: "QmlSensor"
         exports: ["Compass 5.0", "Compass 5.1"]
diff --git a/src/imports/sensors/qmlambienttemperaturesensor.cpp b/src/imports/sensors/qmlambienttemperaturesensor.cpp
new file mode 100644
index 0000000..1190fca
--- /dev/null
+++ b/src/imports/sensors/qmlambienttemperaturesensor.cpp
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSensors module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include "qmlambienttemperaturesensor.h"
+#include <QAmbientTemperatureSensor>
+
+/*!
+    \qmltype AmbientTemperatureSensor
+    \instantiates QmlAmbientTemperatureSensor
+    \ingroup qml-sensors_type
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.1
+    \inherits Sensor
+    \brief The AmbientTemperatureSensor element reports on the ambient temperature.
+
+    The AmbientTemperatureSensor element reports on the ambient temperature.
+
+    This element wraps the QAmbientTemperatureSensor class. Please see the documentation for
+    QAmbientTemperatureSensor for details.
+
+    \sa AmbientTemperatureReading
+*/
+
+QmlAmbientTemperatureSensor::QmlAmbientTemperatureSensor(QObject *parent)
+    : QmlSensor(parent)
+    , m_sensor(new QAmbientTemperatureSensor(this))
+{
+}
+
+QmlAmbientTemperatureSensor::~QmlAmbientTemperatureSensor()
+{
+}
+
+QmlSensorReading *QmlAmbientTemperatureSensor::createReading() const
+{
+    return new QmlAmbientTemperatureReading(m_sensor);
+}
+
+QSensor *QmlAmbientTemperatureSensor::sensor() const
+{
+    return m_sensor;
+}
+
+/*!
+    \qmltype AmbientTemperatureReading
+    \instantiates QmlAmbientTemperatureReading
+    \ingroup qml-sensors_reading
+    \inqmlmodule QtSensors 5.0
+    \since QtSensors 5.1
+    \inherits SensorReading
+    \brief The AmbientTemperatureReading element holds the most recent temperature reading.
+
+    The AmbientTemperatureReading element holds the most recent temperature reading.
+
+    This element wraps the QAmbientTemperatureReading class. Please see the documentation for
+    QAmbientTemperatureReading for details.
+
+    This element cannot be directly created.
+*/
+
+QmlAmbientTemperatureReading::QmlAmbientTemperatureReading(QAmbientTemperatureSensor *sensor)
+    : QmlSensorReading(sensor)
+    , m_sensor(sensor)
+    , m_temperature(0)
+{
+}
+
+QmlAmbientTemperatureReading::~QmlAmbientTemperatureReading()
+{
+}
+
+/*!
+    \qmlproperty qreal AmbientTemperatureReading::temperature
+    This property holds the ambient temperature in degree Celsius.
+
+    Please see QAmbientTemperatureReading::temperature for information about this property.
+*/
+
+qreal QmlAmbientTemperatureReading::temperature() const
+{
+    return m_temperature;
+}
+
+QSensorReading *QmlAmbientTemperatureReading::reading() const
+{
+    return m_sensor->reading();
+}
+
+void QmlAmbientTemperatureReading::readingUpdate()
+{
+    const qreal temperature = m_sensor->reading()->temperature();
+    if (m_temperature != temperature) {
+        m_temperature = temperature;
+        Q_EMIT temperatureChanged();
+    }
+}
diff --git a/src/imports/sensors/qmlambienttemperaturesensor.h b/src/imports/sensors/qmlambienttemperaturesensor.h
new file mode 100644
index 0000000..1c1d8dd
--- /dev/null
+++ b/src/imports/sensors/qmlambienttemperaturesensor.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSensors module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QMLAMBIENTTEMPERATURESENSOR_H
+#define QMLAMBIENTTEMPERATURESENSOR_H
+
+#include "qmlsensor.h"
+
+QT_BEGIN_NAMESPACE
+
+class QAmbientTemperatureSensor;
+
+class QmlAmbientTemperatureSensor : public QmlSensor
+{
+    Q_OBJECT
+public:
+    explicit QmlAmbientTemperatureSensor(QObject *parent = 0);
+    ~QmlAmbientTemperatureSensor();
+
+private:
+    QSensor *sensor() const Q_DECL_OVERRIDE;
+    QmlSensorReading *createReading() const Q_DECL_OVERRIDE;
+
+    QAmbientTemperatureSensor *m_sensor;
+};
+
+class QmlAmbientTemperatureReading : public QmlSensorReading
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal temperature READ temperature NOTIFY temperatureChanged)
+public:
+    explicit QmlAmbientTemperatureReading(QAmbientTemperatureSensor *sensor);
+    ~QmlAmbientTemperatureReading();
+
+    qreal temperature() const;
+
+Q_SIGNALS:
+    void temperatureChanged();
+
+private:
+    QSensorReading *reading() const Q_DECL_OVERRIDE;
+    void readingUpdate() Q_DECL_OVERRIDE;
+
+    QAmbientTemperatureSensor *m_sensor;
+    qreal m_temperature;
+};
+
+QT_END_NAMESPACE
+#endif
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 725776e..77ad754 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -46,6 +46,7 @@
 #include <QtSensors/qaccelerometer.h>
 #include <QtSensors/qaltimeter.h>
 #include <QtSensors/qambientlightsensor.h>
+#include <QtSensors/qambienttemperaturesensor.h>
 #include <QtSensors/qcompass.h>
 #include <QtSensors/qmagnetometer.h>
 #include <QtSensors/qorientationsensor.h>
@@ -62,6 +63,7 @@
 #include "qmlaccelerometer.h"
 #include "qmlaltimeter.h"
 #include "qmlambientlightsensor.h"
+#include "qmlambienttemperaturesensor.h"
 #include "qmlcompass.h"
 #include "qmlgyroscope.h"
 #include "qmlholstersensor.h"
@@ -144,6 +146,8 @@ public:
         qmlRegisterUncreatableType<QmlAltimeterReading         >(package, major, minor, "AltimeterReading", QLatin1String("Cannot create AltimeterReading"));
         qmlRegisterType           <QmlAmbientLightSensor       >(package, major, minor, "AmbientLightSensor");
         qmlRegisterUncreatableType<QmlAmbientLightSensorReading>(package, major, minor, "AmbientLightReading",  QLatin1String("Cannot create AmbientLightReading"));
+        qmlRegisterType           <QmlAmbientTemperatureSensor >(package, major, minor, "AmbientTemperatureSensor");
+        qmlRegisterUncreatableType<QmlAmbientTemperatureReading>(package, major, minor, "AmbientTemperatureReading",  QLatin1String("Cannot create AmbientTemperatureReading"));
         qmlRegisterType           <QmlCompass                  >(package, major, minor, "Compass");
         qmlRegisterUncreatableType<QmlCompassReading           >(package, major, minor, "CompassReading",       QLatin1String("Cannot create CompassReading"));
         qmlRegisterType           <QmlGyroscope                >(package, major, minor, "Gyroscope");
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index 61994b0..2236ce1 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -11,6 +11,7 @@ HEADERS += \
     qmlaccelerometer.h \
     qmlaltimeter.h \
     qmlambientlightsensor.h \
+    qmlambienttemperaturesensor.h \
     qmlcompass.h \
     qmlgyroscope.h \
     qmlholstersensor.h \
@@ -32,6 +33,7 @@ SOURCES += sensors.cpp \
     qmlaccelerometer.cpp \
     qmlaltimeter.cpp \
     qmlambientlightsensor.cpp \
+    qmlambienttemperaturesensor.cpp \
     qmlcompass.cpp \
     qmlgyroscope.cpp \
     qmlholstersensor.cpp \