diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-08-23 11:21:42 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 07:59:15 +0200 |
commit | fd6f05aa763538309c4d26223f2111be8ec0f82d (patch) | |
tree | 503309c2369b1279eef94f810e45b03e574b7501 /src/sensors | |
parent | 85dc94873bd21d97cd472af77fefa25fecd8618e (diff) |
QtmSensors, legacy sensors library.
QtSensors will not remain source-compatible with Mobility.
QtmSensors exists to provide a source-compatible API.
QtmSensors is implemented as a wrapper over the QtSensors library.
Only front end functionality is supported. Backends must be ported
to QtSensors.
Change-Id: Ia7e45b719fb5f84637f899374990dbd680e259bd
Reviewed-on: http://codereview.qt.nokia.com/3348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/qsensorbackend.h | 6 | ||||
-rw-r--r-- | src/sensors/qsensormanager.h | 2 | ||||
-rw-r--r-- | src/sensors/qsensorplugin.h | 4 | ||||
-rw-r--r-- | src/sensors/qsensorpluginloader_p.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index 43b2aaa9..b791f73f 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -42,11 +42,13 @@ #ifndef QSENSORBACKEND_H #define QSENSORBACKEND_H -#include "qsensor.h" -#include "qsensormanager.h" +#include <QObject> QT_BEGIN_NAMESPACE +class QSensor; +class QSensorReading; + class Q_SENSORS_EXPORT QSensorBackend : public QObject { Q_OBJECT diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h index 3fa76987..d1d611b5 100644 --- a/src/sensors/qsensormanager.h +++ b/src/sensors/qsensormanager.h @@ -42,7 +42,7 @@ #ifndef QSENSORMANAGER_H #define QSENSORMANAGER_H -#include "qsensor.h" +#include <QtSensors/QSensor> QT_BEGIN_NAMESPACE diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index d2b66511..9ceb4041 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -47,7 +47,6 @@ #include <QtCore/qfactoryinterface.h> QT_BEGIN_NAMESPACE -class QSensorBackend; class Q_SENSORS_EXPORT QSensorPluginInterface { @@ -65,9 +64,10 @@ protected: ~QSensorChangesInterface() {} }; +QT_END_NAMESPACE + Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface/1.0"); Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/1.0"); -QT_END_NAMESPACE #endif diff --git a/src/sensors/qsensorpluginloader_p.h b/src/sensors/qsensorpluginloader_p.h index e01e0232..d51b5b7c 100644 --- a/src/sensors/qsensorpluginloader_p.h +++ b/src/sensors/qsensorpluginloader_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class Q_AUTOTEST_EXPORT QSensorPluginLoader +class QSensorPluginLoader { public: QSensorPluginLoader(); |