From f2b41709db56eaf297d80b9e5dee6a6ea40b9228 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sat, 27 Oct 2012 08:32:44 +1000 Subject: move irprox sensor to proper place in QSensor Change-Id: Ie386282010244d91e365ea86ccf8ec5a5c5329dc Reviewed-by: Lorn Potter --- plugins/declarative/sensors/sensors.cpp | 28 ++--- plugins/sensors/meego/meego.pri | 6 +- plugins/sensors/meego/qirproximitysensor.cpp | 153 --------------------------- plugins/sensors/meego/qirproximitysensor.h | 82 -------------- plugins/sensors/meego/qirproximitysensor_p.h | 78 -------------- src/sensors/qirproximitysensor.cpp | 153 +++++++++++++++++++++++++++ src/sensors/qirproximitysensor.h | 82 ++++++++++++++ src/sensors/qirproximitysensor_p.h | 78 ++++++++++++++ src/sensors/sensors.pro | 8 +- 9 files changed, 336 insertions(+), 332 deletions(-) delete mode 100644 plugins/sensors/meego/qirproximitysensor.cpp delete mode 100644 plugins/sensors/meego/qirproximitysensor.h delete mode 100644 plugins/sensors/meego/qirproximitysensor_p.h create mode 100644 src/sensors/qirproximitysensor.cpp create mode 100644 src/sensors/qirproximitysensor.h create mode 100644 src/sensors/qirproximitysensor_p.h diff --git a/plugins/declarative/sensors/sensors.cpp b/plugins/declarative/sensors/sensors.cpp index d4ee8751b0..ffc4cee4d6 100644 --- a/plugins/declarative/sensors/sensors.cpp +++ b/plugins/declarative/sensors/sensors.cpp @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -117,31 +118,34 @@ public: major = 1; minor = 3; - qmlRegisterUncreatableType(package, major, minor, "Sensor", QLatin1String("Cannot create Sensor ")); - qmlRegisterUncreatableType(package, major, minor, "SensorReading", QLatin1String("Cannot create Sensor Reading")); + qmlRegisterUncreatableType(package, major, minor, "Sensor", QLatin1String("Cannot create Sensor")); + qmlRegisterUncreatableType(package, major, minor, "SensorReading", QLatin1String("Cannot create SensorReading")); qmlRegisterType (package, major, minor, "Accelerometer"); - qmlRegisterUncreatableType(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create Accele rometerReading")); + qmlRegisterUncreatableType(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create AccelerometerReading")); qmlRegisterType (package, major, minor, "AmbientLightSensor"); - qmlRegisterUncreatableType(package, major, minor, "AmbientLightReading", QLatin1String("Cannot create Ambien tLightReading")); + qmlRegisterUncreatableType(package, major, minor, "AmbientLightReading", QLatin1String("Cannot create AmbientLightReading")); qmlRegisterType (package, major, minor, "Compass"); - qmlRegisterUncreatableType(package, major, minor, "CompassReading", QLatin1String("Cannot create Compas sReading")); + qmlRegisterUncreatableType(package, major, minor, "CompassReading", QLatin1String("Cannot create CompassReading")); + qmlRegisterType (package, major, minor, "IRProximitySensor"); + qmlRegisterUncreatableType(package, major, minor, "IRProximityReading", QLatin1String("Cannot create IRProximityReading")); qmlRegisterType (package, major, minor, "Magnetometer"); - qmlRegisterUncreatableType(package, major, minor, "MagnetometerReading", QLatin1String("Cannot create Magnet ometerReading")); + qmlRegisterUncreatableType(package, major, minor, "MagnetometerReading", QLatin1String("Cannot create MagnetometerReading")); qmlRegisterType (package, major, minor, "OrientationSensor"); - qmlRegisterUncreatableType(package, major, minor, "OrientationReading", QLatin1String("Cannot create Orient ationReading")); + qmlRegisterUncreatableType(package, major, minor, "OrientationReading", QLatin1String("Cannot create OrientationReading")); qmlRegisterType (package, major, minor, "ProximitySensor"); - qmlRegisterUncreatableType(package, major, minor, "ProximityReading", QLatin1String("Cannot create Proxim ityReading")); + qmlRegisterUncreatableType(package, major, minor, "ProximityReading", QLatin1String("Cannot create ProximityReading")); qmlRegisterType (package, major, minor, "RotationSensor"); - qmlRegisterUncreatableType(package, major, minor, "RotationReading", QLatin1String("Cannot create Rotati onReading")); + qmlRegisterUncreatableType(package, major, minor, "RotationReading", QLatin1String("Cannot create RotationReading")); qmlRegisterType (package, major, minor, "TapSensor"); - qmlRegisterUncreatableType(package, major, minor, "TapReading", QLatin1String("Cannot create TapRea ding")); + qmlRegisterUncreatableType(package, major, minor, "TapReading", QLatin1String("Cannot create TapReading")); qmlRegisterType (package, major, minor, "LightSensor"); - qmlRegisterUncreatableType(package, major, minor, "LightReading", QLatin1String("Cannot create LightR eading")); + qmlRegisterUncreatableType(package, major, minor, "LightReading", QLatin1String("Cannot create LightReading")); qmlRegisterType (package, major, minor, "Gyroscope"); - qmlRegisterUncreatableType(package, major, minor, "GyroscopeReading", QLatin1String("Cannot create Gyrosc opeReading")); + qmlRegisterUncreatableType(package, major, minor, "GyroscopeReading", QLatin1String("Cannot create GyroscopeReading")); qmlRegisterType (package, major, minor, "SensorGesture"); + } }; diff --git a/plugins/sensors/meego/meego.pri b/plugins/sensors/meego/meego.pri index 11b1806e5f..76e230e1c2 100644 --- a/plugins/sensors/meego/meego.pri +++ b/plugins/sensors/meego/meego.pri @@ -9,9 +9,8 @@ HEADERS += meegosensorbase.h \ meegorotationsensor.h \ meegotapsensor.h \ meegolightsensor.h \ - meegoirproximitysensor.h \ - qirproximitysensor.h \ - qirproximitysensor_p.h \ + meegoirproximitysensor.h + SOURCES += meegosensorbase.cpp \ meegoaccelerometer.cpp \ @@ -25,5 +24,4 @@ SOURCES += meegosensorbase.cpp \ meegorotationsensor.cpp \ meegotapsensor.cpp \ meegolightsensor.cpp \ - qirproximitysensor.cpp \ main.cpp diff --git a/plugins/sensors/meego/qirproximitysensor.cpp b/plugins/sensors/meego/qirproximitysensor.cpp deleted file mode 100644 index 11572335b7..0000000000 --- a/plugins/sensors/meego/qirproximitysensor.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Mobility Components. -** -** $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 -#include "qirproximitysensor_p.h" - -QTM_BEGIN_NAMESPACE - -IMPLEMENT_READING(QIRProximityReading) - -/*! - \class QIRProximityReading - \ingroup sensors_reading - \inmodule QtSensors - - \brief The QIRProximityReading class holds readings from the IR proximity sensor. - - The IR (infra-red) proximity sensor detects proximity by beaming out infra-red light - and detecting how much of the light returns. - - The biggest limitation of this technology is that there is no reliable way to turn the - reflectance values into distances unless both the item being detected and the ambient - conditions are known. - - \section2 QIRProximityReading Units - - The sensor reports reflectance as a percentage. That is, 0 indicates nothing was detected - within the range of the sensor and 100 indicates the infra-red signal returned at the full - power level that it was sent at. -*/ - -/*! - \property QIRProximityReading::reflectance - \brief Holds the reflectance value. - - The reflectance is a percentage (from 0 to 100) indicating how much of the transmitted - infra-red light was returned. - - \sa {QIRProximityReading Units} -*/ -qreal QIRProximityReading::reflectance() const -{ - return d->reflectance; -} - -/*! - Sets the reflectance value to \a reflectance. -*/ -void QIRProximityReading::setReflectance(qreal reflectance) -{ - d->reflectance = reflectance; -} - -// ===================================================================== - -/*! - \class QIRProximityFilter - \ingroup sensors_filter - \inmodule QtSensors - - \brief The QIRProximityFilter class is a convenience wrapper around QSensorFilter. - - The only difference is that the filter() method features a pointer to QIRProximityReading - instead of QSensorReading. -*/ - -/*! - \fn QIRProximityFilter::filter(QIRProximityReading *reading) - - Called when \a reading changes. Returns false to prevent the reading from propagating. - - \sa QSensorFilter::filter() -*/ - -char const * const QIRProximitySensor::type("QIRProximitySensor"); - -/*! - \class QIRProximitySensor - \ingroup sensors_type - \inmodule QtSensors - - \brief The QIRProximitySensor class is a convenience wrapper around QSensor. - - The only behavioural difference is that this class sets the type properly. - - This class also features a reading() function that returns a QIRProximityReading instead of a QSensorReading. - - For details about how the sensor works, see \l QIRProximityReading. - - \sa QIRProximityReading -*/ - -/*! - \fn QIRProximitySensor::QIRProximitySensor(QObject *parent) - - Construct the sensor as a child of \a parent. -*/ - -/*! - \fn QIRProximitySensor::~QIRProximitySensor() - - Destroy the sensor. Stops the sensor if it has not already been stopped. -*/ - -/*! - \fn QIRProximitySensor::reading() const - - Returns the reading class for this sensor. - - \sa QSensor::reading() -*/ - - -#include "moc_qirproximitysensor.cpp" -QTM_END_NAMESPACE diff --git a/plugins/sensors/meego/qirproximitysensor.h b/plugins/sensors/meego/qirproximitysensor.h deleted file mode 100644 index 83b7ee7f24..0000000000 --- a/plugins/sensors/meego/qirproximitysensor.h +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Mobility Components. -** -** $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 QIRPROXIMITYSENSOR_H -#define QIRPROXIMITYSENSOR_H - -#include - -QTM_BEGIN_NAMESPACE - -class QIRProximityReadingPrivate; - -class Q_SENSORS_EXPORT QIRProximityReading : public QSensorReading -{ - Q_OBJECT - Q_PROPERTY(qreal reflectance READ reflectance) - DECLARE_READING(QIRProximityReading) -public: - qreal reflectance() const; - void setReflectance(qreal reflectance); -}; - -class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter -{ -public: - virtual bool filter(QIRProximityReading *reading) = 0; -private: - bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } -}; - -class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor -{ - Q_OBJECT -public: - explicit QIRProximitySensor(QObject *parent = 0) : QSensor(QIRProximitySensor::type, parent) {} - virtual ~QIRProximitySensor() {} - QIRProximityReading *reading() const { return static_cast(QSensor::reading()); } - static char const * const type; -}; - -QTM_END_NAMESPACE - -#endif - diff --git a/plugins/sensors/meego/qirproximitysensor_p.h b/plugins/sensors/meego/qirproximitysensor_p.h deleted file mode 100644 index b595f12430..0000000000 --- a/plugins/sensors/meego/qirproximitysensor_p.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Mobility Components. -** -** $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 QIRPROXIMITYSENSOR_P_H -#define QIRPROXIMITYSENSOR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -QTM_BEGIN_NAMESPACE - -class QIRProximityReadingPrivate -{ -public: - QIRProximityReadingPrivate() - : reflectance(0) - { - } - - - - /* - * Note that this class is copied so you may need to implement - * a copy constructor if you have complex types or pointers - * as values. - */ - qreal reflectance; -}; - -QTM_END_NAMESPACE - -#endif diff --git a/src/sensors/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp new file mode 100644 index 0000000000..11572335b7 --- /dev/null +++ b/src/sensors/qirproximitysensor.cpp @@ -0,0 +1,153 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Mobility Components. +** +** $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 +#include "qirproximitysensor_p.h" + +QTM_BEGIN_NAMESPACE + +IMPLEMENT_READING(QIRProximityReading) + +/*! + \class QIRProximityReading + \ingroup sensors_reading + \inmodule QtSensors + + \brief The QIRProximityReading class holds readings from the IR proximity sensor. + + The IR (infra-red) proximity sensor detects proximity by beaming out infra-red light + and detecting how much of the light returns. + + The biggest limitation of this technology is that there is no reliable way to turn the + reflectance values into distances unless both the item being detected and the ambient + conditions are known. + + \section2 QIRProximityReading Units + + The sensor reports reflectance as a percentage. That is, 0 indicates nothing was detected + within the range of the sensor and 100 indicates the infra-red signal returned at the full + power level that it was sent at. +*/ + +/*! + \property QIRProximityReading::reflectance + \brief Holds the reflectance value. + + The reflectance is a percentage (from 0 to 100) indicating how much of the transmitted + infra-red light was returned. + + \sa {QIRProximityReading Units} +*/ +qreal QIRProximityReading::reflectance() const +{ + return d->reflectance; +} + +/*! + Sets the reflectance value to \a reflectance. +*/ +void QIRProximityReading::setReflectance(qreal reflectance) +{ + d->reflectance = reflectance; +} + +// ===================================================================== + +/*! + \class QIRProximityFilter + \ingroup sensors_filter + \inmodule QtSensors + + \brief The QIRProximityFilter class is a convenience wrapper around QSensorFilter. + + The only difference is that the filter() method features a pointer to QIRProximityReading + instead of QSensorReading. +*/ + +/*! + \fn QIRProximityFilter::filter(QIRProximityReading *reading) + + Called when \a reading changes. Returns false to prevent the reading from propagating. + + \sa QSensorFilter::filter() +*/ + +char const * const QIRProximitySensor::type("QIRProximitySensor"); + +/*! + \class QIRProximitySensor + \ingroup sensors_type + \inmodule QtSensors + + \brief The QIRProximitySensor class is a convenience wrapper around QSensor. + + The only behavioural difference is that this class sets the type properly. + + This class also features a reading() function that returns a QIRProximityReading instead of a QSensorReading. + + For details about how the sensor works, see \l QIRProximityReading. + + \sa QIRProximityReading +*/ + +/*! + \fn QIRProximitySensor::QIRProximitySensor(QObject *parent) + + Construct the sensor as a child of \a parent. +*/ + +/*! + \fn QIRProximitySensor::~QIRProximitySensor() + + Destroy the sensor. Stops the sensor if it has not already been stopped. +*/ + +/*! + \fn QIRProximitySensor::reading() const + + Returns the reading class for this sensor. + + \sa QSensor::reading() +*/ + + +#include "moc_qirproximitysensor.cpp" +QTM_END_NAMESPACE diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h new file mode 100644 index 0000000000..83b7ee7f24 --- /dev/null +++ b/src/sensors/qirproximitysensor.h @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Mobility Components. +** +** $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 QIRPROXIMITYSENSOR_H +#define QIRPROXIMITYSENSOR_H + +#include + +QTM_BEGIN_NAMESPACE + +class QIRProximityReadingPrivate; + +class Q_SENSORS_EXPORT QIRProximityReading : public QSensorReading +{ + Q_OBJECT + Q_PROPERTY(qreal reflectance READ reflectance) + DECLARE_READING(QIRProximityReading) +public: + qreal reflectance() const; + void setReflectance(qreal reflectance); +}; + +class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter +{ +public: + virtual bool filter(QIRProximityReading *reading) = 0; +private: + bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } +}; + +class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor +{ + Q_OBJECT +public: + explicit QIRProximitySensor(QObject *parent = 0) : QSensor(QIRProximitySensor::type, parent) {} + virtual ~QIRProximitySensor() {} + QIRProximityReading *reading() const { return static_cast(QSensor::reading()); } + static char const * const type; +}; + +QTM_END_NAMESPACE + +#endif + diff --git a/src/sensors/qirproximitysensor_p.h b/src/sensors/qirproximitysensor_p.h new file mode 100644 index 0000000000..b595f12430 --- /dev/null +++ b/src/sensors/qirproximitysensor_p.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Mobility Components. +** +** $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 QIRPROXIMITYSENSOR_P_H +#define QIRPROXIMITYSENSOR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QTM_BEGIN_NAMESPACE + +class QIRProximityReadingPrivate +{ +public: + QIRProximityReadingPrivate() + : reflectance(0) + { + } + + + + /* + * Note that this class is copied so you may need to implement + * a copy constructor if you have complex types or pointers + * as values. + */ + qreal reflectance; +}; + +QTM_END_NAMESPACE + +#endif diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index fe5b59fc64..3c16db72bf 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -34,16 +34,17 @@ DEPENDPATH += . PUBLIC_HEADERS += \ qsensorbackend.h\ qsensormanager.h\ - qsensorplugin.h\ + qsensorplugin.h PRIVATE_HEADERS += \ qsensorpluginloader_p.h\ - sensorlog_p.h\ + sensorlog_p.h SOURCES += qsensorbackend.cpp\ qsensormanager.cpp\ qsensorplugin.cpp\ - qsensorpluginloader.cpp\ + qsensorpluginloader.cpp + # 3 files per sensor (including QSensor) SENSORS=\ @@ -58,6 +59,7 @@ SENSORS=\ qrotationsensor\ qtapsensor\ qgyroscope\ + qirproximitysensor for(s,SENSORS) { # Client API -- cgit v1.2.3