move irprox sensor to proper place in QSensor

Change-Id: Ie386282010244d91e365ea86ccf8ec5a5c5329dc
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

6 files changed, 23 insertions, 19 deletions

diff --git a/plugins/declarative/sensors/sensors.cpp b/plugins/declarative/sensors/sensors.cpp
index d4ee8751b0..ffc4cee4d6 100644
--- a/plugins/declarative/sensors/sensors.cpp
+++ b/plugins/declarative/sensors/sensors.cpp
@@ -48,6 +48,7 @@
 #include <qcompass.h>
 #include <qmagnetometer.h>
 #include <qorientationsensor.h>
+#include <qirproximitysensor.h>
 #include <qproximitysensor.h>
 #include <qrotationsensor.h>
 #include <qtapsensor.h>
@@ -117,31 +118,34 @@ public:
 
         major = 1;
         minor = 3;
-        qmlRegisterUncreatableType<QSensor              >(package, major, minor, "Sensor",               QLatin1String("Cannot create Sensor    "));
-        qmlRegisterUncreatableType<QSensorReading       >(package, major, minor, "SensorReading",        QLatin1String("Cannot create Sensor    Reading"));
+        qmlRegisterUncreatableType<QSensor              >(package, major, minor, "Sensor",               QLatin1String("Cannot create Sensor"));
+        qmlRegisterUncreatableType<QSensorReading       >(package, major, minor, "SensorReading",        QLatin1String("Cannot create SensorReading"));
         qmlRegisterType           <QAccelerometer       >(package, major, minor, "Accelerometer");
-        qmlRegisterUncreatableType<QAccelerometerReading>(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create Accele    rometerReading"));
+        qmlRegisterUncreatableType<QAccelerometerReading>(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create AccelerometerReading"));
         qmlRegisterType           <QAmbientLightSensor  >(package, major, minor, "AmbientLightSensor");
-        qmlRegisterUncreatableType<QAmbientLightReading >(package, major, minor, "AmbientLightReading",  QLatin1String("Cannot create Ambien    tLightReading"));
+        qmlRegisterUncreatableType<QAmbientLightReading >(package, major, minor, "AmbientLightReading",  QLatin1String("Cannot create AmbientLightReading"));
         qmlRegisterType           <QCompass             >(package, major, minor, "Compass");
-        qmlRegisterUncreatableType<QCompassReading      >(package, major, minor, "CompassReading",       QLatin1String("Cannot create Compas    sReading"));
+        qmlRegisterUncreatableType<QCompassReading      >(package, major, minor, "CompassReading",       QLatin1String("Cannot create CompassReading"));
+        qmlRegisterType           <QIRProximitySensor   >(package, major, minor, "IRProximitySensor");
+        qmlRegisterUncreatableType<QIRProximityReading  >(package, major, minor, "IRProximityReading",     QLatin1String("Cannot create IRProximityReading"));
         qmlRegisterType           <QMagnetometer        >(package, major, minor, "Magnetometer");
-        qmlRegisterUncreatableType<QMagnetometerReading >(package, major, minor, "MagnetometerReading",  QLatin1String("Cannot create Magnet    ometerReading"));
+        qmlRegisterUncreatableType<QMagnetometerReading >(package, major, minor, "MagnetometerReading",  QLatin1String("Cannot create MagnetometerReading"));
         qmlRegisterType           <QOrientationSensor   >(package, major, minor, "OrientationSensor");
-        qmlRegisterUncreatableType<QOrientationReading  >(package, major, minor, "OrientationReading",   QLatin1String("Cannot create Orient    ationReading"));
+        qmlRegisterUncreatableType<QOrientationReading  >(package, major, minor, "OrientationReading",   QLatin1String("Cannot create OrientationReading"));
         qmlRegisterType           <QProximitySensor     >(package, major, minor, "ProximitySensor");
-        qmlRegisterUncreatableType<QProximityReading    >(package, major, minor, "ProximityReading",     QLatin1String("Cannot create Proxim    ityReading"));
+        qmlRegisterUncreatableType<QProximityReading    >(package, major, minor, "ProximityReading",     QLatin1String("Cannot create ProximityReading"));
         qmlRegisterType           <QRotationSensor      >(package, major, minor, "RotationSensor");
-        qmlRegisterUncreatableType<QRotationReading     >(package, major, minor, "RotationReading",      QLatin1String("Cannot create Rotati    onReading"));
+        qmlRegisterUncreatableType<QRotationReading     >(package, major, minor, "RotationReading",      QLatin1String("Cannot create RotationReading"));
         qmlRegisterType           <QTapSensor           >(package, major, minor, "TapSensor");
-        qmlRegisterUncreatableType<QTapReading          >(package, major, minor, "TapReading",           QLatin1String("Cannot create TapRea    ding"));
+        qmlRegisterUncreatableType<QTapReading          >(package, major, minor, "TapReading",           QLatin1String("Cannot create TapReading"));
         qmlRegisterType           <QLightSensor         >(package, major, minor, "LightSensor");
-        qmlRegisterUncreatableType<QLightReading        >(package, major, minor, "LightReading",         QLatin1String("Cannot create LightR    eading"));
+        qmlRegisterUncreatableType<QLightReading        >(package, major, minor, "LightReading",         QLatin1String("Cannot create LightReading"));
         qmlRegisterType           <QGyroscope           >(package, major, minor, "Gyroscope");
-        qmlRegisterUncreatableType<QGyroscopeReading    >(package, major, minor, "GyroscopeReading",     QLatin1String("Cannot create Gyrosc    opeReading"));
+        qmlRegisterUncreatableType<QGyroscopeReading    >(package, major, minor, "GyroscopeReading",     QLatin1String("Cannot create GyroscopeReading"));
 
         qmlRegisterType           <QmlSensorGesture     >(package, major, minor, "SensorGesture");
 
+
     }
 };
 
