Add QT_BEGIN/END_HEADER things, plus QT_MODULE thing.

Change-Id: I1a5f51a659175cadadcdaf0c4e5e9048f98e64e0
Reviewed-on: http://codereview.qt-project.org/5346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Michael Goddard
2011-09-22 14:27:31 +10:00
committed by Qt by Nokia
parent 4806115e61
commit 8b5c31c5c6
101 changed files with 672 additions and 2 deletions

View File

@@ -51,6 +51,9 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
//QTM_SYNC_HEADER_EXPORT QAudio
namespace QAudio

View File

@@ -65,6 +65,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
extern QDebug operator<<(QDebug dbg, const QAudioFormat& audioFormat);

View File

@@ -65,6 +65,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractAudioInput;
class QAbstractAudioOutput;
class QAbstractAudioDeviceInfo;

View File

@@ -59,6 +59,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioDeviceFactory;
class QAudioDeviceInfoPrivate;

View File

@@ -65,8 +65,13 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
const unsigned int MAX_SAMPLE_RATES = 5;
const unsigned int SAMPLE_RATES[] =
{ 8000, 11025, 22050, 44100, 48000 };
@@ -117,5 +122,8 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioDeviceInfoInternal : public QAbstractAudioDeviceInfo
{
public:

View File

@@ -63,8 +63,13 @@
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
const unsigned int MAX_SAMPLE_RATES = 5;
const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
@@ -109,4 +114,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioFormatPrivate;

View File

@@ -57,6 +57,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractAudioInput;

View File

@@ -67,8 +67,13 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class InputPrivate;
class RingBuffer
@@ -180,4 +185,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -72,6 +72,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QTimer;
class QIODevice;
class QAbstractAudioDeviceInfo;

View File

@@ -69,8 +69,13 @@
#include <qaudiosystem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
// For compat with 4.6
#if !defined(QT_WIN_CALLBACK)
# if defined(Q_CC_MINGW)
@@ -168,4 +173,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -57,6 +57,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractAudioOutput;

View File

@@ -66,8 +66,13 @@
#include "qaudiodeviceinfo.h"
#include "qaudiosystem.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class OutputPrivate;
class QAudioOutputPrivate : public QAbstractAudioOutput
@@ -164,4 +169,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -72,6 +72,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QIODevice;
class QAbstractAudioDeviceInfo;

View File

@@ -76,8 +76,13 @@
# endif
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioOutputPrivate : public QAbstractAudioOutput
{
Q_OBJECT
@@ -164,4 +169,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -61,8 +61,13 @@
#include <QtCore/qpluginloader.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioPluginLoader
{
public:
@@ -89,4 +94,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOPLUGINLOADER_H

View File

@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QAbstractAudioDeviceInfo : public QObject
{
Q_OBJECT

View File

@@ -58,6 +58,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface : public QFactoryInterface
{
virtual QList<QByteArray> availableDevices(QAudio::Mode) const = 0;

View File

@@ -66,6 +66,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QNetworkAccessManager;
class QSampleCache;
class QWaveDecoder;

View File

@@ -63,6 +63,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSoundEffectPrivate;
class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject

View File

@@ -66,6 +66,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSoundEffectPrivate : public QObject
{
Q_OBJECT

View File

@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSoundEffectPrivate : public QObject
{

View File

@@ -62,6 +62,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSound;
class QSoundEffectPrivate : public QObject

View File

@@ -61,6 +61,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QWaveDecoder : public QIODevice
{

View File

@@ -55,8 +55,13 @@
#include "qmediaserviceprovider.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioCaptureSourcePrivate;
class Q_MULTIMEDIA_EXPORT QAudioCaptureSource : public QMediaObject
@@ -92,4 +97,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOCAPTURESOURCE_H

View File

@@ -47,7 +47,12 @@
#include <QtCore/qlist.h>
#include <QtCore/qpair.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QStringList;
class QAudioFormat;
QT_END_NAMESPACE
@@ -84,4 +89,7 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOCAPTUREPROPERTIESCONTROL_H

View File

@@ -45,8 +45,13 @@
#include <qaudio.h>
#include <qmediacontrol.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QAudioEndpointSelector : public QMediaControl
{
Q_OBJECT
@@ -75,4 +80,7 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QAUDIOENDPOINTSELECTOR_H

View File

@@ -59,8 +59,13 @@
#include <qmediaserviceprovider.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QVideoWidget;
class QGraphicsVideoItem;
@@ -228,4 +233,6 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType)
Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus)
Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason)
QT_END_HEADER
#endif // QCAMERA_H

View File

@@ -45,8 +45,13 @@
#include <qmediacontrol.h>
#include <qcameraimagecapture.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraCaptureBufferFormatControl : public QMediaControl
{
Q_OBJECT
@@ -69,5 +74,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferF
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -45,8 +45,13 @@
#include <qmediacontrol.h>
#include <qcameraimagecapture.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraCaptureDestinationControl : public QMediaControl
{
Q_OBJECT
@@ -69,5 +74,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinat
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -47,8 +47,13 @@
#include <qcamera.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraControl : public QMediaControl
{
Q_OBJECT
@@ -89,5 +94,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERACONTROL_H

View File

@@ -45,8 +45,13 @@
#include <qmediaobject.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QCamera;
class QCameraExposurePrivate;
@@ -175,4 +180,6 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
QT_END_HEADER
#endif // QCAMERAEXPOSURE_H

View File

@@ -49,8 +49,13 @@
#include <qcamera.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QMediaControl
{
Q_OBJECT
@@ -112,5 +117,8 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERAEXPOSURECONTROL_H

View File

@@ -48,8 +48,13 @@
#include <qcameraexposure.h>
#include <qcamera.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraFlashControl : public QMediaControl
{
Q_OBJECT
@@ -75,5 +80,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERAFLASHCONTROL_H

View File

@@ -52,8 +52,13 @@
#include <qmediaobject.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QCamera;
class QCameraFocusZoneData;
@@ -173,4 +178,6 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode)
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode)
Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode)
QT_END_HEADER
#endif // QCAMERAFOCUS_H

View File

@@ -47,8 +47,13 @@
#include <qcamerafocus.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QMediaControl
{
Q_OBJECT
@@ -91,5 +96,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERAFOCUSCONTROL_H

View File

@@ -49,7 +49,12 @@
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSize;
QT_END_NAMESPACE
@@ -159,5 +164,7 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations)
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination)
QT_END_HEADER
#endif

View File

@@ -45,7 +45,12 @@
#include <qmediacontrol.h>
#include <qcameraimagecapture.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QImage;
QT_END_NAMESPACE
@@ -87,5 +92,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_i
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERAIMAGECAPTURECONTROL_H

View File

@@ -53,8 +53,13 @@
#include <qmediaservice.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QCamera;
class QCameraImageProcessingPrivate;
@@ -114,4 +119,6 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
QT_END_HEADER
#endif // QCAMERAIMAGEPROCESSING_H

View File

@@ -48,8 +48,13 @@
#include <qcamera.h>
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QMediaControl
{
Q_OBJECT
@@ -89,5 +94,7 @@ Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter)
Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter)
QT_END_HEADER
#endif

View File

@@ -47,8 +47,13 @@
#include <qcamera.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QCameraLocksControl : public QMediaControl
{
Q_OBJECT
@@ -74,5 +79,8 @@ Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERALOCKSCONTROL_H

View File

@@ -48,7 +48,12 @@
#include <QtCore/qsize.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QByteArray;
class QStringList;
QT_END_NAMESPACE
@@ -80,4 +85,7 @@ Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -44,8 +44,13 @@
#include "qmediaplaylistprovider.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QLocalMediaPlaylistProviderPrivate;
class Q_MULTIMEDIA_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider
{
@@ -76,4 +81,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QLOCALMEDIAPAYLISTSOURCE_H

View File

@@ -44,8 +44,13 @@
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMediaBackgroundPlaybackControl : public QMediaControl
{
Q_OBJECT
@@ -72,4 +77,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaBackgroundPlaybackControl, QMediaBackgroundPlaybac
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIABACKGROUNDPLAYBACKCONTROL_H

View File

@@ -44,8 +44,13 @@
#include <qmediaobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaObject;
class Q_MULTIMEDIA_EXPORT QMediaBindableInterface
@@ -66,4 +71,7 @@ Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIABINDABLEINTERFACE_H

View File

@@ -45,8 +45,13 @@
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMediaContainerControl : public QMediaControl
{
Q_OBJECT
@@ -69,4 +74,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIACONTAINERCONTROL_H

View File

@@ -50,8 +50,13 @@
#include <qtmultimediakitdefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaContentPrivate;
class Q_MULTIMEDIA_EXPORT QMediaContent
{
@@ -85,6 +90,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QMediaContent)
QT_END_HEADER
#endif // QMEDIACONTENT_H

View File

@@ -49,8 +49,13 @@
#include <QtCore/qvariant.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaControlPrivate;
class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject
{
@@ -76,4 +81,7 @@ template <typename T> const char *qmediacontrol_iid() { return 0; }
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTMEDIACONTROL_H

View File

@@ -55,8 +55,13 @@
#include <qtmultimediakitdefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaControl;
class QMediaControlPrivate
@@ -69,4 +74,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -48,8 +48,13 @@
#include <qtmultimediakitdefs.h>
#include "qtmedianamespace.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioEncoderSettingsPrivate;
class Q_MULTIMEDIA_EXPORT QAudioEncoderSettings
@@ -157,4 +162,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -46,8 +46,13 @@
#include "qmediacontent.h"
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QGraphicsVideoItem;
class QMediaPlaylist;
@@ -132,4 +137,6 @@ Q_DECLARE_METATYPE(QMediaImageViewer::MediaStatus)
Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, State)
Q_MEDIA_ENUM_DEBUG(QMediaImageViewer, MediaStatus)
QT_END_HEADER
#endif

View File

@@ -61,7 +61,12 @@
#include <QtCore/qpointer.h>
#include <QtGui/qimage.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QNetworkAccessManager;
QT_END_NAMESPACE
@@ -136,4 +141,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -48,8 +48,13 @@
#include <QtCore/qlist.h>
#include <QtNetwork/qnetworkconfiguration.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMediaNetworkAccessControl : public QMediaControl
{
Q_OBJECT
@@ -72,4 +77,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_i
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -48,8 +48,13 @@
#include <qtmultimediakitdefs.h>
#include "qtmedianamespace.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaService;
class QMediaBindableInterface;
@@ -107,4 +112,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTMEDIAOBJECT_H

View File

@@ -59,8 +59,13 @@
#include "qmediaobject.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMetaDataReaderControl;
#define Q_DECLARE_NON_CONST_PUBLIC(Class) \
@@ -88,4 +93,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -52,8 +52,13 @@
QT_BEGIN_HEADER
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QMediaPlaylist;
class QVideoWidget;

View File

@@ -48,8 +48,13 @@
#include <QtCore/qpair.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylist;
class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl
@@ -119,5 +124,8 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYERCONTROL_H

View File

@@ -50,8 +50,13 @@
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylistProvider;
class QMediaPlaylistPrivate;
@@ -144,4 +149,6 @@ Q_DECLARE_METATYPE(QMediaPlaylist::Error)
Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode)
Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error)
QT_END_HEADER
#endif // QMEDIAPLAYLIST_H

View File

@@ -66,8 +66,13 @@
# pragma Q_MOC_EXPAND_MACROS
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylistControl;
class QMediaPlaylistProvider;
class QMediaPlaylistReader;
@@ -166,4 +171,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLIST_P_H

View File

@@ -47,8 +47,13 @@
#include "qmediaplaylistnavigator.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylistProvider;
class Q_MULTIMEDIA_EXPORT QMediaPlaylistControl : public QMediaControl
@@ -87,4 +92,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTCONTROL_H

View File

@@ -50,7 +50,12 @@
#include "qmediacontent.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QString;
class QUrl;
class QByteArray;
@@ -115,4 +120,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTIOPLUGIN_H

View File

@@ -46,8 +46,13 @@
#include "qmediaplaylist.h"
#include <QtCore/qobject.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylistNavigatorPrivate;
class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject
{
@@ -104,4 +109,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTNAVIGATOR_H

View File

@@ -47,7 +47,12 @@
#include "qmediacontent.h"
#include "qmediaplaylist.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QString;
QT_END_NAMESPACE
@@ -104,4 +109,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTPROVIDER_H

View File

@@ -55,8 +55,13 @@
#include "qmediaplaylist.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylistProviderPrivate
{
public:
@@ -68,5 +73,8 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTSOURCE_P_H

View File

@@ -45,8 +45,13 @@
#include <qmediacontrol.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaPlaylist;
class Q_MULTIMEDIA_EXPORT QMediaPlaylistSourceControl : public QMediaControl
@@ -71,4 +76,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLAYLISTCONTROL_H

View File

@@ -60,8 +60,13 @@
#include <QtCore/qmap.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaServiceProviderPlugin;
class Q_AUTOTEST_EXPORT QMediaPluginLoader
@@ -88,4 +93,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIAPLUGINLOADER_H

View File

@@ -50,7 +50,12 @@
#include <QtCore/qpair.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QUrl;
class QSize;
class QAudioFormat;
@@ -187,4 +192,6 @@ Q_DECLARE_METATYPE(QMediaRecorder::Error)
Q_MEDIA_ENUM_DEBUG(QMediaRecorder, State)
Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error)
QT_END_HEADER
#endif // QMEDIARECORDER_H

View File

@@ -45,7 +45,12 @@
#include "qmediacontrol.h"
#include "qmediarecorder.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QUrl;
QT_END_NAMESPACE
@@ -90,4 +95,7 @@ Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -48,8 +48,13 @@
#include <qtmultimediakitdefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMediaResource
{
public:
@@ -124,5 +129,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE(QMediaResource)
Q_DECLARE_METATYPE(QMediaResourceList)
QT_END_HEADER
#endif

View File

@@ -48,8 +48,13 @@
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaServicePrivate;
class Q_MULTIMEDIA_EXPORT QMediaService : public QObject
{
@@ -85,5 +90,8 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QABSTRACTMEDIASERVICE_H

View File

@@ -53,8 +53,13 @@
// We mean it.
//
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAudioDeviceControl;
class QMediaServicePrivate
@@ -68,5 +73,8 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -47,8 +47,13 @@
#include <qtmultimediakitdefs.h>
#include "qtmedianamespace.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaService;
class QMediaServiceProviderHintPrivate;
@@ -168,4 +173,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIASERVICEPROVIDER_H

View File

@@ -52,8 +52,13 @@
# pragma Q_MOC_EXPAND_MACROS
#endif
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaService;
struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface
@@ -117,5 +122,8 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIASERVICEPROVIDERPLUGIN_H

View File

@@ -48,8 +48,13 @@
#include "qtmultimediakitdefs.h"
#include <qmediaenumdebug.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMediaStreamsControl : public QMediaControl
{
Q_OBJECT
@@ -84,5 +89,7 @@ Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType)
Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType)
QT_END_HEADER
#endif // QMEDIASTREAMSCONTROL_H

View File

@@ -46,8 +46,13 @@
#include "qtmedianamespace.h"
#include <QtCore/qshareddata.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaTimeRangePrivate;
class Q_MULTIMEDIA_EXPORT QMediaTimeInterval
@@ -129,4 +134,7 @@ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QMediaTimeRange &);
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMEDIATIMERANGE_H

View File

@@ -50,8 +50,13 @@
#include <qtmultimediakitdefs.h>
#include "qtmedianamespace.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMetaDataReaderControl : public QMediaControl
{
@@ -81,4 +86,7 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QMETADATAPROVIDER_H

View File

@@ -50,8 +50,13 @@
#include <qtmultimediakitdefs.h>
#include "qtmedianamespace.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QMetaDataWriterControl : public QMediaControl
{
@@ -86,4 +91,7 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -50,8 +50,13 @@
#include <QPair>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QRadioTunerPrivate;
class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject
{
@@ -148,4 +153,6 @@ Q_MEDIA_ENUM_DEBUG(QRadioTuner, Band)
Q_MEDIA_ENUM_DEBUG(QRadioTuner, Error)
Q_MEDIA_ENUM_DEBUG(QRadioTuner, StereoMode)
QT_END_HEADER
#endif // QRADIOPLAYER_H

View File

@@ -45,8 +45,13 @@
#include "qmediacontrol.h"
#include "qradiotuner.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QRadioTunerControl : public QMediaControl
{
Q_OBJECT
@@ -112,4 +117,7 @@ Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QRADIOTUNERCONTROL_H

View File

@@ -47,8 +47,13 @@
#include <qtmultimediakitdefs.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
namespace QtMultimediaKit
{
enum MetaData
@@ -187,4 +192,7 @@ namespace QtMultimediaKit
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -44,8 +44,12 @@
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class Q_MULTIMEDIA_EXPORT QVideoDeviceControl : public QMediaControl
{
Q_OBJECT
@@ -77,7 +81,8 @@ protected:
#define QVideoDeviceControl_iid "com.nokia.Qt.QVideoDeviceControl/1.0"
Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QVIDEODEVICECONTROL_H

View File

@@ -48,7 +48,12 @@
#include <QtCore/qpair.h>
#include <QtCore/qsize.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QByteArray;
class QStringList;
QT_END_NAMESPACE
@@ -87,4 +92,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -44,7 +44,12 @@
#include "qmediacontrol.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
QT_END_NAMESPACE
@@ -70,4 +75,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif // QVIDEORENDERERCONTROL_H

View File

@@ -46,8 +46,13 @@
#include <QtCore/qsharedpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoSurface;
class QVideoRendererControl;
@@ -75,4 +80,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -52,6 +52,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QVariant;
class QAbstractVideoBufferPrivate;

View File

@@ -60,8 +60,13 @@
#include <qtmedianamespace.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QAbstractVideoBufferPrivate
{
public:
@@ -77,4 +82,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -49,6 +49,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QRectF;
class QVideoSurfaceFormat;

View File

@@ -55,8 +55,13 @@
#include <qabstractvideobuffer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QImage;
class QImageVideoBufferPrivate;
@@ -76,4 +81,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -57,8 +57,13 @@
QT_BEGIN_HEADER
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMemoryVideoBufferPrivate;
class Q_MULTIMEDIA_EXPORT QMemoryVideoBuffer : public QAbstractVideoBuffer
@@ -76,6 +81,9 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
QT_END_HEADER
#endif

View File

@@ -51,6 +51,8 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QSize;
class QVariant;

View File

@@ -53,6 +53,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QDebug;
class QVideoSurfaceFormatPrivate;

View File

@@ -55,8 +55,13 @@
#include <qmediaserviceprovider.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QCamera;
class QCameraViewfinderPrivate;
@@ -79,4 +84,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif // QCAMERA_H

View File

@@ -65,7 +65,12 @@
#include <qvideosurfaceformat.h>
#include <qvideoframe.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QGLContext;
class QGLShaderProgram;
class QPainterVideoSurface;
@@ -139,4 +144,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -47,7 +47,12 @@
#include <qvideowidget.h>
#include <qmediabindableinterface.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QVideoSurfaceFormat;
QT_END_NAMESPACE
@@ -104,4 +109,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -61,6 +61,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QVideoSurfaceCoreGraphicsPainter : public QVideoSurfacePainter
{
public:

View File

@@ -61,7 +61,12 @@
#include <qabstractvideosurface.h>
#include <qvideoframe.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QGLContext;
QT_END_NAMESPACE
@@ -180,4 +185,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPainterVideoSurface::ShaderTypes)
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -47,8 +47,13 @@
#include <qtmultimediakitwidgetdefs.h>
#include <qmediabindableinterface.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaObject;
class QVideoWidgetPrivate;
@@ -128,4 +133,7 @@ private:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -64,8 +64,13 @@
#include <QtCore/qpointer.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QMediaService;
class QVideoWidgetControlInterface
@@ -279,4 +284,7 @@ public:
QT_END_NAMESPACE
QT_END_HEADER
#endif

View File

@@ -47,8 +47,13 @@
#include <QtWidgets/qwidget.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Multimedia)
class QVideoWidgetControlPrivate;
class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
@@ -94,4 +99,7 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid)
QT_END_NAMESPACE
QT_END_HEADER
#endif

Some files were not shown because too many files have changed in this diff Show More