--- a/qtmobility/src/sensors/qproximitysensor.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/sensors/qproximitysensor.h Mon May 03 13:18:40 2010 +0300
@@ -51,22 +51,13 @@
class Q_SENSORS_EXPORT QProximityReading : public QSensorReading
{
Q_OBJECT
- Q_ENUMS(Proximity)
- Q_PROPERTY(Proximity proximity READ proximity)
+ Q_PROPERTY(bool close READ close)
DECLARE_READING(QProximityReading)
public:
- enum Proximity {
- Undefined = 0,
- Close,
- NotClose
- };
-
- Proximity proximity() const;
- void setProximity(Proximity proximity);
+ bool close() const;
+ void setClose(bool close);
};
-// begin generated code
-
class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter
{
public:
@@ -79,13 +70,11 @@
{
Q_OBJECT
public:
- explicit QProximitySensor(QObject *parent = 0) : QSensor(parent)
- { setType(QProximitySensor::type); }
+ explicit QProximitySensor(QObject *parent = 0) : QSensor(QProximitySensor::type, parent) {}
virtual ~QProximitySensor() {}
QProximityReading *reading() const { return static_cast<QProximityReading*>(QSensor::reading()); }
static const char *type;
};
-// end generated code
QTM_END_NAMESPACE