extra const-ness for identifiers too

The same fix that prevents a crash on the ::type members. Less
likely to be a problem with these identifiers (as they're in
plugins, not a shared library) but may as well change them too.

52 files changed, 62 insertions, 62 deletions

diff --git a/examples/sensors/grueplugin/gruesensor.cpp b/examples/sensors/grueplugin/gruesensor.cpp
index d740d88481..3bfb280d20 100644
--- a/examples/sensors/grueplugin/gruesensor.cpp
+++ b/examples/sensors/grueplugin/gruesensor.cpp
@@ -99,7 +99,7 @@ void GrueSensorReading::setChanceOfBeingEaten(qreal chanceOfBeingEaten)
     \sa QSensorFilter::filter()
 */
 
-const char *GrueSensor::type("GrueSensor");
+char const * const GrueSensor::type("GrueSensor");
 
 /*!
     \class GrueSensor
diff --git a/examples/sensors/grueplugin/gruesensor.h b/examples/sensors/grueplugin/gruesensor.h
index 8a1a88eaf3..097be757a3 100644
--- a/examples/sensors/grueplugin/gruesensor.h
+++ b/examples/sensors/grueplugin/gruesensor.h
@@ -74,7 +74,7 @@ public:
     explicit GrueSensor(QObject *parent = 0) : QSensor(GrueSensor::type, parent) {}
     virtual ~GrueSensor() {}
     GrueSensorReading *reading() const { return static_cast<GrueSensorReading*>(QSensor::reading()); }
-    static const char *type;
+    static char const * const type;
 };
 // end generated code
 
diff --git a/examples/sensors/grueplugin/gruesensorimpl.cpp b/examples/sensors/grueplugin/gruesensorimpl.cpp
index f70894c3fa..4b7b8a8b51 100644
--- a/examples/sensors/grueplugin/gruesensorimpl.cpp
+++ b/examples/sensors/grueplugin/gruesensorimpl.cpp
@@ -41,7 +41,7 @@
 #include "gruesensorimpl.h"
 #include <QDebug>
 
-const char *gruesensorimpl::id("grue.gruesensor");
+char const * const gruesensorimpl::id("grue.gruesensor");
 
 gruesensorimpl::gruesensorimpl(QSensor *sensor)
     : QSensorBackend(sensor)
diff --git a/examples/sensors/grueplugin/gruesensorimpl.h b/examples/sensors/grueplugin/gruesensorimpl.h
index 96bf77dbbb..4fbb2061c3 100644
--- a/examples/sensors/grueplugin/gruesensorimpl.h
+++ b/examples/sensors/grueplugin/gruesensorimpl.h
@@ -50,7 +50,7 @@ QTM_USE_NAMESPACE
 class gruesensorimpl : public QSensorBackend, public QAmbientLightFilter
 {
 public:
-    static const char *id;
+    static char const * const id;
 
     gruesensorimpl(QSensor *sensor);
 
diff --git a/plugins/sensors/dummy/dummyaccelerometer.cpp b/plugins/sensors/dummy/dummyaccelerometer.cpp
index 9830b9c199..4c625b4c3c 100644
--- a/plugins/sensors/dummy/dummyaccelerometer.cpp
+++ b/plugins/sensors/dummy/dummyaccelerometer.cpp
@@ -43,7 +43,7 @@
 #include <QDebug>
 #include <QtGlobal>
 
-const char *dummyaccelerometer::id("dummy.accelerometer");
+char const * const dummyaccelerometer::id("dummy.accelerometer");
 
 dummyaccelerometer::dummyaccelerometer(QSensor *sensor)
     : dummycommon(sensor)
diff --git a/plugins/sensors/dummy/dummyaccelerometer.h b/plugins/sensors/dummy/dummyaccelerometer.h
index 9272e9a969..f912929609 100644
--- a/plugins/sensors/dummy/dummyaccelerometer.h
+++ b/plugins/sensors/dummy/dummyaccelerometer.h
@@ -50,7 +50,7 @@ QTM_USE_NAMESPACE
 class dummyaccelerometer : public dummycommon
 {
 public:
-    static const char *id;
+    static char const * const id;
 
     dummyaccelerometer(QSensor *sensor);
 
diff --git a/plugins/sensors/dummy/dummylightsensor.cpp b/plugins/sensors/dummy/dummylightsensor.cpp
index f5f96233dd..aeca0cf8c2 100644
--- a/plugins/sensors/dummy/dummylightsensor.cpp
+++ b/plugins/sensors/dummy/dummylightsensor.cpp
@@ -43,7 +43,7 @@
 #include <QDebug>
 #include <QtGlobal>
 
-const char *dummylightsensor::id("dummy.lightsensor");
+char const * const dummylightsensor::id("dummy.lightsensor");
 
 dummylightsensor::dummylightsensor(QSensor *sensor)
     : dummycommon(sensor)
diff --git a/plugins/sensors/dummy/dummylightsensor.h b/plugins/sensors/dummy/dummylightsensor.h
index 7facebab8a..1b7e8fbb89 100644
--- a/plugins/sensors/dummy/dummylightsensor.h
+++ b/plugins/sensors/dummy/dummylightsensor.h
@@ -50,7 +50,7 @@ QTM_USE_NAMESPACE
 class dummylightsensor : public dummycommon
 {
 public:
-    static const char *id;
+    static char const * const id;
 
     dummylightsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/generic/genericorientationsensor.cpp b/plugins/sensors/generic/genericorientationsensor.cpp
index 24a7e3a4e0..483c4e9ade 100644
--- a/plugins/sensors/generic/genericorientationsensor.cpp
+++ b/plugins/sensors/generic/genericorientationsensor.cpp
@@ -42,7 +42,7 @@
 #include "genericorientationsensor.h"
 #include <QDebug>
 
-const char *genericorientationsensor::id("generic.orientation");
+char const * const genericorientationsensor::id("generic.orientation");
 
 genericorientationsensor::genericorientationsensor(QSensor *sensor)
     : QSensorBackend(sensor)
diff --git a/plugins/sensors/generic/genericorientationsensor.h b/plugins/sensors/generic/genericorientationsensor.h
index 8c4c35774c..91016484c8 100644
--- a/plugins/sensors/generic/genericorientationsensor.h
+++ b/plugins/sensors/generic/genericorientationsensor.h
@@ -51,7 +51,7 @@ QTM_USE_NAMESPACE
 class genericorientationsensor : public QSensorBackend, public QAccelerometerFilter
 {
 public:
-    static const char *id;
+    static char const * const id;
 
     genericorientationsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/generic/genericrotationsensor.cpp b/plugins/sensors/generic/genericrotationsensor.cpp
index cd453f6b9c..4c735c1071 100644
--- a/plugins/sensors/generic/genericrotationsensor.cpp
+++ b/plugins/sensors/generic/genericrotationsensor.cpp
@@ -45,7 +45,7 @@
 
 #define RADIANS_TO_DEGREES 57.2957795
 
-const char *genericrotationsensor::id("generic.rotation");
+char const * const genericrotationsensor::id("generic.rotation");
 
 genericrotationsensor::genericrotationsensor(QSensor *sensor)
     : QSensorBackend(sensor)
diff --git a/plugins/sensors/generic/genericrotationsensor.h b/plugins/sensors/generic/genericrotationsensor.h
index cb3c5dce5a..d690b1fdd8 100644
--- a/plugins/sensors/generic/genericrotationsensor.h
+++ b/plugins/sensors/generic/genericrotationsensor.h
@@ -52,7 +52,7 @@ QTM_USE_NAMESPACE
 class genericrotationsensor : public QSensorBackend, public QSensorFilter
 {
 public:
-    static const char *id;
+    static char const * const id;
 
     genericrotationsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6accelerometer.cpp b/plugins/sensors/maemo6/maemo6accelerometer.cpp
index e7c563893a..11bfd7cd62 100644
--- a/plugins/sensors/maemo6/maemo6accelerometer.cpp
+++ b/plugins/sensors/maemo6/maemo6accelerometer.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6accelerometer.h"
 
-const char *maemo6accelerometer::id("maemo6.accelerometer");
+char const * const maemo6accelerometer::id("maemo6.accelerometer");
 bool maemo6accelerometer::m_initDone = false;
 
 maemo6accelerometer::maemo6accelerometer(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6accelerometer.h b/plugins/sensors/maemo6/maemo6accelerometer.h
index 60fb354114..95406fad9f 100644
--- a/plugins/sensors/maemo6/maemo6accelerometer.h
+++ b/plugins/sensors/maemo6/maemo6accelerometer.h
@@ -55,7 +55,7 @@ class maemo6accelerometer : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6accelerometer(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6als.cpp b/plugins/sensors/maemo6/maemo6als.cpp
index 21d2db3b2e..28a3e91652 100644
--- a/plugins/sensors/maemo6/maemo6als.cpp
+++ b/plugins/sensors/maemo6/maemo6als.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6als.h"
 
-const char *maemo6als::id("maemo6.als");
+char const * const maemo6als::id("maemo6.als");
 bool maemo6als::m_initDone = false;
 
 maemo6als::maemo6als(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6als.h b/plugins/sensors/maemo6/maemo6als.h
index 5d776dc13a..e4860be7c0 100644
--- a/plugins/sensors/maemo6/maemo6als.h
+++ b/plugins/sensors/maemo6/maemo6als.h
@@ -55,7 +55,7 @@ class maemo6als : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6als(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6compass.cpp b/plugins/sensors/maemo6/maemo6compass.cpp
index 6336ed28f3..69aceab8bf 100644
--- a/plugins/sensors/maemo6/maemo6compass.cpp
+++ b/plugins/sensors/maemo6/maemo6compass.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6compass.h"
 
-const char *maemo6compass::id("maemo6.compass");
+char const * const maemo6compass::id("maemo6.compass");
 bool maemo6compass::m_initDone = false;
 
 maemo6compass::maemo6compass(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6compass.h b/plugins/sensors/maemo6/maemo6compass.h
index 28f4fa7d60..79586350c8 100644
--- a/plugins/sensors/maemo6/maemo6compass.h
+++ b/plugins/sensors/maemo6/maemo6compass.h
@@ -55,7 +55,7 @@ class maemo6compass : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
     maemo6compass(QSensor *sensor);
 
 private:
diff --git a/plugins/sensors/maemo6/maemo6magnetometer.cpp b/plugins/sensors/maemo6/maemo6magnetometer.cpp
index 42e3bf848f..251c81b23e 100644
--- a/plugins/sensors/maemo6/maemo6magnetometer.cpp
+++ b/plugins/sensors/maemo6/maemo6magnetometer.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6magnetometer.h"
 
-const char *maemo6magnetometer::id("maemo6.magnetometer");
+char const * const maemo6magnetometer::id("maemo6.magnetometer");
 bool maemo6magnetometer::m_initDone = false;
 
 maemo6magnetometer::maemo6magnetometer(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6magnetometer.h b/plugins/sensors/maemo6/maemo6magnetometer.h
index 263873a150..424f5596a3 100644
--- a/plugins/sensors/maemo6/maemo6magnetometer.h
+++ b/plugins/sensors/maemo6/maemo6magnetometer.h
@@ -55,7 +55,7 @@ class maemo6magnetometer : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6magnetometer(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.cpp b/plugins/sensors/maemo6/maemo6orientationsensor.cpp
index 3dffd19eff..bf134f9761 100644
--- a/plugins/sensors/maemo6/maemo6orientationsensor.cpp
+++ b/plugins/sensors/maemo6/maemo6orientationsensor.cpp
@@ -43,7 +43,7 @@
 
 #include <posedata.h>
 
-const char *maemo6orientationsensor::id("maemo6.orientationsensor");
+char const * const maemo6orientationsensor::id("maemo6.orientationsensor");
 bool maemo6orientationsensor::m_initDone = false;
 
 maemo6orientationsensor::maemo6orientationsensor(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.h b/plugins/sensors/maemo6/maemo6orientationsensor.h
index f8a492134d..38004be446 100644
--- a/plugins/sensors/maemo6/maemo6orientationsensor.h
+++ b/plugins/sensors/maemo6/maemo6orientationsensor.h
@@ -55,7 +55,7 @@ class maemo6orientationsensor : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6orientationsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.cpp b/plugins/sensors/maemo6/maemo6proximitysensor.cpp
index 01dd0ebc39..05b4a443fd 100644
--- a/plugins/sensors/maemo6/maemo6proximitysensor.cpp
+++ b/plugins/sensors/maemo6/maemo6proximitysensor.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6proximitysensor.h"
 
-const char *maemo6proximitysensor::id("maemo6.proximity");
+char const * const maemo6proximitysensor::id("maemo6.proximity");
 bool maemo6proximitysensor::m_initDone = false;
 
 maemo6proximitysensor::maemo6proximitysensor(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.h b/plugins/sensors/maemo6/maemo6proximitysensor.h
index d558d1ca78..7d64df101e 100644
--- a/plugins/sensors/maemo6/maemo6proximitysensor.h
+++ b/plugins/sensors/maemo6/maemo6proximitysensor.h
@@ -55,7 +55,7 @@ class maemo6proximitysensor : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6proximitysensor(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.cpp b/plugins/sensors/maemo6/maemo6rotationsensor.cpp
index 198c7c6084..bef81248cd 100644
--- a/plugins/sensors/maemo6/maemo6rotationsensor.cpp
+++ b/plugins/sensors/maemo6/maemo6rotationsensor.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6rotationsensor.h"
 
-const char *maemo6rotationsensor::id("maemo6.rotationsensor");
+char const * const maemo6rotationsensor::id("maemo6.rotationsensor");
 bool maemo6rotationsensor::m_initDone = false;
 
 maemo6rotationsensor::maemo6rotationsensor(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.h b/plugins/sensors/maemo6/maemo6rotationsensor.h
index ac7e78d4d8..cbeba3a943 100644
--- a/plugins/sensors/maemo6/maemo6rotationsensor.h
+++ b/plugins/sensors/maemo6/maemo6rotationsensor.h
@@ -55,7 +55,7 @@ class maemo6rotationsensor : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6rotationsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/maemo6/maemo6tapsensor.cpp b/plugins/sensors/maemo6/maemo6tapsensor.cpp
index eeee652468..bf4e0340ef 100644
--- a/plugins/sensors/maemo6/maemo6tapsensor.cpp
+++ b/plugins/sensors/maemo6/maemo6tapsensor.cpp
@@ -41,7 +41,7 @@
 
 #include "maemo6tapsensor.h"
 
-const char *maemo6tapsensor::id("maemo6.tapsensor");
+char const * const maemo6tapsensor::id("maemo6.tapsensor");
 bool maemo6tapsensor::m_initDone = false;
 
 maemo6tapsensor::maemo6tapsensor(QSensor *sensor)
diff --git a/plugins/sensors/maemo6/maemo6tapsensor.h b/plugins/sensors/maemo6/maemo6tapsensor.h
index f7d61d3dd6..b78aa7179f 100644
--- a/plugins/sensors/maemo6/maemo6tapsensor.h
+++ b/plugins/sensors/maemo6/maemo6tapsensor.h
@@ -55,7 +55,7 @@ class maemo6tapsensor : public maemo6sensorbase
     Q_OBJECT
 
 public:
-    static const char *id;
+    static char const * const id;
 
     maemo6tapsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/n900/n900accelerometer.cpp b/plugins/sensors/n900/n900accelerometer.cpp
index 711ebb51d6..6e6af6f8d1 100644
--- a/plugins/sensors/n900/n900accelerometer.cpp
+++ b/plugins/sensors/n900/n900accelerometer.cpp
@@ -45,10 +45,10 @@
 #include <time.h>
 #include <stdio.h>
 
-const char *n900accelerometer::id("n900.accelerometer");
-const char *n900accelerometer::filename("/sys/class/i2c-adapter/i2c-3/3-001d/coord");
-const char *n900accelerometer::range("/sys/class/i2c-adapter/i2c-3/3-001d/scale");
-const char *n900accelerometer::rate("/sys/class/i2c-adapter/i2c-3/3-001d/rate");
+char const * const n900accelerometer::id("n900.accelerometer");
+char const * const n900accelerometer::filename("/sys/class/i2c-adapter/i2c-3/3-001d/coord");
+char const * const n900accelerometer::range("/sys/class/i2c-adapter/i2c-3/3-001d/scale");
+char const * const n900accelerometer::rate("/sys/class/i2c-adapter/i2c-3/3-001d/rate");
 
 n900accelerometer::n900accelerometer(QSensor *sensor)
     : n900filebasedsensor(sensor)
diff --git a/plugins/sensors/n900/n900accelerometer.h b/plugins/sensors/n900/n900accelerometer.h
index 0bf0cadf23..22a99001f4 100644
--- a/plugins/sensors/n900/n900accelerometer.h
+++ b/plugins/sensors/n900/n900accelerometer.h
@@ -50,10 +50,10 @@ QTM_USE_NAMESPACE
 class n900accelerometer : public n900filebasedsensor
 {
 public:
-    static const char *id;
-    static const char *filename;
-    static const char *range;
-    static const char *rate;
+    static char const * const id;
+    static char const * const filename;
+    static char const * const range;
+    static char const * const rate;
 
     n900accelerometer(QSensor *sensor);
 
diff --git a/plugins/sensors/n900/n900lightsensor.cpp b/plugins/sensors/n900/n900lightsensor.cpp
index e41a5aec0b..a257b1fbbc 100644
--- a/plugins/sensors/n900/n900lightsensor.cpp
+++ b/plugins/sensors/n900/n900lightsensor.cpp
@@ -44,8 +44,8 @@
 #include <QDebug>
 #include <time.h>
 
-const char *n900lightsensor::id("n900.ambientlight");
-const char *n900lightsensor::filename("/sys/class/i2c-adapter/i2c-2/2-0029/lux");
+char const * const n900lightsensor::id("n900.ambientlight");
+char const * const n900lightsensor::filename("/sys/class/i2c-adapter/i2c-2/2-0029/lux");
 
 n900lightsensor::n900lightsensor(QSensor *sensor)
     : n900filebasedsensor(sensor)
diff --git a/plugins/sensors/n900/n900lightsensor.h b/plugins/sensors/n900/n900lightsensor.h
index 99abbc4762..4466eab966 100644
--- a/plugins/sensors/n900/n900lightsensor.h
+++ b/plugins/sensors/n900/n900lightsensor.h
@@ -50,8 +50,8 @@ QTM_USE_NAMESPACE
 class n900lightsensor : public n900filebasedsensor
 {
 public:
-    static const char *id;
-    static const char *filename;
+    static char const * const id;
+    static char const * const filename;
 
     n900lightsensor(QSensor *sensor);
 
diff --git a/plugins/sensors/n900/n900proximitysensor.cpp b/plugins/sensors/n900/n900proximitysensor.cpp
index 2870b806ee..58d489b4a6 100644
--- a/plugins/sensors/n900/n900proximitysensor.cpp
+++ b/plugins/sensors/n900/n900proximitysensor.cpp
@@ -45,8 +45,8 @@
 #include <string.h>
 #include <time.h>
 
-const char *n900proximitysensor::id("n900.proximity");
-const char *n900proximitysensor::filename("/sys/bus/platform/devices/proximity/state");
+char const * const n900proximitysensor::id("n900.proximity");
+char const * const n900proximitysensor::filename("/sys/bus/platform/devices/proximity/state");
 
 n900proximitysensor::n900proximitysensor(QSensor *sensor)
     : n900filebasedsensor(sensor)
diff --git a/plugins/sensors/n900/n900proximitysensor.h b/plugins/sensors/n900/n900proximitysensor.h
index 7bef25bd58..cc7023ae39 100644
--- a/plugins/sensors/n900/n900proximitysensor.h
+++ b/plugins/sensors/n900/n900proximitysensor.h
@@ -50,8 +50,8 @@ QTM_USE_NAMESPACE
 class n900proximitysensor : public n900filebasedsensor
 {
 public:
-    static const char *id;
-    static const char *filename;
+    static char const * const id;
+    static char const * const filename;
 
     n900proximitysensor(QSensor *sensor);
 
diff --git a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp
index c27d91d9f1..1ea1985c9b 100644
--- a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp
+++ b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp
@@ -48,7 +48,7 @@
 // Constants
 const int KAccelerometerSensorUID = 0x10273024;
 
-const char *QS60SensorApiAccelerometer::id("s60sensorapi.accelerometer");
+char const * const QS60SensorApiAccelerometer::id("s60sensorapi.accelerometer");
 
 QS60SensorApiAccelerometer::QS60SensorApiAccelerometer(QSensor *sensor)
     : QSensorBackend(sensor)
diff --git a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h
index b2fe2ba27b..20c502c543 100644
--- a/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h
+++ b/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h
@@ -54,7 +54,7 @@ QTM_USE_NAMESPACE
 class QS60SensorApiAccelerometer : public QSensorBackend,  public MRRSensorDataListener
 {
 public:
-    static const char *id;
+    static char const * const id;
     
     QS60SensorApiAccelerometer(QSensor *sensor);
     virtual ~QS60SensorApiAccelerometer();
diff --git a/plugins/sensors/symbian/accelerometersym.cpp b/plugins/sensors/symbian/accelerometersym.cpp
index a99f9a2057..6cdc83dfa9 100644
--- a/plugins/sensors/symbian/accelerometersym.cpp
+++ b/plugins/sensors/symbian/accelerometersym.cpp
@@ -48,7 +48,7 @@
 /**
  * set the id of the accelerometer sensor
  */
