From a57cc59f79b1a229e0266bce25d7e9a8ae920937 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 28 Jan 2013 12:22:11 +0100 Subject: Remove QT_{BEGIN,END}_HEADER macro usage The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: If3f1040766e1c7de05bb8e90cd8a8a2a349bd096 Reviewed-by: Thomas McGuire --- src/imports/sensors/qmlaccelerometer.h | 2 -- src/imports/sensors/qmlambientlightsensor.h | 2 -- src/imports/sensors/qmlcompass.h | 2 -- src/imports/sensors/qmlgyroscope.h | 2 -- src/imports/sensors/qmlholstersensor.h | 2 -- src/imports/sensors/qmlirproximitysensor.h | 2 -- src/imports/sensors/qmllightsensor.h | 2 -- src/imports/sensors/qmlmagnetometer.h | 2 -- src/imports/sensors/qmlorientationsensor.h | 2 -- src/imports/sensors/qmlpressuresensor.h | 2 -- src/imports/sensors/qmlproximitysensor.h | 2 -- src/imports/sensors/qmlrotationsensor.h | 2 -- src/imports/sensors/qmlsensor.h | 2 -- src/imports/sensors/qmlsensorglobal.h | 2 -- src/imports/sensors/qmlsensorrange.h | 2 -- src/imports/sensors/qmltapsensor.h | 2 -- src/imports/sensors/qmltiltsensor.h | 2 -- 17 files changed, 34 deletions(-) (limited to 'src/imports/sensors') diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h index b2dc671f..7a9a4cd0 100644 --- a/src/imports/sensors/qmlaccelerometer.h +++ b/src/imports/sensors/qmlaccelerometer.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAccelerometer; @@ -107,5 +106,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h index eecb6b12..7715a39f 100644 --- a/src/imports/sensors/qmlambientlightsensor.h +++ b/src/imports/sensors/qmlambientlightsensor.h @@ -45,7 +45,6 @@ #include "qmlsensor.h" #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAmbientLightSensor; @@ -86,5 +85,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlcompass.h b/src/imports/sensors/qmlcompass.h index 30edbf0a..76294bf9 100644 --- a/src/imports/sensors/qmlcompass.h +++ b/src/imports/sensors/qmlcompass.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QCompass; @@ -88,5 +87,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlgyroscope.h b/src/imports/sensors/qmlgyroscope.h index c5f6c902..f6fb6795 100644 --- a/src/imports/sensors/qmlgyroscope.h +++ b/src/imports/sensors/qmlgyroscope.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QGyroscope; @@ -92,5 +91,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlholstersensor.h b/src/imports/sensors/qmlholstersensor.h index 95c7bfaf..262ba69d 100644 --- a/src/imports/sensors/qmlholstersensor.h +++ b/src/imports/sensors/qmlholstersensor.h @@ -43,7 +43,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QHolsterSensor; @@ -84,5 +83,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlirproximitysensor.h b/src/imports/sensors/qmlirproximitysensor.h index 2b2d4c49..ec39fe8b 100644 --- a/src/imports/sensors/qmlirproximitysensor.h +++ b/src/imports/sensors/qmlirproximitysensor.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QIRProximitySensor; @@ -83,5 +82,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmllightsensor.h b/src/imports/sensors/qmllightsensor.h index 90fe0b7f..de7e3944 100644 --- a/src/imports/sensors/qmllightsensor.h +++ b/src/imports/sensors/qmllightsensor.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QLightSensor; @@ -91,5 +90,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlmagnetometer.h b/src/imports/sensors/qmlmagnetometer.h index d6c75c1e..a008a36c 100644 --- a/src/imports/sensors/qmlmagnetometer.h +++ b/src/imports/sensors/qmlmagnetometer.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QMagnetometer; @@ -99,5 +98,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h index d14197e8..35e9d6fb 100644 --- a/src/imports/sensors/qmlorientationsensor.h +++ b/src/imports/sensors/qmlorientationsensor.h @@ -45,7 +45,6 @@ #include "qmlsensor.h" #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QOrientationSensor; @@ -86,5 +85,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlpressuresensor.h b/src/imports/sensors/qmlpressuresensor.h index e150c7df..627915a6 100644 --- a/src/imports/sensors/qmlpressuresensor.h +++ b/src/imports/sensors/qmlpressuresensor.h @@ -43,7 +43,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QPressureSensor; @@ -84,5 +83,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h index afbc3a01..17cb2f9a 100644 --- a/src/imports/sensors/qmlproximitysensor.h +++ b/src/imports/sensors/qmlproximitysensor.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QProximitySensor; @@ -84,5 +83,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h index db3b62f6..105b0fb8 100644 --- a/src/imports/sensors/qmlrotationsensor.h +++ b/src/imports/sensors/qmlrotationsensor.h @@ -44,7 +44,6 @@ #include "qmlsensor.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QRotationSensor; @@ -96,5 +95,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h index 9b8f7b75..e538ed0a 100644 --- a/src/imports/sensors/qmlsensor.h +++ b/src/imports/sensors/qmlsensor.h @@ -46,7 +46,6 @@ #include #include "qmlsensorrange.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensor; @@ -187,6 +186,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlsensorglobal.h b/src/imports/sensors/qmlsensorglobal.h index fbbd30d7..cd28ffef 100644 --- a/src/imports/sensors/qmlsensorglobal.h +++ b/src/imports/sensors/qmlsensorglobal.h @@ -45,7 +45,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSensor; @@ -69,6 +68,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmlsensorrange.h b/src/imports/sensors/qmlsensorrange.h index 261825b5..f2fcb510 100644 --- a/src/imports/sensors/qmlsensorrange.h +++ b/src/imports/sensors/qmlsensorrange.h @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QmlSensorRange : public QObject @@ -94,5 +93,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h index f9ae94bd..234af271 100644 --- a/src/imports/sensors/qmltapsensor.h +++ b/src/imports/sensors/qmltapsensor.h @@ -45,7 +45,6 @@ #include "qmlsensor.h" #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QTapSensor; @@ -97,5 +96,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/imports/sensors/qmltiltsensor.h b/src/imports/sensors/qmltiltsensor.h index 9afed564..422c21dd 100644 --- a/src/imports/sensors/qmltiltsensor.h +++ b/src/imports/sensors/qmltiltsensor.h @@ -45,7 +45,6 @@ #include "qmlsensor.h" #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QTiltSensor; @@ -90,5 +89,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif -- cgit v1.2.3