diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-22 18:29:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-22 10:29:24 +0100 |
| commit | f0b3d0f65e1be0bc15c5686baa125a2d4a0354b8 (patch) | |
| tree | 8f479e43db6c200fd16163ef92ed0f38f5b749eb | |
| parent | 4e80bd41bca2f027d348341e36b9a6027d54a2b9 (diff) | |
Fixed QtSensors namespace compilation.
Change-Id: If31a32c903034585ef8211fa17abb6747e64951f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
| -rw-r--r-- | src/sensors/gestures/qsensorgesturemanager.cpp | 4 | ||||
| -rw-r--r-- | src/sensors/gestures/qsensorgesturemanagerprivate_p.h | 4 | ||||
| -rw-r--r-- | src/sensors/gestures/qsensorgestureplugininterface.h | 3 | ||||
| -rw-r--r-- | src/sensors/qsensormanager.cpp | 3 | ||||
| -rw-r--r-- | src/sensors/qsensorplugin.h | 4 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/sensors/gestures/qsensorgesturemanager.cpp b/src/sensors/gestures/qsensorgesturemanager.cpp index cdc3f5fd..7f38c2e2 100644 --- a/src/sensors/gestures/qsensorgesturemanager.cpp +++ b/src/sensors/gestures/qsensorgesturemanager.cpp @@ -44,6 +44,8 @@ Q_GLOBAL_STATIC(QSensorGestureManagerPrivate, sensorGestureManagerPrivate) +QT_BEGIN_NAMESPACE + /*! \class QSensorGestureManager \ingroup sensorgestures_main @@ -125,3 +127,5 @@ QSensorGestureRecognizer *QSensorGestureManager::sensorGestureRecognizer(const Q { return sensorGestureManagerPrivate()->sensorGestureRecognizer(id); } + +QT_END_NAMESPACE diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h index 1bf527a4..94773c76 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h +++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h @@ -52,6 +52,8 @@ #include "qsensorgesture.h" #include "qsensorgesturerecognizer.h" +QT_BEGIN_NAMESPACE + class QFactoryLoader; class QSensorGestureManagerPrivate : public QObject @@ -79,4 +81,6 @@ Q_SIGNALS: void newSensorGestureAvailable(); }; +QT_END_NAMESPACE + #endif // QSENSORGESTUREMANAGERPRIVATE_P_H diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h index f5ce846c..dd67af6a 100644 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ b/src/sensors/gestures/qsensorgestureplugininterface.h @@ -67,7 +67,8 @@ private: QStringList keys() const; }; -QT_END_NAMESPACE Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, QSensorGestureFactoryInterface_iid); +QT_END_NAMESPACE + #endif // QSENSORGESTUREPLUGININTERFACE_H diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index a7714508..df0aa9c2 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -498,7 +498,6 @@ void QSensor::registerInstance() \sa {Creating a sensor plugin} */ -#include "qsensormanager.moc" - QT_END_NAMESPACE +#include "qsensormanager.moc" diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index c2f417b5..2bbf11e0 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -71,10 +71,10 @@ protected: ~QSensorChangesInterface() {} }; -QT_END_NAMESPACE - Q_DECLARE_INTERFACE(QSensorPluginInterface, QSensorFactoryInterface_iid); Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/1.0"); +QT_END_NAMESPACE + #endif |