-const char *CAccelerometerSensorSym::id("sym.accelerometer");
+char const * const CAccelerometerSensorSym::id("sym.accelerometer");
 
 /**
  * Factory function, this is used to create the accelerometer object
diff --git a/plugins/sensors/symbian/accelerometersym.h b/plugins/sensors/symbian/accelerometersym.h
index c900bab0ee..e25ff683c4 100644
--- a/plugins/sensors/symbian/accelerometersym.h
+++ b/plugins/sensors/symbian/accelerometersym.h
@@ -93,7 +93,7 @@ public:
     /**
      * Holds the id of the accelerometer
      */
-    static const char *id;
+    static char const * const id;
     
 private:
     QAccelerometerReading iReading;
diff --git a/plugins/sensors/symbian/ambientlightsensorsym.cpp b/plugins/sensors/symbian/ambientlightsensorsym.cpp
index ab29e38ab0..812f6c9fc4 100644
--- a/plugins/sensors/symbian/ambientlightsensorsym.cpp
+++ b/plugins/sensors/symbian/ambientlightsensorsym.cpp
@@ -44,7 +44,7 @@
 /**
  * set the id of the ambient light sensor
  */
-const char *CAmbientLightSensorSym::id("sym.ambientlight");
+char const * const CAmbientLightSensorSym::id("sym.ambientlight");
 
 /**
  * Factory function, this is used to create the ambient light sensor object
diff --git a/plugins/sensors/symbian/ambientlightsensorsym.h b/plugins/sensors/symbian/ambientlightsensorsym.h
index 329c6f5f8e..c36a2ecfae 100644
--- a/plugins/sensors/symbian/ambientlightsensorsym.h
+++ b/plugins/sensors/symbian/ambientlightsensorsym.h
@@ -93,7 +93,7 @@ public:
     /**
      * Holds the id of the accelerometer
      */
