diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-11-08 17:41:00 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 01:24:18 +0100 |
commit | 8ff4148342600ebc65b63be6417250c06c9e05b5 (patch) | |
tree | 376c2373157bd4284269b4448dfa8550101acb12 /src/multimedia | |
parent | a8be7b6053b836aba27421450161408f2ad7a1e1 (diff) |
Add qRegisterMetaTypes for the public Q_DECLARE_METATYPEs.
Also turned qtmedianamespace.qdoc into a cpp file so I
could stick the qRegisterMetaTypes into it.
Change-Id: Idd6d3e2f348f1ed45b0a35ce180d023a170e8625
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/audio/qaudioformat.cpp | 14 | ||||
-rw-r--r-- | src/multimedia/multimedia.pro | 3 | ||||
-rw-r--r-- | src/multimedia/qcameraimageprocessing.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/qcameraimageprocessingcontrol.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/qmediacontent.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/qmediaimageviewer.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/qmediaplaylist.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/qmediaresource.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/qmediastreamscontrol.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/qradiodata.cpp | 14 | ||||
-rw-r--r-- | src/multimedia/qradiotuner.cpp | 18 | ||||
-rw-r--r-- | src/multimedia/qtmedianamespace.cpp (renamed from src/multimedia/qtmedianamespace.qdoc) | 22 | ||||
-rw-r--r-- | src/multimedia/video/qabstractvideobuffer.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/video/qabstractvideosurface.cpp | 11 | ||||
-rw-r--r-- | src/multimedia/video/qvideoframe.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/video/qvideosurfaceformat.cpp | 2 |
17 files changed, 199 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index f45805dbc..d5ec1967f 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -47,6 +47,18 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QAudioInfoPrivateRegisterMetaTypes + { + public: + QAudioInfoPrivateRegisterMetaTypes() + { + qRegisterMetaType<QAudioDeviceInfo>(); + } + } _registerMetaTypes; +} + class QAudioDeviceInfoPrivate : public QSharedData { public: diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp index 39a36f0fb..db95fc34f 100644 --- a/src/multimedia/audio/qaudioformat.cpp +++ b/src/multimedia/audio/qaudioformat.cpp @@ -44,6 +44,20 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QAudioFormatPrivateRegisterMetaTypes + { + public: + QAudioFormatPrivateRegisterMetaTypes() + { + qRegisterMetaType<QAudioFormat>(); + qRegisterMetaType<QAudioFormat::SampleType>(); + qRegisterMetaType<QAudioFormat::Endian>(); + } + } _registerMetaTypes; +} + class QAudioFormatPrivate : public QSharedData { diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index a603049cd..e8ea8e48a 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -114,7 +114,8 @@ SOURCES += qmediacontrol.cpp \ qmediatimerange.cpp \ qmedianetworkaccesscontrol.cpp \ qvideosurfaceoutput.cpp \ - qmediabackgroundplaybackcontrol.cpp + qmediabackgroundplaybackcontrol.cpp \ + qtmedianamespace.cpp #Camera PUBLIC_HEADERS += \ diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp index 4286afcd1..850606792 100644 --- a/src/multimedia/qcameraimageprocessing.cpp +++ b/src/multimedia/qcameraimageprocessing.cpp @@ -52,6 +52,19 @@ #include <QtCore/QDebug> +namespace +{ + class QCameraImageProcessingPrivateRegisterMetaTypes + { + public: + QCameraImageProcessingPrivateRegisterMetaTypes() + { + qRegisterMetaType<QCameraImageProcessing::WhiteBalanceMode>(); + } + } _registerMetaTypes; +} + + QT_BEGIN_NAMESPACE /*! diff --git a/src/multimedia/qcameraimageprocessingcontrol.cpp b/src/multimedia/qcameraimageprocessingcontrol.cpp index 5e318cc83..fb72a16fb 100644 --- a/src/multimedia/qcameraimageprocessingcontrol.cpp +++ b/src/multimedia/qcameraimageprocessingcontrol.cpp @@ -44,6 +44,18 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QCameraImageProcessingControlPrivateRegisterMetaTypes + { + public: + QCameraImageProcessingControlPrivateRegisterMetaTypes() + { + qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>(); + } + } _registerMetaTypes; +} + /*! \class QCameraImageProcessingControl \inmodule QtMultimedia diff --git a/src/multimedia/qmediacontent.cpp b/src/multimedia/qmediacontent.cpp index 8cd97bbe0..373710cec 100644 --- a/src/multimedia/qmediacontent.cpp +++ b/src/multimedia/qmediacontent.cpp @@ -46,6 +46,18 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QMediaContentPrivateRegisterMetaTypes + { + public: + QMediaContentPrivateRegisterMetaTypes() + { + qRegisterMetaType<QMediaContent>(); + } + } _registerMetaTypes; +} + class QMediaContentPrivate : public QSharedData { diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp index 9a9a65695..562aad4d2 100644 --- a/src/multimedia/qmediaimageviewer.cpp +++ b/src/multimedia/qmediaimageviewer.cpp @@ -57,6 +57,19 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QMediaImageViewerPrivateRegisterMetaTypes + { + public: + QMediaImageViewerPrivateRegisterMetaTypes() + { + qRegisterMetaType<QMediaImageViewer::MediaStatus>(); + qRegisterMetaType<QMediaImageViewer::State>(); + } + } _registerMetaTypes; +} + class QMediaImageViewerPrivate : public QMediaObjectPrivate { Q_DECLARE_NON_CONST_PUBLIC(QMediaImageViewer) diff --git a/src/multimedia/qmediaplaylist.cpp b/src/multimedia/qmediaplaylist.cpp index a5618ad5c..1b6959c66 100644 --- a/src/multimedia/qmediaplaylist.cpp +++ b/src/multimedia/qmediaplaylist.cpp @@ -61,6 +61,19 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader, (QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive)) +namespace +{ + class QMediaPlaylistPrivateRegisterMetaTypes + { + public: + QMediaPlaylistPrivateRegisterMetaTypes() + { + qRegisterMetaType<QMediaPlaylist::Error>(); + qRegisterMetaType<QMediaPlaylist::PlaybackMode>(); + } + } _registerMetaTypes; +} + /*! \class QMediaPlaylist diff --git a/src/multimedia/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp index a80168830..9bd488786 100644 --- a/src/multimedia/qmediaresource.cpp +++ b/src/multimedia/qmediaresource.cpp @@ -47,6 +47,19 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QMediaResourcePrivateRegisterMetaTypes + { + public: + QMediaResourcePrivateRegisterMetaTypes() + { + qRegisterMetaType<QMediaResource>(); + qRegisterMetaType<QMediaResourceList>(); + } + } _registerMetaTypes; +} + /*! \class QMediaResource diff --git a/src/multimedia/qmediastreamscontrol.cpp b/src/multimedia/qmediastreamscontrol.cpp index 65614b612..fb624c67d 100644 --- a/src/multimedia/qmediastreamscontrol.cpp +++ b/src/multimedia/qmediastreamscontrol.cpp @@ -44,6 +44,18 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QMediaStreamsControlPrivateRegisterMetaTypes + { + public: + QMediaStreamsControlPrivateRegisterMetaTypes() + { + qRegisterMetaType<QMediaStreamsControl::StreamType>(); + } + } _registerMetaTypes; +} + /*! \class QMediaStreamsControl \preliminary diff --git a/src/multimedia/qradiodata.cpp b/src/multimedia/qradiodata.cpp index 1840db291..bb9032fdd 100644 --- a/src/multimedia/qradiodata.cpp +++ b/src/multimedia/qradiodata.cpp @@ -49,6 +49,20 @@ QT_BEGIN_NAMESPACE + +namespace +{ + class QRadioDataPrivateRegisterMetaTypes + { + public: + QRadioDataPrivateRegisterMetaTypes() + { + qRegisterMetaType<QRadioData::Error>(); + qRegisterMetaType<QRadioData::ProgramType>(); + } + } _registerMetaTypes; +} + /*! \class QRadioData \brief The QRadioData class provides interfaces to the RDS functionality of the system radio. diff --git a/src/multimedia/qradiotuner.cpp b/src/multimedia/qradiotuner.cpp index 3673d34bd..66b0c7048 100644 --- a/src/multimedia/qradiotuner.cpp +++ b/src/multimedia/qradiotuner.cpp @@ -49,6 +49,24 @@ QT_BEGIN_NAMESPACE + +namespace +{ + class QRadioTunerPrivateRegisterMetaTypes + { + public: + QRadioTunerPrivateRegisterMetaTypes() + { + qRegisterMetaType<QRadioTuner::Band>(); + qRegisterMetaType<QRadioTuner::Error>(); + qRegisterMetaType<QRadioTuner::SearchMode>(); + qRegisterMetaType<QRadioTuner::State>(); + qRegisterMetaType<QRadioTuner::StereoMode>(); + } + } _registerMetaTypes; +} + + /*! \class QRadioTuner \brief The QRadioTuner class provides an interface to the systems analog radio device. diff --git a/src/multimedia/qtmedianamespace.qdoc b/src/multimedia/qtmedianamespace.cpp index bc998e930..f8cbedbab 100644 --- a/src/multimedia/qtmedianamespace.qdoc +++ b/src/multimedia/qtmedianamespace.cpp @@ -25,6 +25,10 @@ ** ****************************************************************************/ +#include "qtmedianamespace.h" + +QT_BEGIN_NAMESPACE + /*! \namespace QtMultimedia \ingroup multimedia @@ -38,6 +42,22 @@ */ +namespace +{ + class QMultimediaNamespacePrivateRegisterMetaTypes + { + public: + QMultimediaNamespacePrivateRegisterMetaTypes() + { + qRegisterMetaType<QtMultimedia::AvailabilityError>(); + qRegisterMetaType<QtMultimedia::SupportEstimate>(); + qRegisterMetaType<QtMultimedia::MetaData>(); + qRegisterMetaType<QtMultimedia::EncodingMode>(); + qRegisterMetaType<QtMultimedia::EncodingQuality>(); + } + } _registerMetaTypes; +} + /*! \enum QtMultimedia::MetaData @@ -206,3 +226,5 @@ \value ResourceError The service could not allocate resources required to function correctly. \value BusyError The service must wait for access to necessary resources. */ + +QT_END_NAMESPACE diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index ea946a6a5..b6b09f4c4 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -48,6 +48,19 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QAbstractVideoBufferPrivateRegisterMetaTypes + { + public: + QAbstractVideoBufferPrivateRegisterMetaTypes() + { + qRegisterMetaType<QAbstractVideoBuffer::HandleType>(); + qRegisterMetaType<QAbstractVideoBuffer::MapMode>(); + } + } _registerMetaTypes; +} + /*! \class QAbstractVideoBuffer \brief The QAbstractVideoBuffer class is an abstraction for video data. diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp index b4a7cec82..139024d23 100644 --- a/src/multimedia/video/qabstractvideosurface.cpp +++ b/src/multimedia/video/qabstractvideosurface.cpp @@ -50,6 +50,17 @@ QT_BEGIN_NAMESPACE +namespace +{ + class QAbstractVideoSurfacePrivateRegisterMetaTypes + { + public: + QAbstractVideoSurfacePrivateRegisterMetaTypes() + { + qRegisterMetaType<QAbstractVideoSurface::Error>(); + } + } _registerMetaTypes; +} class QAbstractVideoSurfacePrivate { diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index d18f4875f..fdbe75080 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -61,7 +61,9 @@ class QVideoFramePrivateRegisterMetaTypes public: QVideoFramePrivateRegisterMetaTypes() { - qRegisterMetaType<QVideoFrame::PixelFormat>("QVideoFrame::PixelFormat"); + qRegisterMetaType<QVideoFrame>(); + qRegisterMetaType<QVideoFrame::FieldType>(); + qRegisterMetaType<QVideoFrame::PixelFormat>(); } } _registerMetaTypes; } diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index 98556cd8b..d70244cb2 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -57,6 +57,8 @@ namespace QVideoSurfaceFormatPrivateRegisterMetaTypes() { qRegisterMetaType<QVideoSurfaceFormat>(); + qRegisterMetaType<QVideoSurfaceFormat::Direction>(); + qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>(); } } _registerMetaTypes; } |