--- a/qtmobility/src/sensors/qmagnetometer.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/sensors/qmagnetometer.h	Mon May 03 13:18:40 2010 +0300
@@ -54,23 +54,12 @@
 class Q_SENSORS_EXPORT QMagnetometerReading : public QSensorReading
 {
     Q_OBJECT
-    Q_ENUMS(CalibrationLevel)
     Q_PROPERTY(qreal x READ x)
     Q_PROPERTY(qreal y READ y)
     Q_PROPERTY(qreal z READ z)
-    Q_PROPERTY(qreal calibrated_x READ calibrated_x)
-    Q_PROPERTY(qreal calibrated_y READ calibrated_y)
-    Q_PROPERTY(qreal calibrated_z READ calibrated_z)
-    Q_PROPERTY(CalibrationLevel calibrationLevel READ calibrationLevel)
+    Q_PROPERTY(qreal calibrationLevel READ calibrationLevel)
     DECLARE_READING(QMagnetometerReading)
 public:
-    enum CalibrationLevel {
-        Undefined = 0,
-        Low       = 1,
-        Middle    = 2,
-        High      = 3
-    };
-
     qreal x() const;
     void setX(qreal x);
 
@@ -80,21 +69,10 @@
     qreal z() const;
     void setZ(qreal z);
 
-    qreal calibrated_x() const;
-    void setCalibrated_x(qreal calibrated_x);
-
-    qreal calibrated_y() const;
-    void setCalibrated_y(qreal calibrated_y);
-
-    qreal calibrated_z() const;
-    void setCalibrated_z(qreal calibrated_z);
-
-    CalibrationLevel calibrationLevel() const;
-    void setCalibrationLevel(CalibrationLevel calibrationLevel);
+    qreal calibrationLevel() const;
+    void setCalibrationLevel(qreal calibrationLevel);
 };
 
-// begin generated code
-
 class Q_SENSORS_EXPORT QMagnetometerFilter : public QSensorFilter
 {
 public:
@@ -106,14 +84,15 @@
 class Q_SENSORS_EXPORT QMagnetometer : public QSensor
 {
     Q_OBJECT
+#ifdef Q_QDOC
+    Q_PROPERTY(bool returnGeoValues)
+#endif
 public:
-    explicit QMagnetometer(QObject *parent = 0) : QSensor(parent)
-    { setType(QMagnetometer::type); }
+    explicit QMagnetometer(QObject *parent = 0) : QSensor(QMagnetometer::type, parent) {}
     virtual ~QMagnetometer() {}
     QMagnetometerReading *reading() const { return static_cast<QMagnetometerReading*>(QSensor::reading()); }
     static const char *type;
 };
-// end generated code
 
 QTM_END_NAMESPACE