-    static const char *id;
+    static char const * const id;
     
 private:
     QAmbientLightReading iReading;
diff --git a/plugins/sensors/symbian/compasssym.cpp b/plugins/sensors/symbian/compasssym.cpp
index e2058c517f..0c4a8909ca 100644
--- a/plugins/sensors/symbian/compasssym.cpp
+++ b/plugins/sensors/symbian/compasssym.cpp
@@ -44,7 +44,7 @@
 /**
  * set the id of the accelerometer sensor
  */
-const char *CCompassSym::id("sym.compass");
+char const * const CCompassSym::id("sym.compass");
 
 /**
  * Factory function, this is used to create the compass object
diff --git a/plugins/sensors/symbian/compasssym.h b/plugins/sensors/symbian/compasssym.h
index 0eca7ece96..a17b2c9c6b 100644
--- a/plugins/sensors/symbian/compasssym.h
+++ b/plugins/sensors/symbian/compasssym.h
@@ -108,7 +108,7 @@ public:
     /**
      * Holds the id of the compass
      */
-    static const char *id;
+    static char const * const id;
     
 private:     
     QCompassReading iReading;
diff --git a/plugins/sensors/symbian/magnetometersensorsym.cpp b/plugins/sensors/symbian/magnetometersensorsym.cpp
index 3184cfd06d..f28152c654 100644
--- a/plugins/sensors/symbian/magnetometersensorsym.cpp
+++ b/plugins/sensors/symbian/magnetometersensorsym.cpp
@@ -45,7 +45,7 @@
 /**
  * set the id of the magnetometer sensor
  */
