summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorAngus Cummings <angus.cummings@nokia.com>2012-06-08 13:50:06 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-12 05:09:00 +0200
commit28605b8f741e6c881b62440c07df76114d12c080 (patch)
tree8309d1ab70a906c223e74c6f6f981c1f35a1996e /src/multimedia
parent342b8b9be5b804cd7e04b6e1aef0a9989c99bf56 (diff)
Adding qdoc workaround to all control classes
Change-Id: Ic8d8aa6f9824954a7745ddaa2639054dea8bf1ba Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/controls/qaudioencodercontrol.h3
-rw-r--r--src/multimedia/controls/qcameracapturebufferformatcontrol.h2
-rw-r--r--src/multimedia/controls/qcameracapturedestinationcontrol.h2
-rw-r--r--src/multimedia/controls/qcameracontrol.h2
-rw-r--r--src/multimedia/controls/qcameraexposurecontrol.h2
-rw-r--r--src/multimedia/controls/qcamerafeedbackcontrol.h2
-rw-r--r--src/multimedia/controls/qcameraflashcontrol.h2
-rw-r--r--src/multimedia/controls/qcamerafocuscontrol.h2
-rw-r--r--src/multimedia/controls/qcameraimagecapturecontrol.h3
-rw-r--r--src/multimedia/controls/qcameraimageprocessingcontrol.h2
-rw-r--r--src/multimedia/controls/qcameralockscontrol.h2
-rw-r--r--src/multimedia/controls/qcameraviewfindersettingscontrol.cpp2
-rw-r--r--src/multimedia/controls/qcameraviewfindersettingscontrol.h3
-rw-r--r--src/multimedia/controls/qcamerazoomcontrol.h2
-rw-r--r--src/multimedia/controls/qimageencodercontrol.h3
-rw-r--r--src/multimedia/controls/qmediacontainercontrol.h2
-rw-r--r--src/multimedia/controls/qmediagaplessplaybackcontrol.h3
-rw-r--r--src/multimedia/controls/qmedianetworkaccesscontrol.h2
-rw-r--r--src/multimedia/controls/qmediarecordercontrol.h3
-rw-r--r--src/multimedia/controls/qmediastreamscontrol.h2
-rw-r--r--src/multimedia/controls/qmetadatareadercontrol.h3
-rw-r--r--src/multimedia/controls/qmetadatawritercontrol.h3
-rw-r--r--src/multimedia/controls/qradiodatacontrol.h2
-rw-r--r--src/multimedia/controls/qradiotunercontrol.h2
-rw-r--r--src/multimedia/controls/qvideodevicecontrol.h3
-rw-r--r--src/multimedia/controls/qvideoencodercontrol.h3
-rw-r--r--src/multimedia/controls/qvideowindowcontrol.h2
27 files changed, 61 insertions, 3 deletions
diff --git a/src/multimedia/controls/qaudioencodercontrol.h b/src/multimedia/controls/qaudioencodercontrol.h
index 090706a79..6b81f3345 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 976fbdc87..54acd058c 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 542c6921f..9279c86a1 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 cb0e73dfd..6e9c8c0ab 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 227ff036f..8d895006e 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 0b68a0a98..43ad74866 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 fbed527c7..0be73e457 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 d04be27e2..7273da266 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 8b0cc9127..1be09ef16 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 faa3cfce8..ca492463b 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 4b5e7c0e5..c500482da 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 8c90d3dda..430bc938c 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 58c838774..5802d0bca 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 b582d0111..f4e221b35 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 555338fc4..ee1a1b969 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 16a9fba6e..30d389e79 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 63fc98e62..2af02db40 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 ad558035f..f3ce0b235 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 2783645e8..f997889ae 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 e429f4ca2..85fa0617c 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 b40c06d1c..a5121d042 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 8d09df7c8..0a31fbf29 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 3dd65f539..e9df398ba 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 a33dcabf9..43e06c3c9 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 3197ce454..1ea65dc81 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 9ffcd3584..4313e1a50 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 27d8eed26..30d47d7d5 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
{