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/imports/audioengine/qaudioengine_openal_p.h
+++ b/src/imports/audioengine/qaudioengine_openal_p.h
@@ -58,8 +58,6 @@
 #include "qsoundsource_p.h"
 #include "qsoundbuffer_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundBufferPrivateAL : public QSoundBuffer
@@ -168,6 +166,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qaudioengine_p.h
+++ b/src/imports/audioengine/qaudioengine_p.h
@@ -47,8 +47,6 @@
 #include <QtCore/QUrl>
 #include <QtGui/qvector3d.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundSource;
@@ -105,6 +103,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
+++ b/src/imports/audioengine/qdeclarative_attenuationmodel_p.h
@@ -46,8 +46,6 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QVector3D>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus
@@ -133,6 +131,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_audiocategory_p.h
+++ b/src/imports/audioengine/qdeclarative_audiocategory_p.h
@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus
@@ -89,6 +87,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_audioengine_p.h
+++ b/src/imports/audioengine/qdeclarative_audioengine_p.h
@@ -50,8 +50,6 @@
 #include <QTimer>
 #include "qaudioengine_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeSoundInstance;
@@ -163,6 +161,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_audiolistener_p.h
+++ b/src/imports/audioengine/qdeclarative_audiolistener_p.h
@@ -45,8 +45,6 @@
 #include <QtCore/QObject>
 #include <QtGui/qvector3d.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeAudioEngine;
@@ -97,6 +95,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_audiosample_p.h
+++ b/src/imports/audioengine/qdeclarative_audiosample_p.h
@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundBuffer;
@@ -106,6 +104,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_playvariation_p.h
+++ b/src/imports/audioengine/qdeclarative_playvariation_p.h
@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeAudioSample;
@@ -106,6 +104,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_sound_p.h
+++ b/src/imports/audioengine/qdeclarative_sound_p.h
@@ -47,8 +47,6 @@
 #include <QtCore/qlist.h>
 #include "qdeclarative_playvariation_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeAudioCategory;
@@ -171,6 +169,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qdeclarative_soundinstance_p.h
+++ b/src/imports/audioengine/qdeclarative_soundinstance_p.h
@@ -46,8 +46,6 @@
 #include <QtGui/qvector3d.h>
 #include "qsoundinstance_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeSound;
@@ -150,6 +148,4 @@ private Q_SLOTS:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/audioengine/qsoundbuffer_p.h
+++ b/src/imports/audioengine/qsoundbuffer_p.h
@@ -44,8 +44,6 @@

 #include <QObject>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundBuffer : public QObject
@@ -65,6 +63,4 @@ protected:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QSOUNDBUFFER_P_H
--- a/src/imports/audioengine/qsoundinstance_p.h
+++ b/src/imports/audioengine/qsoundinstance_p.h
@@ -46,8 +46,6 @@
 #include <QObject>
 #include "qsoundsource_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeSound;
@@ -134,6 +132,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QSOUNDINSTANCE_P_H
--- a/src/imports/audioengine/qsoundsource_p.h
+++ b/src/imports/audioengine/qsoundsource_p.h
@@ -45,8 +45,6 @@
 #include <QVector3D>
 #include <QObject>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundBuffer;
@@ -93,6 +91,4 @@ protected:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -59,8 +59,6 @@

 #include <qmediaplayer.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QTimerEvent;
@@ -271,6 +269,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAudio))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -65,8 +65,6 @@
 #include <QtQml/qqmlparserstatus.h>
 #include <QtQml/qqml.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCameraExposure;
@@ -312,6 +310,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCamera))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecameracapture_p.h
+++ b/src/imports/multimedia/qdeclarativecameracapture_p.h
@@ -59,8 +59,6 @@

 #include <QtQml/qqml.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCamera;
@@ -125,6 +123,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraCapture))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecameraexposure_p.h
+++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h
@@ -57,8 +57,6 @@
 #include <qcamera.h>
 #include <qcameraexposure.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCamera;