-const char *CMagnetometerSensorSym::id("sym.magnetometer");
+char const * const CMagnetometerSensorSym::id("sym.magnetometer");
 
 /**
  * Factory function, this is used to create the magnetometer sensor object
diff --git a/plugins/sensors/symbian/magnetometersensorsym.h b/plugins/sensors/symbian/magnetometersensorsym.h
index 04f6ff7ef6..5f7f12eee7 100644
--- a/plugins/sensors/symbian/magnetometersensorsym.h
+++ b/plugins/sensors/symbian/magnetometersensorsym.h
@@ -111,7 +111,7 @@ public:
     /**
      * Holds the id of the magnetometer
      */
-    static const char *id;
+    static char const * const id;
     
 private:     
     QMagnetometerReading iReading;
diff --git a/plugins/sensors/symbian/orientationsym.cpp b/plugins/sensors/symbian/orientationsym.cpp
index f5b1e617d1..4e74fed185 100644
--- a/plugins/sensors/symbian/orientationsym.cpp
+++ b/plugins/sensors/symbian/orientationsym.cpp
@@ -45,7 +45,7 @@
 /**
  * set the id of the orientation sensor
  */
-const char *COrientationSensorSym::id("sym.orientation");
+char const * const COrientationSensorSym::id("sym.orientation");
 
 /**
  * Factory function, this is used to create the orientation sensor object
diff --git a/plugins/sensors/symbian/orientationsym.h b/plugins/sensors/symbian/orientationsym.h
index 5e3b1ba721..50cbb958db 100644
--- a/plugins/sensors/symbian/orientationsym.h
+++ b/plugins/sensors/symbian/orientationsym.h
@@ -93,7 +93,7 @@ public:
     /**
      * Holds the id of the orientation sensor
      */
