diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-13 13:52:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 08:49:29 +0200 |
| commit | 6931cbb35a909b192960205929d4a0efde280ee2 (patch) | |
| tree | 84ca34a55756f929d255a887c12c01e69d101259 /src/multimedia/qmediaserviceproviderplugin.h | |
| parent | e975897ad7ebbad12f023e83eae8c4b7840ad6ed (diff) | |
Fix a number of other qdoc issues.
* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs
Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'src/multimedia/qmediaserviceproviderplugin.h')
| -rw-r--r-- | src/multimedia/qmediaserviceproviderplugin.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 346a4438c..ea8003754 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -57,6 +57,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) +// Required for QDoc workaround +class QString; + class QMediaService; class QMediaServiceProviderHintPrivate; @@ -104,6 +107,8 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QMediaServiceProviderHint::Features) +// Required for QDoc workaround +class QString; struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface { @@ -115,6 +120,8 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface "org.qt-project.qt.mediaserviceproviderfactory/5.0" Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid) +// Required for QDoc workaround +class QString; struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface { @@ -127,6 +134,8 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedFormatsInterface "org.qt-project.qt.mediaservicesupportedformats/5.0" Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid) +// Required for QDoc workaround +class QString; struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface { @@ -139,7 +148,8 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceSupportedDevicesInterface "org.qt-project.qt.mediaservicesupporteddevices/5.0" Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid) - +// Required for QDoc workaround +class QString; struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface { @@ -152,6 +162,8 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface "org.qt-project.qt.mediaservicefeatures/5.0" Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid) +// Required for QDoc workaround +class QString; class Q_MULTIMEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface { @@ -214,12 +226,8 @@ public: */ #define Q_MEDIASERVICE_AUDIODECODER "org.qt-project.qt.audiodecode" - - QT_END_NAMESPACE QT_END_HEADER - - #endif // QMEDIASERVICEPROVIDERPLUGIN_H |