QtMobility.sensors has a new implementation

This implementation fixes the limitations the original code had
and separates the QtSensors C++ API from the QML API so that
changes to one don't need to affect the other.

Change-Id: I519463f3c7cfbad3bce5c291ce166b8793d5ed4a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

1 files changed, 119 insertions, 0 deletions

diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp
new file mode 100644
index 00000000..5c9723af
--- /dev/null
+++ b/src/imports/sensors/qmlsensorglobal.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** 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 "qmlsensorglobal.h"
+#include <QSensor>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmltype SensorGlobal
+    \instantiates QmlSensorGlobal
+    \inqmlmodule QtMobility.sensors 1.3
+    \since QtMobility.sensors 1.3
+    \brief The SensorGlobal element provides the module API.
+
+    The SensorGlobal element provides the module API.
+
+    This element cannot be directly created. It can only be accessed via a namespace import.
+
+    \code
+    import QtMobility.sensors 1.3
+    import QtMobility.sensors 1.3 as Sensors
+    ...
+        Component.onCompleted: {
+            var types = Sensors.sensorTypes();
+            console.log(types.join(", "));
+        }
+    \endcode
+*/
+
+QmlSensorGlobal::QmlSensorGlobal(QObject *parent)
+    : QObject(parent)
+    , m_sensor(new QSensor(QByteArray(), this))
+{
+    connect(m_sensor, SIGNAL(availableSensorsChanged()), this, SIGNAL(availableSensorsChanged()));
+}
+
+QmlSensorGlobal::~QmlSensorGlobal()
+{
+}
+
+/*!
+    \qmlmethod list<string> QtMobility.sensors1::SensorGlobal::sensorTypes()
+    Returns a list of the sensor types that have been registered.
+
+    Please see QSensor::sensorTypes() for information.
+*/
+QStringList QmlSensorGlobal::sensorTypes() const
+{
+    QStringList ret;
+    foreach (const QByteArray &type, QSensor::sensorTypes())
+        ret << QString::fromLocal8Bit(type);
+    return ret;
+}
+
+/*!
+    \qmlmethod list<string> QtMobility.sensors1::SensorGlobal::sensorsForType(type)
+    Returns a list of the sensor identifiers that have been registered for \a type.
+
+    Please see QSensor::sensorsForType() for information.
+*/
+QStringList QmlSensorGlobal::sensorsForType(const QString &type) const
+{
+    QStringList ret;
+    foreach (const QByteArray &identifier, QSensor::sensorsForType(type.toLocal8Bit()))
+        ret << QString::fromLocal8Bit(identifier);
+    return ret;
+}
+
+/*!
+    \qmlmethod string QtMobility.sensors1::SensorGlobal::defaultSensorForType(type)
+    Returns the default sensor identifier that has been registered for \a type.
+
+    Please see QSensor::defaultSensorForType() for information.
+*/
+QString QmlSensorGlobal::defaultSensorForType(const QString &type) const
+{
+    return QString::fromLocal8Bit(QSensor::defaultSensorForType(type.toLocal8Bit()));
+}
+
+QT_END_NAMESPACE