-    static const char *id;
+    static char const * const id;
     
 private:     
     QOrientationReading iReading;
diff --git a/plugins/sensors/symbian/proximitysensorsym.cpp b/plugins/sensors/symbian/proximitysensorsym.cpp
index 4cd4de8e77..e4d3eb210b 100644
--- a/plugins/sensors/symbian/proximitysensorsym.cpp
+++ b/plugins/sensors/symbian/proximitysensorsym.cpp
@@ -45,7 +45,7 @@
 /**
  * set the id of the proximity sensor
  */
-const char *CProximitySensorSym::id("sym.proximity");
+char const * const CProximitySensorSym::id("sym.proximity");
 
 /**
  * Factory function, this is used to create the proximity sensor object
diff --git a/plugins/sensors/symbian/proximitysensorsym.h b/plugins/sensors/symbian/proximitysensorsym.h
index 25285c8303..f7580cc414 100644
--- a/plugins/sensors/symbian/proximitysensorsym.h
+++ b/plugins/sensors/symbian/proximitysensorsym.h
@@ -93,7 +93,7 @@ public:
     /**
      * Holds the id of the proximity sensor
      */
-    static const char *id;
+    static char const * const id;
     
 private:     
     QProximityReading iReading;
diff --git a/plugins/sensors/symbian/rotationsensorsym.cpp b/plugins/sensors/symbian/rotationsensorsym.cpp
index 172d91ce0f..1b5c220a45 100644
--- a/plugins/sensors/symbian/rotationsensorsym.cpp
+++ b/plugins/sensors/symbian/rotationsensorsym.cpp
@@ -45,7 +45,7 @@
 /**
  * set the id of the proximity sensor
  */
