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: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2013-01-27 09:19:58 +01:00
parent f462bb9177
commit 157f4f982b
156 changed files with 0 additions and 623 deletions
--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/src/multimedia/controls/qaudiodecodercontrol.h
@@ -49,8 +49,6 @@

 #include <QtMultimedia/qaudiobuffer.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QIODevice;
@@ -104,6 +102,4 @@ Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif  // QAUDIODECODERCONTROL_H
--- a/src/multimedia/controls/qaudioencodersettingscontrol.h
+++ b/src/multimedia/controls/qaudioencodersettingscontrol.h
@@ -47,8 +47,6 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QStringList;
@@ -85,7 +83,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsContr

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QAUDIOENCODERSETTINGSCONTROL_H
--- a/src/multimedia/controls/qaudioinputselectorcontrol.h
+++ b/src/multimedia/controls/qaudioinputselectorcontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioInputSelectorControl, QAudioInputSelectorControl_i

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QAUDIOINPUTSELECTORCONTROL_H
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.h
+++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QAUDIOOUTPUTSELECTORCONTROL_H
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferF

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif

--- a/src/multimedia/controls/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinat

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif

--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -47,8 +47,6 @@

 #include <QtMultimedia/qcamera.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -94,8 +92,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QCAMERACONTROL_H

--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -49,8 +49,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -103,8 +101,6 @@ Q_DECLARE_METATYPE(QCameraExposureControl::ExposureParameter)

 Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter)

-QT_END_HEADER
-

 #endif  // QCAMERAEXPOSURECONTROL_H

--- a/src/multimedia/controls/qcamerafeedbackcontrol.h
+++ b/src/multimedia/controls/qcamerafeedbackcontrol.h
@@ -50,8 +50,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -96,7 +94,5 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QCAMERAFEEDBACKCONTROL_H
--- a/src/multimedia/controls/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
@@ -48,8 +48,6 @@
 #include <QtMultimedia/qcameraexposure.h>
 #include <QtMultimedia/qcamera.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -80,8 +78,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QCAMERAFLASHCONTROL_H

--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
@@ -47,8 +47,6 @@

 #include <QtMultimedia/qcamerafocus.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -89,8 +87,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QCAMERAFOCUSCONTROL_H

--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QImage;
@@ -92,8 +90,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_i

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QCAMERAIMAGECAPTURECONTROL_H

--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
@@ -48,8 +48,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -97,7 +95,5 @@ Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter)

 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter)

-QT_END_HEADER
-
 #endif

--- a/src/multimedia/controls/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
@@ -47,8 +47,6 @@

 #include <QtMultimedia/qcamera.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -79,8 +77,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QCAMERALOCKSCONTROL_H

--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
@@ -46,8 +46,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -81,6 +79,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSetti

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H
--- a/src/multimedia/controls/qcamerazoomcontrol.h
+++ b/src/multimedia/controls/qcamerazoomcontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediaobject.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -87,6 +85,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif  // QCAMERAZOOMCONTROL_H
--- a/src/multimedia/controls/qimageencodercontrol.h
+++ b/src/multimedia/controls/qimageencodercontrol.h
@@ -48,8 +48,6 @@

 #include <QtCore/qsize.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QByteArray;
@@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.h
@@ -44,8 +44,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QAudioBuffer;
@@ -68,7 +66,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIAAUDIOPROBECONTROL_H
--- a/src/multimedia/controls/qmediaavailabilitycontrol.h
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -46,8 +46,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmultimedia.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -74,6 +72,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QMEDIAAVAILABILITYCONTROL_H
--- a/src/multimedia/controls/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
@@ -45,8 +45,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -74,7 +72,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIACONTAINERCONTROL_H
--- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
@@ -44,8 +44,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediacontent.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -78,6 +76,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackContr

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QMEDIAGAPLESSPLAYBACKCONTROL_H
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
@@ -48,8 +48,6 @@
 #include <QtCore/qlist.h>
 #include <QtNetwork/qnetworkconfiguration.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -77,7 +75,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_i

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -48,8 +48,6 @@

 #include <QtCore/qpair.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -122,8 +120,6 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QMEDIAPLAYERCONTROL_H

--- a/src/multimedia/controls/qmediaplaylistcontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h
@@ -59,8 +59,6 @@
 #include <private/qmediaplaylistnavigator_p.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -102,7 +100,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIAPLAYLISTCONTROL_P_H
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
@@ -56,8 +56,6 @@

 #include <qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -85,7 +83,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIAPLAYLISTCONTROL_P_H
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediarecorder.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QUrl;
@@ -100,7 +98,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
@@ -48,8 +48,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -89,7 +87,5 @@ Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType)

 Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType)

-QT_END_HEADER
-
 #endif // QMEDIASTREAMSCONTROL_H

--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ b/src/multimedia/controls/qmediavideoprobecontrol.h
@@ -46,8 +46,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QVideoFrame;
@@ -70,7 +68,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIAVIDEOPROBECONTROL_H
--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -50,8 +50,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -83,7 +81,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QMETADATAPROVIDER_H
--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -50,8 +50,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/controls/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qradiodata.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -88,7 +86,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioDataControl, QRadioDataControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QRADIODATACONTROL_H
--- a/src/multimedia/controls/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qradiotuner.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -119,7 +117,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif  // QRADIOTUNERCONTROL_H
--- a/src/multimedia/controls/qvideodeviceselectorcontrol.h
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h
@@ -44,8 +44,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -83,6 +81,4 @@ Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QVIDEODEVICESELECTORCONTROL_H
--- a/src/multimedia/controls/qvideoencodersettingscontrol.h
+++ b/src/multimedia/controls/qvideoencodersettingscontrol.h
@@ -48,8 +48,6 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qsize.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QByteArray;
@@ -89,7 +87,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsContr

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/controls/qvideorenderercontrol.h
+++ b/src/multimedia/controls/qvideorenderercontrol.h
@@ -44,8 +44,6 @@

 #include <QtMultimedia/qmediacontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QAbstractVideoSurface;
@@ -68,7 +66,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QVIDEORENDERERCONTROL_H
--- a/src/multimedia/controls/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -47,8 +47,6 @@
 #include <QtCore/qsize.h>
 #include <QtGui/qwindowdefs.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -106,7 +104,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid)

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif