diff options
34 files changed, 82 insertions, 1 deletions
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h index 7bfcc36..af63639 100644 --- a/src/sensors/gestures/qsensorgesture.h +++ b/src/sensors/gestures/qsensorgesture.h @@ -52,6 +52,7 @@ #include <QtCore/qmetatype.h> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorGesturePrivate; @@ -90,6 +91,7 @@ signals: }; QT_END_NAMESPACE +QT_END_HEADER #endif // QSENSORGESTURE_H diff --git a/src/sensors/gestures/qsensorgesture_p.h b/src/sensors/gestures/qsensorgesture_p.h index f55f393..d146a2e 100644 --- a/src/sensors/gestures/qsensorgesture_p.h +++ b/src/sensors/gestures/qsensorgesture_p.h @@ -60,6 +60,8 @@ #include "qsensorgesture.h" #include "qsensorgesturemanager.h" #include <QtCore/private/qmetaobjectbuilder_p.h> + +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorGesturePrivate : public QObject @@ -82,5 +84,6 @@ public: QT_END_NAMESPACE +QT_END_HEADER #endif // QSENSORGESTURE_P_H diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h index 94773c7..14aacde 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h +++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h @@ -52,6 +52,7 @@ #include "qsensorgesture.h" #include "qsensorgesturerecognizer.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QFactoryLoader; @@ -82,5 +83,6 @@ Q_SIGNALS: }; QT_END_NAMESPACE +QT_END_HEADER #endif // QSENSORGESTUREMANAGERPRIVATE_P_H diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h index dd67af6..05aa7e9 100644 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ b/src/sensors/gestures/qsensorgestureplugininterface.h @@ -49,6 +49,7 @@ #include "qsensorgesture.h" #include "qsensorgesturerecognizer.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorGestureRecognizer; @@ -70,5 +71,6 @@ private: Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, QSensorGestureFactoryInterface_iid); QT_END_NAMESPACE +QT_END_HEADER #endif // QSENSORGESTUREPLUGININTERFACE_H diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h index 336fddc..3ec5028 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.h +++ b/src/sensors/gestures/qsensorgesturerecognizer.h @@ -48,6 +48,7 @@ #include "qsensorgesture.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorGestureRecognizerPrivate; @@ -79,7 +80,8 @@ protected: private: QSensorGestureRecognizerPrivate * d_ptr; }; -QT_END_NAMESPACE +QT_END_NAMESPACE +QT_END_HEADER #endif // QSENSORGESTURERECOGNIZER_H diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index e376b3f..908c089 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAccelerometerReadingPrivate; @@ -85,6 +86,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qaccelerometer_p.h b/src/sensors/qaccelerometer_p.h index c1b77c8..ce0d0c9 100644 --- a/src/sensors/qaccelerometer_p.h +++ b/src/sensors/qaccelerometer_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAccelerometerReadingPrivate @@ -71,6 +72,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h index 5f05520..23abc9c 100644 --- a/src/sensors/qambientlightsensor.h +++ b/src/sensors/qambientlightsensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAmbientLightReadingPrivate; @@ -87,6 +88,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qambientlightsensor_p.h b/src/sensors/qambientlightsensor_p.h index 861628d..8f130a8 100644 --- a/src/sensors/qambientlightsensor_p.h +++ b/src/sensors/qambientlightsensor_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAmbientLightReadingPrivate @@ -67,6 +68,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index 623b5c5..4b5d617 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QCompassReadingPrivate; @@ -81,6 +82,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qcompass_p.h b/src/sensors/qcompass_p.h index 6385279..ed382f0 100644 --- a/src/sensors/qcompass_p.h +++ b/src/sensors/qcompass_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QCompassReadingPrivate @@ -69,6 +70,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h index d4d2b65..545c664 100644 --- a/src/sensors/qgyroscope.h +++ b/src/sensors/qgyroscope.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QGyroscopeReadingPrivate; @@ -85,6 +86,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qgyroscope_p.h b/src/sensors/qgyroscope_p.h index 45cb92b..d824f04 100644 --- a/src/sensors/qgyroscope_p.h +++ b/src/sensors/qgyroscope_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QGyroscopeReadingPrivate @@ -71,6 +72,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h index 41f9985..808da43 100644 --- a/src/sensors/qirproximitysensor.h +++ b/src/sensors/qirproximitysensor.h @@ -44,6 +44,9 @@ #include "qsensor.h" +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + class QIRProximityReadingPrivate; class Q_SENSORS_EXPORT QIRProximityReading : public QSensorReading @@ -74,5 +77,8 @@ public: static char const * const type; }; +QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/sensors/qirproximitysensor_p.h b/src/sensors/qirproximitysensor_p.h index 1fb431b..fb7aef8 100644 --- a/src/sensors/qirproximitysensor_p.h +++ b/src/sensors/qirproximitysensor_p.h @@ -53,6 +53,9 @@ // We mean it. // +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + class QIRProximityReadingPrivate { public: @@ -71,4 +74,7 @@ public: qreal reflectance; }; +QT_END_NAMESPACE +QT_END_HEADER + #endif diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h index 6cea67b..d40a5ab 100644 --- a/src/sensors/qlightsensor.h +++ b/src/sensors/qlightsensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QLightReadingPrivate; @@ -80,6 +81,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qlightsensor_p.h b/src/sensors/qlightsensor_p.h index 81dcf96..fac22a1 100644 --- a/src/sensors/qlightsensor_p.h +++ b/src/sensors/qlightsensor_p.h @@ -55,6 +55,7 @@ #include "qsensor_p.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QLightReadingPrivate : public QSensorReadingPrivate @@ -69,6 +70,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index c382cd7..e181023 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QMagnetometerReadingPrivate; @@ -92,6 +93,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qmagnetometer_p.h b/src/sensors/qmagnetometer_p.h index 8bd7304..c922ee7 100644 --- a/src/sensors/qmagnetometer_p.h +++ b/src/sensors/qmagnetometer_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QMagnetometerReadingPrivate @@ -73,6 +74,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index b9e2206..6bd0b92 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QOrientationReadingPrivate; @@ -88,6 +89,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qorientationsensor_p.h b/src/sensors/qorientationsensor_p.h index ca04378..e949ab7 100644 --- a/src/sensors/qorientationsensor_p.h +++ b/src/sensors/qorientationsensor_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QOrientationReadingPrivate @@ -67,6 +68,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 5c8ae20..1cafc5e 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QProximityReadingPrivate; @@ -77,6 +78,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qproximitysensor_p.h b/src/sensors/qproximitysensor_p.h index 17f338c..d09850a 100644 --- a/src/sensors/qproximitysensor_p.h +++ b/src/sensors/qproximitysensor_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QProximityReadingPrivate @@ -67,6 +68,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index 19a548a..ada2fd7 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QRotationReadingPrivate; @@ -88,6 +89,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qrotationsensor_p.h b/src/sensors/qrotationsensor_p.h index 0a4e071..debefe6 100644 --- a/src/sensors/qrotationsensor_p.h +++ b/src/sensors/qrotationsensor_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QRotationReadingPrivate @@ -71,6 +72,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index e8eda07..e3c173b 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -50,6 +50,7 @@ #include <QtCore/QVariant> #include <QtCore/QPair> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorPrivate; @@ -233,6 +234,7 @@ private: QT_END_NAMESPACE +QT_END_HEADER Q_DECLARE_METATYPE(qrange) Q_DECLARE_METATYPE(qrangelist) diff --git a/src/sensors/qsensor_p.h b/src/sensors/qsensor_p.h index f07458f..178e0c4 100644 --- a/src/sensors/qsensor_p.h +++ b/src/sensors/qsensor_p.h @@ -55,6 +55,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE typedef QList<QSensorFilter*> QFilterList; @@ -114,6 +115,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index 43b2aaa..946b9a0 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -45,6 +45,7 @@ #include "qsensor.h" #include "qsensormanager.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class Q_SENSORS_EXPORT QSensorBackend : public QObject @@ -89,6 +90,7 @@ private: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h index 3fa7698..a432fa7 100644 --- a/src/sensors/qsensormanager.h +++ b/src/sensors/qsensormanager.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensorBackend; @@ -103,6 +104,7 @@ protected: Q_IMPORT_PLUGIN(pluginname) QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index 2bbf11e..b5f74d4 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -48,6 +48,7 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QSensorFactoryInterface_iid "com.nokia.Qt.QSensorPluginInterface/1.0" @@ -75,6 +76,7 @@ Q_DECLARE_INTERFACE(QSensorPluginInterface, QSensorFactoryInterface_iid); Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/1.0"); QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qsensorpluginloader_p.h b/src/sensors/qsensorpluginloader_p.h index 634c498..fe18cfa 100644 --- a/src/sensors/qsensorpluginloader_p.h +++ b/src/sensors/qsensorpluginloader_p.h @@ -58,6 +58,7 @@ #include <QtCore/qlist.h> #include <QtCore/qpluginloader.h> +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QFactoryLoader; @@ -78,6 +79,7 @@ private: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 52ee9c5..ef31823 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -44,6 +44,7 @@ #include "qsensor.h" +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QTapReadingPrivate; @@ -101,6 +102,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/qtapsensor_p.h b/src/sensors/qtapsensor_p.h index b291d69..649eb7a 100644 --- a/src/sensors/qtapsensor_p.h +++ b/src/sensors/qtapsensor_p.h @@ -53,6 +53,7 @@ // We mean it. // +QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QTapReadingPrivate @@ -69,6 +70,7 @@ public: }; QT_END_NAMESPACE +QT_END_HEADER #endif diff --git a/src/sensors/sensorlog_p.h b/src/sensors/sensorlog_p.h index 604389c..17bcf4d 100644 --- a/src/sensors/sensorlog_p.h +++ b/src/sensors/sensorlog_p.h @@ -53,6 +53,9 @@ // We mean it. // +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + #ifdef ENABLE_RUNTIME_SENSORLOG static bool logEnabled() @@ -79,5 +82,8 @@ static bool logEnabled() #endif +QT_END_NAMESPACE +QT_END_HEADER + #endif |