-const char *CRotationSensorSym::id("sym.rotation");
+char const * const CRotationSensorSym::id("sym.rotation");
 
 /**
  * Factory function, this is used to create the rotation sensor object
diff --git a/plugins/sensors/symbian/rotationsensorsym.h b/plugins/sensors/symbian/rotationsensorsym.h
index 6d14b7b685..5119c976bc 100644
--- a/plugins/sensors/symbian/rotationsensorsym.h
+++ b/plugins/sensors/symbian/rotationsensorsym.h
@@ -93,7 +93,7 @@ public:
     /**
      * Holds the id of the proximity sensor
      */
-    static const char *id;
+    static char const * const id;
     
 private:     
     QRotationReading iReading;
diff --git a/plugins/sensors/symbian/tapsensorsym.cpp b/plugins/sensors/symbian/tapsensorsym.cpp
index 8b7c523cc7..43fcf3a6d5 100644
--- a/plugins/sensors/symbian/tapsensorsym.cpp
+++ b/plugins/sensors/symbian/tapsensorsym.cpp
@@ -43,7 +43,7 @@
 /**
  * set the id of the Tap sensor
  */
-const char *CTapSensorSym::id("sym.tap");
+char const * const CTapSensorSym::id("sym.tap");
 
 /**
  * Factory function, this is used to create the tap sensor object
diff --git a/plugins/sensors/symbian/tapsensorsym.h b/plugins/sensors/symbian/tapsensorsym.h
index 4738828ac0..b0642ac79b 100644
--- a/plugins/sensors/symbian/tapsensorsym.h
+++ b/plugins/sensors/symbian/tapsensorsym.h
@@ -90,7 +90,7 @@ public:
     /**
      * Holds the id of the magnetometer
      */	
-    static const char *id;
+    static char const * const id;
     
 private:
     QTapReading iReading;