@@ -142,6 +140,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraExposure))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecameraflash_p.h
+++ b/src/imports/multimedia/qdeclarativecameraflash_p.h
@@ -56,8 +56,6 @@
 #include <qcamera.h>
 #include <qcameraexposure.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCamera;
@@ -91,6 +89,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFlash))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecamerafocus_p.h
+++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h
@@ -58,8 +58,6 @@
 #include <qcamerafocus.h>
 #include "qdeclarativecamera_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class FocusZonesModel;
@@ -131,6 +129,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFocus))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
@@ -56,8 +56,6 @@
 #include <qcamera.h>
 #include <qcameraimageprocessing.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCamera;
@@ -127,6 +125,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraImageProcessing))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -55,8 +55,6 @@

 #include <QtQuick/qquickimageprovider.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCameraPreviewProvider : public QQuickImageProvider
@@ -71,6 +69,4 @@ public:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativecamerarecorder_p.h
+++ b/src/imports/multimedia/qdeclarativecamerarecorder_p.h
@@ -57,8 +57,6 @@
 #include <qmediarecorder.h>
 #include <qmediaencodersettings.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeCamera;
@@ -227,6 +225,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraRecorder))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -56,8 +56,6 @@
 #include <QtQml/qqml.h>
 #include "qmediaobject.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeMediaMetaData : public QObject
@@ -179,6 +177,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeMediaMetaData))

-QT_END_HEADER
-
 #endif
--- a/src/imports/multimedia/qdeclarativeradio_p.h
+++ b/src/imports/multimedia/qdeclarativeradio_p.h
@@ -56,8 +56,6 @@
 #include <qradiotuner.h>
 #include <QtQml/qqml.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeRadioData;
@@ -202,6 +200,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadio))

-QT_END_HEADER
-
 #endif // QDECLARATIVERADIO_P_H
--- a/src/imports/multimedia/qdeclarativeradiodata_p.h
+++ b/src/imports/multimedia/qdeclarativeradiodata_p.h
@@ -57,8 +57,6 @@
 #include <qradiotuner.h>
 #include <QtQml/qqml.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeRadioData : public QObject
@@ -191,6 +189,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadioData))

-QT_END_HEADER
-
 #endif // QDECLARATIVERADIODATA_P_H
--- a/src/imports/multimedia/qdeclarativetorch_p.h
+++ b/src/imports/multimedia/qdeclarativetorch_p.h
@@ -49,8 +49,6 @@
 #include <qcameraexposurecontrol.h>
 #include <qcameraflashcontrol.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QDeclarativeTorch : public QObject
@@ -88,6 +86,4 @@ QT_END_NAMESPACE

 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeTorch))

-QT_END_HEADER
-
 #endif // QDECLARATIVETORCH_P_H
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -48,8 +48,6 @@

 #include <QtCore/qmetatype.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 //QTM_SYNC_HEADER_EXPORT QAudio
@@ -75,6 +73,4 @@ Q_DECLARE_METATYPE(QAudio::Error)
 Q_DECLARE_METATYPE(QAudio::State)
 Q_DECLARE_METATYPE(QAudio::Mode)

-QT_END_HEADER
-
 #endif // QAUDIO_H
--- a/src/multimedia/audio/qaudio_mac_p.h
+++ b/src/multimedia/audio/qaudio_mac_p.h
@@ -61,8 +61,6 @@

 #include <qaudioformat.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 extern QAudioFormat toQAudioFormat(const AudioStreamBasicDescription& streamFormat);
@@ -132,8 +130,6 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif  // QAUDIO_MAC_P_H


--- a/src/multimedia/audio/qaudiobuffer.h
+++ b/src/multimedia/audio/qaudiobuffer.h
@@ -50,8 +50,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QAbstractAudioBuffer;
@@ -152,6 +150,4 @@ QT_END_NAMESPACE

 Q_DECLARE_METATYPE(QAudioBuffer)

-QT_END_HEADER
-
 #endif // QAUDIOBUFFER_H
