diff options
author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-02 14:37:39 +0200 |
---|---|---|
committer | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-09-09 12:26:39 +0200 |
commit | 97177277a2fcca974d7599ab8ea12ad80ab30efc (patch) | |
tree | d9d420880fcf0ce79037bb4459c3b50aae3c19e2 /src/multimedia/controls | |
parent | a4057a86f4acb3fad19527e862d3ee0ba48a1574 (diff) |
Include moc files after QT_END_NAMESPACE
Fixes: QTBUG-76574
Change-Id: I69ef47bbd01967c3d7a0c5d1554fcdd29619ebfa
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src/multimedia/controls')
35 files changed, 41 insertions, 40 deletions
diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp index 09448ca41..4d6d36a2f 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.cpp +++ b/src/multimedia/controls/qaudiodecodercontrol.cpp @@ -261,6 +261,6 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent): or -1 if not available. */ -#include "moc_qaudiodecodercontrol.cpp" QT_END_NAMESPACE +#include "moc_qaudiodecodercontrol.cpp" diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp index ad0437c6e..42f20201c 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp +++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp @@ -134,6 +134,6 @@ QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl() Sets the selected audio \a settings. */ -#include "moc_qaudioencodersettingscontrol.cpp" QT_END_NAMESPACE +#include "moc_qaudioencodersettingscontrol.cpp" diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp index 7f32de3e4..0f8843808 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudioinputselectorcontrol.cpp @@ -125,6 +125,6 @@ QAudioInputSelectorControl::~QAudioInputSelectorControl() Signals that list of available inputs has changed. */ -#include "moc_qaudioinputselectorcontrol.cpp" QT_END_NAMESPACE +#include "moc_qaudioinputselectorcontrol.cpp" diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp index 728ec22ce..20c792f8d 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp @@ -125,6 +125,6 @@ QAudioOutputSelectorControl::~QAudioOutputSelectorControl() Signals that list of available outputs has changed. */ -#include "moc_qaudiooutputselectorcontrol.cpp" QT_END_NAMESPACE +#include "moc_qaudiooutputselectorcontrol.cpp" diff --git a/src/multimedia/controls/qaudiorolecontrol.cpp b/src/multimedia/controls/qaudiorolecontrol.cpp index 0ea2aea53..7b2341846 100644 --- a/src/multimedia/controls/qaudiorolecontrol.cpp +++ b/src/multimedia/controls/qaudiorolecontrol.cpp @@ -112,6 +112,6 @@ QAudioRoleControl::~QAudioRoleControl() Signal emitted when the audio \a role has changed. */ +QT_END_NAMESPACE #include "moc_qaudiorolecontrol.cpp" -QT_END_NAMESPACE diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp index e513e1416..553414681 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp @@ -107,6 +107,6 @@ QCameraCaptureBufferFormatControl::~QCameraCaptureBufferFormatControl() Signals the buffer image capture format changed to \a format. */ -#include "moc_qcameracapturebufferformatcontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameracapturebufferformatcontrol.cpp" diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp index e3ec10374..e037ab5a9 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp @@ -109,6 +109,6 @@ QCameraCaptureDestinationControl::~QCameraCaptureDestinationControl() Signals the image capture \a destination changed. */ -#include "moc_qcameracapturedestinationcontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameracapturedestinationcontrol.cpp" diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp index 0e562c853..03a7a073c 100644 --- a/src/multimedia/controls/qcameracontrol.cpp +++ b/src/multimedia/controls/qcameracontrol.cpp @@ -199,5 +199,6 @@ QCameraControl::~QCameraControl() \value ViewfinderSettings Viewfinder settings are changed. */ -#include "moc_qcameracontrol.cpp" QT_END_NAMESPACE + +#include "moc_qcameracontrol.cpp" diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp index c13be0d5d..1434f0976 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.cpp +++ b/src/multimedia/controls/qcameraexposurecontrol.cpp @@ -201,7 +201,6 @@ QCameraExposureControl::~QCameraExposureControl() \since 5.0 */ - -#include "moc_qcameraexposurecontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameraexposurecontrol.cpp" diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp index d77984dad..d5d9b564f 100644 --- a/src/multimedia/controls/qcameraflashcontrol.cpp +++ b/src/multimedia/controls/qcameraflashcontrol.cpp @@ -128,6 +128,6 @@ QCameraFlashControl::~QCameraFlashControl() Signal emitted when flash state changes to \a ready. */ -#include "moc_qcameraflashcontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameraflashcontrol.cpp" diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp index 6884ab617..d963c95d4 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.cpp +++ b/src/multimedia/controls/qcamerafocuscontrol.cpp @@ -192,6 +192,6 @@ QCameraFocusControl::~QCameraFocusControl() -#include "moc_qcamerafocuscontrol.cpp" QT_END_NAMESPACE +#include "moc_qcamerafocuscontrol.cpp" diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp index bfc973aba..3c110eb68 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp +++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp @@ -189,6 +189,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl() */ -#include "moc_qcameraimagecapturecontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameraimagecapturecontrol.cpp" diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp index a72fc7bb5..a39846642 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp @@ -183,6 +183,6 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl() The base value for platform specific extended parameters. */ -#include "moc_qcameraimageprocessingcontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameraimageprocessingcontrol.cpp" diff --git a/src/multimedia/controls/qcamerainfocontrol.cpp b/src/multimedia/controls/qcamerainfocontrol.cpp index e69e0c3eb..de6dc4277 100644 --- a/src/multimedia/controls/qcamerainfocontrol.cpp +++ b/src/multimedia/controls/qcamerainfocontrol.cpp @@ -97,6 +97,6 @@ QCameraInfoControl::~QCameraInfoControl() in relation to the display in its natural orientation. */ -#include "moc_qcamerainfocontrol.cpp" - QT_END_NAMESPACE + +#include "moc_qcamerainfocontrol.cpp" diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp index c7610dd8f..6fa0ded82 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp @@ -200,6 +200,6 @@ QCameraViewfinderSettingsControl2::~QCameraViewfinderSettingsControl2() Sets the camera viewfinder \a settings. */ -#include "moc_qcameraviewfindersettingscontrol.cpp" QT_END_NAMESPACE +#include "moc_qcameraviewfindersettingscontrol.cpp" diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp index 9a3de0542..9c8d8d289 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.cpp +++ b/src/multimedia/controls/qcamerazoomcontrol.cpp @@ -182,6 +182,6 @@ QCameraZoomControl::~QCameraZoomControl() like capture mode or resolution. */ -#include "moc_qcamerazoomcontrol.cpp" QT_END_NAMESPACE +#include "moc_qcamerazoomcontrol.cpp" diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.cpp b/src/multimedia/controls/qcustomaudiorolecontrol.cpp index 39431be01..046219687 100644 --- a/src/multimedia/controls/qcustomaudiorolecontrol.cpp +++ b/src/multimedia/controls/qcustomaudiorolecontrol.cpp @@ -113,5 +113,6 @@ QCustomAudioRoleControl::~QCustomAudioRoleControl() Signal emitted when the audio \a role has changed. */ -#include "moc_qcustomaudiorolecontrol.cpp" QT_END_NAMESPACE + +#include "moc_qcustomaudiorolecontrol.cpp" diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp index 1d5c23441..c29a61662 100644 --- a/src/multimedia/controls/qimageencodercontrol.cpp +++ b/src/multimedia/controls/qimageencodercontrol.cpp @@ -131,6 +131,6 @@ QImageEncoderControl::~QImageEncoderControl() Sets the selected image encoder \a settings. */ -#include "moc_qimageencodercontrol.cpp" QT_END_NAMESPACE +#include "moc_qimageencodercontrol.cpp" diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp index f71763c96..296f01888 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp +++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp @@ -97,6 +97,6 @@ QMediaAudioProbeControl::~QMediaAudioProbeControl() This signal should be emitted when it is required to release all frames. */ -#include "moc_qmediaaudioprobecontrol.cpp" - QT_END_NAMESPACE + +#include "moc_qmediaaudioprobecontrol.cpp" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 163d71a3f..1a6d73a8a 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -103,5 +103,6 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl() Signal emitted when the current \a availability value changed. */ -#include "moc_qmediaavailabilitycontrol.cpp" QT_END_NAMESPACE + +#include "moc_qmediaavailabilitycontrol.cpp" diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp index 0f130645f..b15c8acdc 100644 --- a/src/multimedia/controls/qmediacontainercontrol.cpp +++ b/src/multimedia/controls/qmediacontainercontrol.cpp @@ -116,6 +116,6 @@ QMediaContainerControl::~QMediaContainerControl() Returns a description of the container \a formatMimeType. */ -#include "moc_qmediacontainercontrol.cpp" QT_END_NAMESPACE +#include "moc_qmediacontainercontrol.cpp" diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp index 222bee216..9e9ad239d 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp @@ -96,7 +96,6 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl() to \a configuration. */ - +QT_END_NAMESPACE #include "moc_qmedianetworkaccesscontrol.cpp" -QT_END_NAMESPACE diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp index 15f9e7d49..28b217af8 100644 --- a/src/multimedia/controls/qmediaplayercontrol.cpp +++ b/src/multimedia/controls/qmediaplayercontrol.cpp @@ -380,6 +380,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent): Signal emitted when playback rate changes to \a rate. */ -#include "moc_qmediaplayercontrol.cpp" QT_END_NAMESPACE +#include "moc_qmediaplayercontrol.cpp" diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp index a9144e404..61e20e170 100644 --- a/src/multimedia/controls/qmediaplaylistcontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp @@ -201,6 +201,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl() Signal emitted when current media changes to \a content. */ -#include "moc_qmediaplaylistcontrol_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylistcontrol_p.cpp" diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp index 3c1ee4565..f95c4b508 100644 --- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp +++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp @@ -121,6 +121,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl() Signal emitted when the playlist has changed to \a playlist. */ -#include "moc_qmediaplaylistsourcecontrol_p.cpp" QT_END_NAMESPACE +#include "moc_qmediaplaylistsourcecontrol_p.cpp" diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index e4667d369..f078073ef 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -217,6 +217,6 @@ QMediaRecorderControl::~QMediaRecorderControl() Signals that an \a error has occurred. The \a errorString describes the error. */ -#include "moc_qmediarecordercontrol.cpp" QT_END_NAMESPACE +#include "moc_qmediarecordercontrol.cpp" diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 2daf50de8..aa5fe007d 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -155,6 +155,6 @@ QMediaStreamsControl::~QMediaStreamsControl() The signal is emitted when the active streams list is changed. */ -#include "moc_qmediastreamscontrol.cpp" QT_END_NAMESPACE +#include "moc_qmediastreamscontrol.cpp" diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp index 57bfbc78b..ea27ab057 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.cpp +++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp @@ -96,6 +96,6 @@ QMediaVideoProbeControl::~QMediaVideoProbeControl() This signal should be emitted when it is required to release all frames. */ -#include "moc_qmediavideoprobecontrol.cpp" - QT_END_NAMESPACE + +#include "moc_qmediavideoprobecontrol.cpp" diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 8e9880c68..e728353f6 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -143,6 +143,6 @@ QMetaDataReaderControl::~QMetaDataReaderControl() be true if the multimedia object has meta-data. */ -#include "moc_qmetadatareadercontrol.cpp" QT_END_NAMESPACE +#include "moc_qmetadatareadercontrol.cpp" diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index e9d7dc793..053597b88 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -163,6 +163,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl() true if meta-data elements can be added or adjusted. */ -#include "moc_qmetadatawritercontrol.cpp" QT_END_NAMESPACE +#include "moc_qmetadatawritercontrol.cpp" diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp index eaa9aaed6..df0046b5e 100644 --- a/src/multimedia/controls/qradiodatacontrol.cpp +++ b/src/multimedia/controls/qradiodatacontrol.cpp @@ -187,6 +187,6 @@ QRadioDataControl::~QRadioDataControl() Signals that the Radio Text \a radioText has changed */ -#include "moc_qradiodatacontrol.cpp" QT_END_NAMESPACE +#include "moc_qradiodatacontrol.cpp" diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp index ccdb3e798..8c4ee7ba4 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp @@ -137,6 +137,6 @@ QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl() Signals that the selected video device \a name has changed. */ -#include "moc_qvideodeviceselectorcontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideodeviceselectorcontrol.cpp" diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp index c06bf7387..52ae51382 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp +++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp @@ -155,6 +155,6 @@ QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl() Sets the selected video encoder \a settings. */ -#include "moc_qvideoencodersettingscontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideoencodersettingscontrol.cpp" diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp index 92973e5f8..e722dfa38 100644 --- a/src/multimedia/controls/qvideorenderercontrol.cpp +++ b/src/multimedia/controls/qvideorenderercontrol.cpp @@ -103,6 +103,6 @@ QVideoRendererControl::~QVideoRendererControl() Sets the \a surface a video producer renders to. */ -#include "moc_qvideorenderercontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideorenderercontrol.cpp" diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp index c41490694..e971a6925 100644 --- a/src/multimedia/controls/qvideowindowcontrol.cpp +++ b/src/multimedia/controls/qvideowindowcontrol.cpp @@ -253,6 +253,6 @@ QVideoWindowControl::~QVideoWindowControl() Signals that a video overlay's \a saturation adjustment has changed. */ -#include "moc_qvideowindowcontrol.cpp" QT_END_NAMESPACE +#include "moc_qvideowindowcontrol.cpp" |