flag for maemo6 features + warnings removed

24 files changed, 46 insertions, 36 deletions

diff --git a/plugins/sensors/meego/meegoaccelerometer.cpp b/plugins/sensors/meego/meegoaccelerometer.cpp
index f3d519abfa..3813547dd2 100644
--- a/plugins/sensors/meego/meegoaccelerometer.cpp
+++ b/plugins/sensors/meego/meegoaccelerometer.cpp
@@ -78,9 +78,9 @@ bool meegoaccelerometer::doConnect(){
 }
 
 
-const QString meegoaccelerometer::sensorName(){
+QString meegoaccelerometer::sensorName() const{
     return "accelerometersensor";
 }
 
 
-const qreal meegoaccelerometer::correctionFactor(){return GRAVITY_EARTH_THOUSANDTH;}
+qreal meegoaccelerometer::correctionFactor() const{return GRAVITY_EARTH_THOUSANDTH;}
diff --git a/plugins/sensors/meego/meegoaccelerometer.h b/plugins/sensors/meego/meegoaccelerometer.h
index d34a45a918..357fbe2d8a 100644
--- a/plugins/sensors/meego/meegoaccelerometer.h
+++ b/plugins/sensors/meego/meegoaccelerometer.h
@@ -59,8 +59,8 @@ public:
     meegoaccelerometer(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
-    virtual const qreal correctionFactor();
+    virtual QString sensorName() const;
+    virtual qreal correctionFactor() const;
 
 
 private:
diff --git a/plugins/sensors/meego/meegoals.cpp b/plugins/sensors/meego/meegoals.cpp
index 65d54b6d73..65d008d749 100644
--- a/plugins/sensors/meego/meegoals.cpp
+++ b/plugins/sensors/meego/meegoals.cpp
@@ -80,7 +80,7 @@ bool meegoals::doConnect(){
 }
 
 
-const QString meegoals::sensorName(){
+QString meegoals::sensorName() const{
     return "alssensor";
 }
 
diff --git a/plugins/sensors/meego/meegoals.h b/plugins/sensors/meego/meegoals.h
index 0465bd3f36..4bfa093b90 100644
--- a/plugins/sensors/meego/meegoals.h
+++ b/plugins/sensors/meego/meegoals.h
@@ -59,7 +59,7 @@ public:
     meegoals(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
     virtual void start();
 
 
diff --git a/plugins/sensors/meego/meegocompass.cpp b/plugins/sensors/meego/meegocompass.cpp
index 8d07be7e62..2b8d6ad796 100644
--- a/plugins/sensors/meego/meegocompass.cpp
+++ b/plugins/sensors/meego/meegocompass.cpp
@@ -71,7 +71,7 @@ bool meegocompass::doConnect(){
                             this, SLOT(slotDataAvailable(const Compass&)));
 }
 
-const QString meegocompass::sensorName(){
+QString meegocompass::sensorName() const{
     return "compasssensor";
 }
 
diff --git a/plugins/sensors/meego/meegocompass.h b/plugins/sensors/meego/meegocompass.h
index e2c7cf34fa..f8c192a073 100644
--- a/plugins/sensors/meego/meegocompass.h
+++ b/plugins/sensors/meego/meegocompass.h
@@ -59,7 +59,7 @@ public:
     meegocompass(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
 
 private:
     QCompassReading m_reading;
diff --git a/plugins/sensors/meego/meegogyroscope.cpp b/plugins/sensors/meego/meegogyroscope.cpp
index 317ea1daf3..1514ee0a6e 100644
--- a/plugins/sensors/meego/meegogyroscope.cpp
+++ b/plugins/sensors/meego/meegogyroscope.cpp
@@ -78,8 +78,8 @@ bool meegogyroscope::doConnect(){
     return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<XYZ>& )),this, SLOT(slotFrameAvailable(const QVector<XYZ>& )));
 }
 
-const QString meegogyroscope::sensorName(){
+QString meegogyroscope::sensorName() const{
     return "gyroscopesensor";
 }
 
-const qreal meegogyroscope::correctionFactor(){return MILLI;}
+qreal meegogyroscope::correctionFactor() const{return MILLI;}
diff --git a/plugins/sensors/meego/meegogyroscope.h b/plugins/sensors/meego/meegogyroscope.h
index 6048e9bbe2..4887ecfd60 100644
--- a/plugins/sensors/meego/meegogyroscope.h
+++ b/plugins/sensors/meego/meegogyroscope.h
@@ -59,8 +59,8 @@ public:
     meegogyroscope(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
-    virtual const qreal correctionFactor();
+    virtual QString sensorName() const;
+    virtual qreal correctionFactor() const;
 
 
 private:
diff --git a/plugins/sensors/meego/meegoirproximitysensor.cpp b/plugins/sensors/meego/meegoirproximitysensor.cpp
index 14a605f06b..379297bfe0 100644
--- a/plugins/sensors/meego/meegoirproximitysensor.cpp
+++ b/plugins/sensors/meego/meegoirproximitysensor.cpp
@@ -58,21 +58,25 @@ meegoirproximitysensor::meegoirproximitysensor(QSensor *sensor)
     rangeMax = QFile::exists(RM680_PS)?255:1023;
 }
 
-
+#ifdef Q_WS_MAEMO_6
 void meegoirproximitysensor::slotDataAvailable(const Proximity& proximity){
     m_reading.setReflectance((float)proximity.reflectance()*100 / rangeMax);
     m_reading.setTimestamp(proximity.UnsignedData().timestamp_);
     newReadingAvailable();
 }
+#endif
 
 
 bool meegoirproximitysensor::doConnect(){
+#ifdef Q_WS_MAEMO_6
     return QObject::connect(m_sensorInterface, SIGNAL(reflectanceDataAvailable(const Proximity&)),
                             this, SLOT(slotDataAvailable(const Proximity&)));
+#endif
+    return false;
 }
 
 
-const QString meegoirproximitysensor::sensorName(){
+QString meegoirproximitysensor::sensorName() const{
     return "proximitysensor";
 }
 
diff --git a/plugins/sensors/meego/meegoirproximitysensor.h b/plugins/sensors/meego/meegoirproximitysensor.h
index a7b25242ad..7625e05487 100644
--- a/plugins/sensors/meego/meegoirproximitysensor.h
+++ b/plugins/sensors/meego/meegoirproximitysensor.h
@@ -59,7 +59,7 @@ public:
     meegoirproximitysensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
 
 private:
     QIRProximityReading m_reading;
@@ -67,7 +67,9 @@ private:
     int rangeMax;
 
 private slots:
+#ifdef Q_WS_MAEMO_6
     void slotDataAvailable(const Proximity& proximity);
+#endif
 };
 
 #endif
diff --git a/plugins/sensors/meego/meegolightsensor.cpp b/plugins/sensors/meego/meegolightsensor.cpp
index cd2dc0f0a1..7793f136b8 100644
--- a/plugins/sensors/meego/meegolightsensor.cpp
+++ b/plugins/sensors/meego/meegolightsensor.cpp
@@ -64,6 +64,6 @@ bool meegolightsensor::doConnect(){
 }
 
 
-const QString meegolightsensor::sensorName(){
+QString meegolightsensor::sensorName() const{
     return "alssensor";
 }
diff --git a/plugins/sensors/meego/meegolightsensor.h b/plugins/sensors/meego/meegolightsensor.h
index 4d77299869..b66cde2957 100644
--- a/plugins/sensors/meego/meegolightsensor.h
+++ b/plugins/sensors/meego/meegolightsensor.h
@@ -59,7 +59,7 @@ public:
     meegolightsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
 
 private:
     QLightReading m_reading;
diff --git a/plugins/sensors/meego/meegomagnetometer.cpp b/plugins/sensors/meego/meegomagnetometer.cpp
index 0fe43d8035..069fa815f1 100644
--- a/plugins/sensors/meego/meegomagnetometer.cpp
+++ b/plugins/sensors/meego/meegomagnetometer.cpp
@@ -91,8 +91,8 @@ bool meegomagnetometer::doConnect(){
      return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<MagneticField>& )),this, SLOT(slotFrameAvailable(const QVector<MagneticField>& )));
 }
 
-const QString meegomagnetometer::sensorName(){
+QString meegomagnetometer::sensorName() const{
     return "magnetometersensor";
 }
 
-const qreal meegomagnetometer::correctionFactor(){return meegomagnetometer::NANO;}
+qreal meegomagnetometer::correctionFactor() const{return meegomagnetometer::NANO;}
diff --git a/plugins/sensors/meego/meegomagnetometer.h b/plugins/sensors/meego/meegomagnetometer.h
index b95651a4e7..fd2f461f76 100644
--- a/plugins/sensors/meego/meegomagnetometer.h
+++ b/plugins/sensors/meego/meegomagnetometer.h
@@ -60,8 +60,8 @@ public:
 protected:
     virtual bool doConnect();
     virtual void start();
-    virtual const QString sensorName();
-    virtual const qreal correctionFactor();
+    virtual QString sensorName() const;
+    virtual qreal correctionFactor() const;
 
 
 private:
diff --git a/plugins/sensors/meego/meegoorientationsensor.cpp b/plugins/sensors/meego/meegoorientationsensor.cpp
index 2a4836ba90..9bc1d603c8 100644
--- a/plugins/sensors/meego/meegoorientationsensor.cpp
+++ b/plugins/sensors/meego/meegoorientationsensor.cpp
@@ -75,7 +75,7 @@ bool meegoorientationsensor::doConnect(){
                             this, SLOT(slotDataAvailable(const Unsigned&)));
 }
 
-const QString meegoorientationsensor::sensorName(){
+QString meegoorientationsensor::sensorName() const{
     return "orientationsensor";
 }
 
diff --git a/plugins/sensors/meego/meegoorientationsensor.h b/plugins/sensors/meego/meegoorientationsensor.h
index 038c71bec8..dd58fa8a0f 100644
--- a/plugins/sensors/meego/meegoorientationsensor.h
+++ b/plugins/sensors/meego/meegoorientationsensor.h
@@ -59,7 +59,7 @@ public:
     meegoorientationsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
     virtual void start();
 
 private:
diff --git a/plugins/sensors/meego/meegoproximitysensor.cpp b/plugins/sensors/meego/meegoproximitysensor.cpp
index 6d92139491..fb1c3bcb8b 100644
--- a/plugins/sensors/meego/meegoproximitysensor.cpp
+++ b/plugins/sensors/meego/meegoproximitysensor.cpp
@@ -45,7 +45,7 @@ char const * const meegoproximitysensor::id("meego.proximitysensor");
 bool meegoproximitysensor::m_initDone = false;
 
 meegoproximitysensor::meegoproximitysensor(QSensor *sensor)
-    : meegosensorbase(sensor)
+    : meegosensorbase(sensor), m_exClose(false)
 {
     initSensor<ProximitySensorChannelInterface>(m_initDone);
     setReading<QProximityReading>(&m_reading);
@@ -63,9 +63,12 @@ void meegoproximitysensor::start(){
 
 void meegoproximitysensor::slotDataAvailable(const Unsigned& data)
 {
+    bool close = data.x()? true: false;
+    if (close == m_exClose) return;
     m_reading.setClose(data.x()? true: false);
     m_reading.setTimestamp(data.UnsignedData().timestamp_);
     newReadingAvailable();
+    m_exClose = close;
 }
 
 bool meegoproximitysensor::doConnect(){
@@ -74,6 +77,6 @@ bool meegoproximitysensor::doConnect(){
 }
 
 
-const QString meegoproximitysensor::sensorName(){
+QString meegoproximitysensor::sensorName() const{
     return "proximitysensor";
 }
diff --git a/plugins/sensors/meego/meegoproximitysensor.h b/plugins/sensors/meego/meegoproximitysensor.h
index 6c45ee905e..285b43d785 100644
--- a/plugins/sensors/meego/meegoproximitysensor.h
+++ b/plugins/sensors/meego/meegoproximitysensor.h
@@ -59,13 +59,14 @@ public:
     meegoproximitysensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
     virtual void start();
 
 
 private:
     QProximityReading m_reading;
     static bool m_initDone;
+    bool m_exClose;
    
 private slots:
     void slotDataAvailable(const Unsigned& data);
diff --git a/plugins/sensors/meego/meegorotationsensor.cpp b/plugins/sensors/meego/meegorotationsensor.cpp
index 6619ae4372..38c285ee62 100644
--- a/plugins/sensors/meego/meegorotationsensor.cpp
+++ b/plugins/sensors/meego/meegorotationsensor.cpp
@@ -74,6 +74,6 @@ bool meegorotationsensor::doConnect(){
     return QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<XYZ>& )),this, SLOT(slotFrameAvailable(const QVector<XYZ>& )));
 }
 
-const QString meegorotationsensor::sensorName(){
+QString meegorotationsensor::sensorName() const{
     return "rotationsensor";
 }
diff --git a/plugins/sensors/meego/meegorotationsensor.h b/plugins/sensors/meego/meegorotationsensor.h
index 52b01eca14..8c0e407615 100644
--- a/plugins/sensors/meego/meegorotationsensor.h
+++ b/plugins/sensors/meego/meegorotationsensor.h
@@ -59,7 +59,7 @@ public:
     meegorotationsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
 
 private:
     QRotationReading m_reading;
diff --git a/plugins/sensors/meego/meegosensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp
index 079320d29d..31cc6cb0c3 100644
--- a/plugins/sensors/meego/meegosensorbase.cpp
+++ b/plugins/sensors/meego/meegosensorbase.cpp
@@ -91,7 +91,7 @@ void meegosensorbase::start()
         int l = sensor()->outputRanges().size();
         if (l>1){
             if (currentRange != m_prevOutputRange){
-#ifdef Q_WS_MAEMO6
+#ifdef Q_WS_MAEMO_6
                 bool isOk = m_sensorInterface->setDataRangeIndex(currentRange); //NOTE THAT THE CHANGE MIGHT NOT SUCCEED, FIRST COME FIRST SERVED
                 if (!isOk) sensorError(KErrInUse);
                 else m_prevOutputRange = currentRange;
@@ -166,7 +166,7 @@ bool meegosensorbase::doConnectAfterCheck(){
 }
 
 
-const int meegosensorbase::bufferSize(){
+int meegosensorbase::bufferSize() const{
     QVariant bufferVariant = sensor()->property(BUFFER_SIZE);
     int bufferSize = bufferVariant.isValid()?bufferVariant.toInt():1;
     if (bufferSize==1) return 1;
@@ -183,5 +183,5 @@ const int meegosensorbase::bufferSize(){
     return bufferSize;
 }
 
-const qreal meegosensorbase::correctionFactor(){return 1;}
+qreal meegosensorbase::correctionFactor() const{return 1;}
 
diff --git a/plugins/sensors/meego/meegosensorbase.h b/plugins/sensors/meego/meegosensorbase.h
index b98c1ab6fa..e4398da940 100644
--- a/plugins/sensors/meego/meegosensorbase.h
+++ b/plugins/sensors/meego/meegosensorbase.h
@@ -70,7 +70,7 @@ protected:
     static const int KErrInUse;
 
     void setRanges(qreal correctionFactor=1);
-    virtual const QString sensorName()=0;
+    virtual QString sensorName() const=0;
 
     template<typename T>
     void initSensor(bool &initDone)
@@ -155,8 +155,8 @@ protected:
 
     AbstractSensorChannelInterface* m_sensorInterface;
     int m_bufferSize;
-    const int bufferSize();
-    virtual const qreal correctionFactor();
+    int bufferSize() const;
+    virtual qreal correctionFactor() const;
 
 private:
     static SensorManagerInterface* m_remoteSensorManager;
diff --git a/plugins/sensors/meego/meegotapsensor.cpp b/plugins/sensors/meego/meegotapsensor.cpp
index 5504c91bee..26c4b5de85 100644
--- a/plugins/sensors/meego/meegotapsensor.cpp
+++ b/plugins/sensors/meego/meegotapsensor.cpp
@@ -102,6 +102,6 @@ bool meegotapsensor::doConnect(){
 }
 
 
-const QString meegotapsensor::sensorName(){
+QString meegotapsensor::sensorName() const{
     return "tapsensor";
 }
diff --git a/plugins/sensors/meego/meegotapsensor.h b/plugins/sensors/meego/meegotapsensor.h
index 85b46e9431..dc7be9d958 100644
--- a/plugins/sensors/meego/meegotapsensor.h
+++ b/plugins/sensors/meego/meegotapsensor.h
@@ -60,7 +60,7 @@ public:
 protected:
     virtual bool doConnect();
     virtual void start();
-    virtual const QString sensorName();
+    virtual QString sensorName() const;
 
 private:
     QTapReading m_reading;