--- a/qtmobility/src/sensors/make_sensor.pl	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/src/sensors/make_sensor.pl	Wed Jun 23 19:08:38 2010 +0300
@@ -89,11 +89,9 @@
 // We mean it.
 //
 
-#include "qsensor_p.h"
-
 QTM_BEGIN_NAMESPACE
 
-class '.$reading_private.' : public QSensorReadingPrivate
+class '.$reading_private.'
 {
 public:
     '.$reading_private.'()
@@ -156,7 +154,7 @@
     { setType('.$sensor.'::type); }
     virtual ~'.$sensor.'() {}
     '.$reading.' *reading() const { return static_cast<'.$reading.'*>(QSensor::reading()); }
-    static const char *type;
+    static char const * const type;
 };
 
 QTM_END_NAMESPACE
@@ -231,7 +229,7 @@
     \sa QSensorFilter::filter()
 */
 
-const char *'.$sensor.'::type("'.$sensor.'");
+char const * const '.$sensor.'::type("'.$sensor.'");
 
 /*!
     \class '.$sensor.'