--- a/src/multimedia/audio/qaudiobuffer_p.h
+++ b/src/multimedia/audio/qaudiobuffer_p.h
@@ -47,8 +47,6 @@

 #include "qaudioformat.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -86,6 +84,4 @@ public:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOBUFFER_P_H
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -47,8 +47,6 @@

 #include <QtMultimedia/qaudiobuffer.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QAudioDecoderPrivate;
@@ -142,6 +140,4 @@ Q_DECLARE_METATYPE(QAudioDecoder::Error)
 Q_MEDIA_ENUM_DEBUG(QAudioDecoder, State)
 Q_MEDIA_ENUM_DEBUG(QAudioDecoder, Error)

-QT_END_HEADER
-
 #endif  // QAUDIODECODER_H
--- a/src/multimedia/audio/qaudiodevicefactory_p.h
+++ b/src/multimedia/audio/qaudiodevicefactory_p.h
@@ -61,8 +61,6 @@

 #include "qaudiodeviceinfo.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -92,7 +90,5 @@ public:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIODEVICEFACTORY_P_H

--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -55,8 +55,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -110,6 +108,4 @@ QT_END_NAMESPACE

 Q_DECLARE_METATYPE(QAudioDeviceInfo)

-QT_END_HEADER
-
 #endif // QAUDIODEVICEINFO_H
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
@@ -65,8 +65,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -120,8 +118,6 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif

--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
@@ -58,8 +58,6 @@

 #include <qaudiosystem.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -92,6 +90,4 @@ public:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif  // QDEVICEINFO_MAC_P_H
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
@@ -63,8 +63,6 @@
 #include <qaudiosystem.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -112,7 +110,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/audio/qaudioformat.h
+++ b/src/multimedia/audio/qaudioformat.h
@@ -49,8 +49,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QAudioFormatPrivate;
@@ -117,6 +115,4 @@ Q_DECLARE_METATYPE(QAudioFormat)
 Q_DECLARE_METATYPE(QAudioFormat::SampleType)
 Q_DECLARE_METATYPE(QAudioFormat::Endian)

-QT_END_HEADER
-
 #endif  // QAUDIOFORMAT_H
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -110,6 +108,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOINPUT_H
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
@@ -67,8 +67,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -186,7 +184,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/audio/qaudioinput_mac_p.h
+++ b/src/multimedia/audio/qaudioinput_mac_p.h
@@ -68,8 +68,6 @@
 #include <qaudioformat.h>
 #include <qaudiosystem.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -172,6 +170,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOINPUT_MAC_P_H
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
@@ -69,8 +69,6 @@
 #include <qaudiosystem.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -178,7 +176,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -113,6 +111,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOOUTPUT_H
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -66,8 +66,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -171,7 +169,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/audio/qaudiooutput_mac_p.h
+++ b/src/multimedia/audio/qaudiooutput_mac_p.h
@@ -68,8 +68,6 @@
 #include <qaudioformat.h>
 #include <qaudiosystem.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -171,6 +169,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -76,8 +76,6 @@
 #  endif
 #endif

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -170,7 +168,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif
--- a/src/multimedia/audio/qaudioprobe.h
+++ b/src/multimedia/audio/qaudioprobe.h
@@ -45,8 +45,6 @@
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qaudiobuffer.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QMediaObject;
@@ -75,6 +73,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOPROBE_H
--- a/src/multimedia/audio/qaudiosystem.h
+++ b/src/multimedia/audio/qaudiosystem.h
@@ -49,8 +49,6 @@
 #include <QtMultimedia/qaudioformat.h>
 #include <QtMultimedia/qaudiodeviceinfo.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -140,6 +138,4 @@ Q_SIGNALS:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOSYSTEM_H
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudiosystem.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 // Required for QDoc workaround
@@ -92,6 +90,4 @@ public:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QAUDIOSYSTEMPLUGIN_H
--- a/src/multimedia/audio/qsamplecache_p.h
+++ b/src/multimedia/audio/qsamplecache_p.h
@@ -62,8 +62,6 @@
 #include <qaudioformat.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QIODevice;