diff --git a/plugins/sensors/meego/meego.pri b/plugins/sensors/meego/meego.pri
index 11b1806e5f..76e230e1c2 100644
--- a/plugins/sensors/meego/meego.pri
+++ b/plugins/sensors/meego/meego.pri
@@ -9,9 +9,8 @@ HEADERS += meegosensorbase.h \
     meegorotationsensor.h \
     meegotapsensor.h    \
     meegolightsensor.h  \
-    meegoirproximitysensor.h \
-    qirproximitysensor.h \
-    qirproximitysensor_p.h \
+    meegoirproximitysensor.h
+
 
 SOURCES += meegosensorbase.cpp \
     meegoaccelerometer.cpp \
@@ -25,5 +24,4 @@ SOURCES += meegosensorbase.cpp \
     meegorotationsensor.cpp \
     meegotapsensor.cpp \
     meegolightsensor.cpp \
-    qirproximitysensor.cpp \
     main.cpp
diff --git a/plugins/sensors/meego/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp
index 11572335b7..11572335b7 100644
--- a/plugins/sensors/meego/qirproximitysensor.cpp
+++ b/src/sensors/qirproximitysensor.cpp
diff --git a/plugins/sensors/meego/qirproximitysensor.h b/src/sensors/qirproximitysensor.h
index 83b7ee7f24..83b7ee7f24 100644
--- a/plugins/sensors/meego/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
diff --git a/plugins/sensors/meego/qirproximitysensor_p.h b/src/sensors/qirproximitysensor_p.h
index b595f12430..b595f12430 100644
--- a/plugins/sensors/meego/qirproximitysensor_p.h
+++ b/src/sensors/qirproximitysensor_p.h
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index fe5b59fc64..3c16db72bf 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -34,16 +34,17 @@ DEPENDPATH += .
 PUBLIC_HEADERS += \
            qsensorbackend.h\
            qsensormanager.h\
-           qsensorplugin.h\
+           qsensorplugin.h
 
 PRIVATE_HEADERS += \
            qsensorpluginloader_p.h\
-           sensorlog_p.h\
+           sensorlog_p.h
 
 SOURCES += qsensorbackend.cpp\
            qsensormanager.cpp\
            qsensorplugin.cpp\
-           qsensorpluginloader.cpp\
+           qsensorpluginloader.cpp
+
 
 # 3 files per sensor (including QSensor)
 SENSORS=\
@@ -58,6 +59,7 @@ SENSORS=\
     qrotationsensor\
     qtapsensor\
     qgyroscope\
+    qirproximitysensor
 
 for(s,SENSORS) {
     # Client API