From 28605b8f741e6c881b62440c07df76114d12c080 Mon Sep 17 00:00:00 2001 From: Angus Cummings Date: Fri, 8 Jun 2012 13:50:06 +1000 Subject: [PATCH] Adding qdoc workaround to all control classes Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba Reviewed-by: Michael Goddard --- src/multimedia/controls/qaudioencodercontrol.h | 3 +++ src/multimedia/controls/qcameracapturebufferformatcontrol.h | 2 ++ src/multimedia/controls/qcameracapturedestinationcontrol.h | 2 ++ src/multimedia/controls/qcameracontrol.h | 2 ++ src/multimedia/controls/qcameraexposurecontrol.h | 2 ++ src/multimedia/controls/qcamerafeedbackcontrol.h | 2 ++ src/multimedia/controls/qcameraflashcontrol.h | 2 ++ src/multimedia/controls/qcamerafocuscontrol.h | 2 ++ src/multimedia/controls/qcameraimagecapturecontrol.h | 3 +++ src/multimedia/controls/qcameraimageprocessingcontrol.h | 2 ++ src/multimedia/controls/qcameralockscontrol.h | 2 ++ src/multimedia/controls/qcameraviewfindersettingscontrol.cpp | 2 +- src/multimedia/controls/qcameraviewfindersettingscontrol.h | 3 +++ src/multimedia/controls/qcamerazoomcontrol.h | 2 ++ src/multimedia/controls/qimageencodercontrol.h | 3 +++ src/multimedia/controls/qmediacontainercontrol.h | 2 ++ src/multimedia/controls/qmediagaplessplaybackcontrol.h | 3 +++ src/multimedia/controls/qmedianetworkaccesscontrol.h | 2 ++ src/multimedia/controls/qmediarecordercontrol.h | 3 +++ src/multimedia/controls/qmediastreamscontrol.h | 2 ++ src/multimedia/controls/qmetadatareadercontrol.h | 3 ++- src/multimedia/controls/qmetadatawritercontrol.h | 3 ++- src/multimedia/controls/qradiodatacontrol.h | 2 ++ src/multimedia/controls/qradiotunercontrol.h | 2 ++ src/multimedia/controls/qvideodevicecontrol.h | 3 +++ src/multimedia/controls/qvideoencodercontrol.h | 3 +++ src/multimedia/controls/qvideowindowcontrol.h | 2 ++ 27 files changed, 61 insertions(+), 3 deletions(-) diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h index 090706a7..6b81f334 100644 --- a/src/multimedia/controls/qaudioencodercontrol.h +++ b/src/multimedia/controls/qaudioencodercontrol.h @@ -59,6 +59,9 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QAudioEncoderControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 976fbdc8..54acd058 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index 542c6921..9279c86a 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraCaptureDestinationControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index cb0e73df..6e9c8c0a 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 227ff036..8d895006 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -55,6 +55,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl { diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h index 0b68a0a9..43ad7486 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ b/src/multimedia/controls/qcamerafeedbackcontrol.h @@ -56,6 +56,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraFeedbackControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h index fbed527c..0be73e45 100644 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ b/src/multimedia/controls/qcameraflashcontrol.h @@ -54,6 +54,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraFlashControl : public QMediaControl { diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index d04be27e..7273da26 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 8b0cc912..1be09ef1 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -56,6 +56,9 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index faa3cfce..ca492463 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -54,6 +54,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h index 4b5e7c0e..c500482d 100644 --- a/src/multimedia/controls/qcameralockscontrol.h +++ b/src/multimedia/controls/qcameralockscontrol.h @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraLocksControl : public QMediaControl { diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp index 8c90d3dd..430bc938 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp @@ -104,7 +104,7 @@ QCameraViewfinderSettingsControl::~QCameraViewfinderSettingsControl() */ /*! - \fn QCameraViewfinderSettingsControl::isViewfinderParameterSupported(ViewfinderParameter parameter) + \fn bool QCameraViewfinderSettingsControl::isViewfinderParameterSupported(ViewfinderParameter parameter) const Returns true if configuration of viewfinder \a parameter is supported by camera backend. */ diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index 58c83877..5802d0bc 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QCameraViewfinderSettingsControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h index b582d011..f4e221b3 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ b/src/multimedia/controls/qcamerazoomcontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QCameraZoomControl : public QMediaControl { diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index 555338fc..ee1a1b96 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -60,6 +60,9 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 16a9fba6..30d389e7 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QMediaControl { diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h index 63fc98e6..2af02db4 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h @@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QMediaGaplessPlaybackControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index ad558035..f3ce0b23 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -54,6 +54,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl { diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index 2783645e..f997889a 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -56,6 +56,9 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index e429f4ca..85fa0617 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -54,6 +54,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl { diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index b40c06d1..a5121d04 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -56,7 +56,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) - +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QMediaControl { diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 8d09df7c..0a31fbf2 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -56,7 +56,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) - +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QMediaControl { diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h index 3dd65f53..e9df398b 100644 --- a/src/multimedia/controls/qradiodatacontrol.h +++ b/src/multimedia/controls/qradiodatacontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QRadioDataControl : public QMediaControl { diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h index a33dcabf..43e06c3c 100644 --- a/src/multimedia/controls/qradiotunercontrol.h +++ b/src/multimedia/controls/qradiotunercontrol.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QRadioTunerControl : public QMediaControl { diff --git a/src/multimedia/controls/qvideodevicecontrol.h b/src/multimedia/controls/qvideodevicecontrol.h index 3197ce45..1ea65dc8 100644 --- a/src/multimedia/controls/qvideodevicecontrol.h +++ b/src/multimedia/controls/qvideodevicecontrol.h @@ -50,6 +50,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qvideoencodercontrol.h b/src/multimedia/controls/qvideoencodercontrol.h index 9ffcd358..4313e1a5 100644 --- a/src/multimedia/controls/qvideoencodercontrol.h +++ b/src/multimedia/controls/qvideoencodercontrol.h @@ -60,6 +60,9 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +// Required for QDoc workaround +class QString; + class Q_MULTIMEDIA_EXPORT QVideoEncoderControl : public QMediaControl { Q_OBJECT diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index 27d8eed2..30d47d7d 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl {