--- a/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -53,7 +53,7 @@
initSensor<ProximitySensorChannelInterface>("proximitysensor");
if (m_sensorInterface)
- QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const int&)), this, SLOT(slotDataAvailable(const int&)));
+ QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const Unsigned&)), this, SLOT(slotDataAvailable(const Unsigned&)));
else
qWarning() << "Unable to initialize proximity sensor.";
@@ -67,16 +67,14 @@
}
}
-void maemo6proximitysensor::slotDataAvailable(const int& data)
+void maemo6proximitysensor::slotDataAvailable(const Unsigned& data)
{
bool close;
- if (data)
+ if (data.x())
close = true;
else
close = false;
-
m_reading.setClose(close);
- //m_reading.setTimestamp(data.timestamp());
- m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+ m_reading.setTimestamp(data.UnsignedData().timestamp_);
newReadingAvailable();
}