From fa2fb6be05115af6151fc6e40b809a98ee41e83a Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 21 Oct 2011 17:19:39 +1000 Subject: Revert temporary Q_SENSORS_EXPORT_TEMP Q_SENSORS_EXPORT_TEMP was used while the normal macro was removed from qglobal.h. Change-Id: I55bf788e9beab5b060b9e24ee2a815ce3d9bc2a4 Reviewed-by: Alex --- src/sensors/make_sensor.pl | 6 +++--- src/sensors/qaccelerometer.h | 6 +++--- src/sensors/qambientlightsensor.h | 6 +++--- src/sensors/qcompass.h | 6 +++--- src/sensors/qgyroscope.h | 6 +++--- src/sensors/qirproximitysensor.h | 6 +++--- src/sensors/qlightsensor.h | 6 +++--- src/sensors/qmagnetometer.h | 6 +++--- src/sensors/qorientationsensor.h | 6 +++--- src/sensors/qproximitysensor.h | 6 +++--- src/sensors/qrotationsensor.h | 6 +++--- src/sensors/qsensor.h | 6 +++--- src/sensors/qsensorbackend.h | 2 +- src/sensors/qsensormanager.cpp | 2 +- src/sensors/qsensormanager.h | 4 ++-- src/sensors/qsensorplugin.h | 4 ++-- src/sensors/qsensorsglobal.h | 12 ++++++------ src/sensors/qtapsensor.h | 6 +++--- tests/auto/qsensor/tst_qsensor.cpp | 2 +- tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp | 2 +- 20 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 1317a9ee..e7a18b14 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -128,7 +128,7 @@ QT_BEGIN_NAMESPACE class '.$reading_private.'; -class Q_SENSORS_EXPORT_TEMP '.$reading.' : public QSensorReading +class Q_SENSORS_EXPORT '.$reading.' : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal myprop READ myprop) @@ -138,7 +138,7 @@ public: void setMyprop(qreal myprop); }; -class Q_SENSORS_EXPORT_TEMP '.$filter.' : public QSensorFilter +class Q_SENSORS_EXPORT '.$filter.' : public QSensorFilter { public: virtual bool filter('.$reading.' *reading) = 0; @@ -146,7 +146,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast<'.$reading.'*>(reading)); } }; -class Q_SENSORS_EXPORT_TEMP '.$sensor.' : public QSensor +class Q_SENSORS_EXPORT '.$sensor.' : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h index 08549ed3..e376b3f7 100644 --- a/src/sensors/qaccelerometer.h +++ b/src/sensors/qaccelerometer.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QAccelerometerReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QAccelerometerReading : public QSensorReading +class Q_SENSORS_EXPORT QAccelerometerReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x) @@ -66,7 +66,7 @@ public: void setZ(qreal z); }; -class Q_SENSORS_EXPORT_TEMP QAccelerometerFilter : public QSensorFilter +class Q_SENSORS_EXPORT QAccelerometerFilter : public QSensorFilter { public: virtual bool filter(QAccelerometerReading *reading) = 0; @@ -74,7 +74,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QAccelerometer : public QSensor +class Q_SENSORS_EXPORT QAccelerometer : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h index aa39670c..5f05520c 100644 --- a/src/sensors/qambientlightsensor.h +++ b/src/sensors/qambientlightsensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QAmbientLightReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QAmbientLightReading : public QSensorReading +class Q_SENSORS_EXPORT QAmbientLightReading : public QSensorReading { Q_OBJECT Q_ENUMS(LightLevel) @@ -68,7 +68,7 @@ public: void setLightLevel(LightLevel lightLevel); }; -class Q_SENSORS_EXPORT_TEMP QAmbientLightFilter : public QSensorFilter +class Q_SENSORS_EXPORT QAmbientLightFilter : public QSensorFilter { public: virtual bool filter(QAmbientLightReading *reading) = 0; @@ -76,7 +76,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QAmbientLightSensor : public QSensor +class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index 13dd1acd..623b5c51 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QCompassReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QCompassReading : public QSensorReading +class Q_SENSORS_EXPORT QCompassReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal azimuth READ azimuth) @@ -62,7 +62,7 @@ public: void setCalibrationLevel(qreal calibrationLevel); }; -class Q_SENSORS_EXPORT_TEMP QCompassFilter : public QSensorFilter +class Q_SENSORS_EXPORT QCompassFilter : public QSensorFilter { public: virtual bool filter(QCompassReading *reading) = 0; @@ -70,7 +70,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QCompass : public QSensor +class Q_SENSORS_EXPORT QCompass : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h index ecb6cd84..d4d2b65a 100644 --- a/src/sensors/qgyroscope.h +++ b/src/sensors/qgyroscope.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QGyroscopeReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QGyroscopeReading : public QSensorReading +class Q_SENSORS_EXPORT QGyroscopeReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x) @@ -66,7 +66,7 @@ public: void setZ(qreal z); }; -class Q_SENSORS_EXPORT_TEMP QGyroscopeFilter : public QSensorFilter +class Q_SENSORS_EXPORT QGyroscopeFilter : public QSensorFilter { public: virtual bool filter(QGyroscopeReading *reading) = 0; @@ -74,7 +74,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QGyroscope : public QSensor +class Q_SENSORS_EXPORT QGyroscope : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h index 58b71006..41f99852 100644 --- a/src/sensors/qirproximitysensor.h +++ b/src/sensors/qirproximitysensor.h @@ -46,7 +46,7 @@ class QIRProximityReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QIRProximityReading : public QSensorReading +class Q_SENSORS_EXPORT QIRProximityReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal reflectance READ reflectance) @@ -56,7 +56,7 @@ public: void setReflectance(qreal reflectance); }; -class Q_SENSORS_EXPORT_TEMP QIRProximityFilter : public QSensorFilter +class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter { public: virtual bool filter(QIRProximityReading *reading) = 0; @@ -64,7 +64,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QIRProximitySensor : public QSensor +class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h index 9e3a7de6..6cea67bf 100644 --- a/src/sensors/qlightsensor.h +++ b/src/sensors/qlightsensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QLightReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QLightReading : public QSensorReading +class Q_SENSORS_EXPORT QLightReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal lux READ lux) @@ -58,7 +58,7 @@ public: void setLux(qreal lux); }; -class Q_SENSORS_EXPORT_TEMP QLightFilter : public QSensorFilter +class Q_SENSORS_EXPORT QLightFilter : public QSensorFilter { public: virtual bool filter(QLightReading *reading) = 0; @@ -66,7 +66,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QLightSensor : public QSensor +class Q_SENSORS_EXPORT QLightSensor : public QSensor { Q_OBJECT #ifdef Q_QDOC diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index e8891f17..c382cd71 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QMagnetometerReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QMagnetometerReading : public QSensorReading +class Q_SENSORS_EXPORT QMagnetometerReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x) @@ -70,7 +70,7 @@ public: void setCalibrationLevel(qreal calibrationLevel); }; -class Q_SENSORS_EXPORT_TEMP QMagnetometerFilter : public QSensorFilter +class Q_SENSORS_EXPORT QMagnetometerFilter : public QSensorFilter { public: virtual bool filter(QMagnetometerReading *reading) = 0; @@ -78,7 +78,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QMagnetometer : public QSensor +class Q_SENSORS_EXPORT QMagnetometer : public QSensor { Q_OBJECT #ifdef Q_QDOC diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index d5985f4f..b9e2206e 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QOrientationReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QOrientationReading : public QSensorReading +class Q_SENSORS_EXPORT QOrientationReading : public QSensorReading { Q_OBJECT Q_ENUMS(Orientation) @@ -69,7 +69,7 @@ public: void setOrientation(Orientation orientation); }; -class Q_SENSORS_EXPORT_TEMP QOrientationFilter : public QSensorFilter +class Q_SENSORS_EXPORT QOrientationFilter : public QSensorFilter { public: virtual bool filter(QOrientationReading *reading) = 0; @@ -77,7 +77,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QOrientationSensor : public QSensor +class Q_SENSORS_EXPORT QOrientationSensor : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 3a7cdf7a..5c8ae206 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QProximityReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QProximityReading : public QSensorReading +class Q_SENSORS_EXPORT QProximityReading : public QSensorReading { Q_OBJECT Q_PROPERTY(bool close READ close) @@ -58,7 +58,7 @@ public: void setClose(bool close); }; -class Q_SENSORS_EXPORT_TEMP QProximityFilter : public QSensorFilter +class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter { public: virtual bool filter(QProximityReading *reading) = 0; @@ -66,7 +66,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QProximitySensor : public QSensor +class Q_SENSORS_EXPORT QProximitySensor : public QSensor { Q_OBJECT public: diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index fae93baa..19a548a8 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QRotationReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QRotationReading : public QSensorReading +class Q_SENSORS_EXPORT QRotationReading : public QSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x) @@ -66,7 +66,7 @@ public: void setZ(qreal z); }; -class Q_SENSORS_EXPORT_TEMP QRotationFilter : public QSensorFilter +class Q_SENSORS_EXPORT QRotationFilter : public QSensorFilter { public: virtual bool filter(QRotationReading *reading) = 0; @@ -74,7 +74,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QRotationSensor : public QSensor +class Q_SENSORS_EXPORT QRotationSensor : public QSensor { Q_OBJECT #ifdef Q_QDOC diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index aa97c619..e8eda073 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -71,7 +71,7 @@ struct qoutputrange }; typedef QList qoutputrangelist; -class Q_SENSORS_EXPORT_TEMP QSensor : public QObject +class Q_SENSORS_EXPORT QSensor : public QObject { friend class QSensorBackend; @@ -160,7 +160,7 @@ private: Q_DISABLE_COPY(QSensor) }; -class Q_SENSORS_EXPORT_TEMP QSensorFilter +class Q_SENSORS_EXPORT QSensorFilter { friend class QSensor; public: @@ -172,7 +172,7 @@ protected: QSensor *m_sensor; }; -class Q_SENSORS_EXPORT_TEMP QSensorReading : public QObject +class Q_SENSORS_EXPORT QSensorReading : public QObject { friend class QSensorBackend; diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h index 97751860..43b2aaa9 100644 --- a/src/sensors/qsensorbackend.h +++ b/src/sensors/qsensorbackend.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -class Q_SENSORS_EXPORT_TEMP QSensorBackend : public QObject +class Q_SENSORS_EXPORT QSensorBackend : public QObject { Q_OBJECT public: diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index b303168f..1978e8c5 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -128,7 +128,7 @@ Q_GLOBAL_STATIC(QSensorManagerPrivate, sensorManagerPrivate) static void initPlugin(QObject *plugin); static QSettings::Scope settings_scope = QSettings::SystemScope; static bool load_external_plugins = true; -Q_SENSORS_EXPORT_TEMP void sensors_unit_test_hook(int index) +Q_SENSORS_EXPORT void sensors_unit_test_hook(int index) { QSensorManagerPrivate *d = sensorManagerPrivate(); diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h index 98466511..3fa76987 100644 --- a/src/sensors/qsensormanager.h +++ b/src/sensors/qsensormanager.h @@ -52,7 +52,7 @@ class QSensorPluginInterface; typedef QSensorPluginInterface *(*CreatePluginFunc)(); -class Q_SENSORS_EXPORT_TEMP QSensorManager +class Q_SENSORS_EXPORT QSensorManager { public: // Register a backend (call this from a plugin) @@ -68,7 +68,7 @@ public: static void registerStaticPlugin(CreatePluginFunc func); }; -class Q_SENSORS_EXPORT_TEMP QSensorBackendFactory +class Q_SENSORS_EXPORT QSensorBackendFactory { public: virtual QSensorBackend *createBackend(QSensor *sensor) = 0; diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h index 9e828280..17308ca7 100644 --- a/src/sensors/qsensorplugin.h +++ b/src/sensors/qsensorplugin.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class Q_SENSORS_EXPORT_TEMP QSensorPluginInterface +class Q_SENSORS_EXPORT QSensorPluginInterface { public: virtual void registerSensors() = 0; @@ -58,7 +58,7 @@ protected: ~QSensorPluginInterface() {} }; -class Q_SENSORS_EXPORT_TEMP QSensorChangesInterface +class Q_SENSORS_EXPORT QSensorChangesInterface { public: virtual void sensorsChanged() = 0; diff --git a/src/sensors/qsensorsglobal.h b/src/sensors/qsensorsglobal.h index 0aab6a6d..50f669be 100644 --- a/src/sensors/qsensorsglobal.h +++ b/src/sensors/qsensorsglobal.h @@ -52,20 +52,20 @@ # undef QT_DLL # endif # if defined(QT_BUILD_SENSORS_LIB) -# define Q_SENSORS_EXPORT_TEMP Q_DECL_EXPORT +# define Q_SENSORS_EXPORT Q_DECL_EXPORT # else -# define Q_SENSORS_EXPORT_TEMP Q_DECL_IMPORT +# define Q_SENSORS_EXPORT Q_DECL_IMPORT # endif # elif defined(QT_DLL) -# define Q_SENSORS_EXPORT_TEMP Q_DECL_EXPORT +# define Q_SENSORS_EXPORT Q_DECL_EXPORT # endif #endif -#if !defined(Q_SENSORS_EXPORT_TEMP) +#if !defined(Q_SENSORS_EXPORT) # if defined(QT_SHARED) -# define Q_SENSORS_EXPORT_TEMP Q_DECL_EXPORT +# define Q_SENSORS_EXPORT Q_DECL_EXPORT # else -# define Q_SENSORS_EXPORT_TEMP +# define Q_SENSORS_EXPORT # endif #endif diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index 7e0af918..52ee9c5b 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QTapReadingPrivate; -class Q_SENSORS_EXPORT_TEMP QTapReading : public QSensorReading +class Q_SENSORS_EXPORT QTapReading : public QSensorReading { Q_OBJECT Q_ENUMS(TapDirection) @@ -79,7 +79,7 @@ public: void setDoubleTap(bool doubleTap); }; -class Q_SENSORS_EXPORT_TEMP QTapFilter : public QSensorFilter +class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter { public: virtual bool filter(QTapReading *reading) = 0; @@ -87,7 +87,7 @@ private: bool filter(QSensorReading *reading) { return filter(static_cast(reading)); } }; -class Q_SENSORS_EXPORT_TEMP QTapSensor : public QSensor +class Q_SENSORS_EXPORT QTapSensor : public QSensor { Q_OBJECT #ifdef Q_QDOC diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 03543148..3218d7fc 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -56,7 +56,7 @@ // The unit test needs to change the behaviour of the library. It does this // through an exported but undocumented function. -Q_SENSORS_EXPORT_TEMP void sensors_unit_test_hook(int index); +Q_SENSORS_EXPORT void sensors_unit_test_hook(int index); bool operator==(const qoutputrange &orl1, const qoutputrange &orl2) { return (orl1.minimum == orl2.minimum && diff --git a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp index f7070ed0..34385231 100644 --- a/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp +++ b/tests/auto/sensors2qmlapi/tst_sensors2qmlapi.cpp @@ -53,7 +53,7 @@ QDeclAccelerometer* TestSensorPlugin::stAccel = 0; QDeclAmbientLightSensor* TestSensorPlugin::stAbl = 0; QDeclProximitySensor* TestSensorPlugin::stProxi = 0; -Q_SENSORS_EXPORT_TEMP void sensors_unit_test_hook(int index); +Q_SENSORS_EXPORT void sensors_unit_test_hook(int index); class tst_Sensors2QMLAPI : public QObject { -- cgit v1.2.3