@@ -165,6 +163,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QSAMPLECACHE_P_H
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtCore/qobject.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundEffect;
@@ -85,7 +83,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QSOUND_H
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -48,8 +48,6 @@
 #include <QtCore/qstringlist.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -132,7 +130,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QSOUNDEFFECT_H
--- a/src/multimedia/audio/qsoundeffect_pulse_p.h
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.h
@@ -62,8 +62,6 @@
 #include <pulse/pulseaudio.h>
 #include "qsamplecache_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundEffectRef;
@@ -169,6 +167,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QSOUNDEFFECT_PULSE_H
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.h
+++ b/src/multimedia/audio/qsoundeffect_qaudio_p.h
@@ -59,8 +59,6 @@
 #include "qsamplecache_p.h"
 #include "qsoundeffect.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSoundEffectPrivate;
@@ -151,6 +149,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // QSOUNDEFFECT_QAUDIO_H
--- a/src/multimedia/audio/qwavedecoder_p.h
+++ b/src/multimedia/audio/qwavedecoder_p.h
@@ -57,8 +57,6 @@
 #include <qaudioformat.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -134,6 +132,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // WAVEDECODER_H
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -58,8 +58,6 @@

 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -234,6 +232,4 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason)

-QT_END_HEADER
-
 #endif  // QCAMERA_H
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -183,6 +181,4 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)

-QT_END_HEADER
-
 #endif // QCAMERAEXPOSURE_H
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -52,8 +52,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -176,6 +174,4 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode)

-QT_END_HEADER
-
 #endif  // QCAMERAFOCUS_H
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -49,8 +49,6 @@

 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QSize;
@@ -161,7 +159,5 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination)

-QT_END_HEADER
-
 #endif

--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -53,8 +53,6 @@
 #include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmediaenumdebug.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -116,6 +114,4 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)

 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)

-QT_END_HEADER
-
 #endif  // QCAMERAIMAGEPROCESSING_H
--- 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
--- a/src/multimedia/playback/playlistfileparser_p.h
+++ b/src/multimedia/playback/playlistfileparser_p.h
@@ -56,8 +56,6 @@
 #include <QtNetwork>
 #include "qtmultimediadefs.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QPlaylistFileParserPrivate;
@@ -108,6 +106,4 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-
 #endif // PLAYLISTFILEPARSER_P_H
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -49,8 +49,6 @@

 #include <QtMultimedia/qtmultimediadefs.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE

 class QMediaPlaylist;
@@ -90,6 +88,4 @@ QT_END_NAMESPACE

 Q_DECLARE_METATYPE(QMediaContent)

-QT_END_HEADER
-
 #endif  // QMEDIACONTENT_H
--- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
@@ -55,8 +55,6 @@

 #include "qmediaplaylistprovider_p.h"

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -95,7 +93,5 @@ private:

 QT_END_NAMESPACE

-QT_END_HEADER
-

 #endif // QMEDIANETWORKPAYLISTSOURCE_P_H
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -48,8 +48,6 @@

 #include <QtNetwork/qnetworkconfiguration.h>

-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -226,6 +224,4 @@ Q_MEDIA_ENUM_DEBUG(QMediaPlayer, State)
 Q_MEDIA_ENUM_DEBUG(QMediaPlayer, MediaStatus)
 Q_MEDIA_ENUM_DEBUG(QMediaPlayer, Error)

-QT_END_HEADER
-
 #endif  // QMEDIAPLAYER_H
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -50,8 +50,6 @@
 #include <QtMultimedia/qmediaenumdebug.h>


-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE


@@ -148,6 +146,4 @@ Q_DECLARE_METATYPE(QMediaPlaylist::Error)
 Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode)
 Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error)

-QT_END_HEADER
-
 #endif  // QMEDIAPLAYLIST_H
--- a/Show More
+++ b/Show More