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>
This commit is contained in:
Michael Goddard
2011-11-08 17:41:00 +10:00
committed by Qt by Nokia
parent a8be7b6053
commit 8ff4148342
17 changed files with 199 additions and 2 deletions

View File

@@ -47,6 +47,18 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QAudioInfoPrivateRegisterMetaTypes
{
public:
QAudioInfoPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioDeviceInfo>();
}
} _registerMetaTypes;
}
class QAudioDeviceInfoPrivate : public QSharedData class QAudioDeviceInfoPrivate : public QSharedData
{ {
public: public:

View File

@@ -44,6 +44,20 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QAudioFormatPrivateRegisterMetaTypes
{
public:
QAudioFormatPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAudioFormat>();
qRegisterMetaType<QAudioFormat::SampleType>();
qRegisterMetaType<QAudioFormat::Endian>();
}
} _registerMetaTypes;
}
class QAudioFormatPrivate : public QSharedData class QAudioFormatPrivate : public QSharedData
{ {

View File

@@ -114,7 +114,8 @@ SOURCES += qmediacontrol.cpp \
qmediatimerange.cpp \ qmediatimerange.cpp \
qmedianetworkaccesscontrol.cpp \ qmedianetworkaccesscontrol.cpp \
qvideosurfaceoutput.cpp \ qvideosurfaceoutput.cpp \
qmediabackgroundplaybackcontrol.cpp qmediabackgroundplaybackcontrol.cpp \
qtmedianamespace.cpp
#Camera #Camera
PUBLIC_HEADERS += \ PUBLIC_HEADERS += \

View File

@@ -52,6 +52,19 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
namespace
{
class QCameraImageProcessingPrivateRegisterMetaTypes
{
public:
QCameraImageProcessingPrivateRegisterMetaTypes()
{
qRegisterMetaType<QCameraImageProcessing::WhiteBalanceMode>();
}
} _registerMetaTypes;
}
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
/*! /*!

View File

@@ -44,6 +44,18 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QCameraImageProcessingControlPrivateRegisterMetaTypes
{
public:
QCameraImageProcessingControlPrivateRegisterMetaTypes()
{
qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>();
}
} _registerMetaTypes;
}
/*! /*!
\class QCameraImageProcessingControl \class QCameraImageProcessingControl
\inmodule QtMultimedia \inmodule QtMultimedia

View File

@@ -46,6 +46,18 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QMediaContentPrivateRegisterMetaTypes
{
public:
QMediaContentPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaContent>();
}
} _registerMetaTypes;
}
class QMediaContentPrivate : public QSharedData class QMediaContentPrivate : public QSharedData
{ {

View File

@@ -57,6 +57,19 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QMediaImageViewerPrivateRegisterMetaTypes
{
public:
QMediaImageViewerPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaImageViewer::MediaStatus>();
qRegisterMetaType<QMediaImageViewer::State>();
}
} _registerMetaTypes;
}
class QMediaImageViewerPrivate : public QMediaObjectPrivate class QMediaImageViewerPrivate : public QMediaObjectPrivate
{ {
Q_DECLARE_NON_CONST_PUBLIC(QMediaImageViewer) Q_DECLARE_NON_CONST_PUBLIC(QMediaImageViewer)

View File

@@ -61,6 +61,19 @@ QT_BEGIN_NAMESPACE
Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader, Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
(QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive)) (QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive))
namespace
{
class QMediaPlaylistPrivateRegisterMetaTypes
{
public:
QMediaPlaylistPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaPlaylist::Error>();
qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
}
} _registerMetaTypes;
}
/*! /*!
\class QMediaPlaylist \class QMediaPlaylist

View File

@@ -47,6 +47,19 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QMediaResourcePrivateRegisterMetaTypes
{
public:
QMediaResourcePrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaResource>();
qRegisterMetaType<QMediaResourceList>();
}
} _registerMetaTypes;
}
/*! /*!
\class QMediaResource \class QMediaResource

View File

@@ -44,6 +44,18 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QMediaStreamsControlPrivateRegisterMetaTypes
{
public:
QMediaStreamsControlPrivateRegisterMetaTypes()
{
qRegisterMetaType<QMediaStreamsControl::StreamType>();
}
} _registerMetaTypes;
}
/*! /*!
\class QMediaStreamsControl \class QMediaStreamsControl
\preliminary \preliminary

View File

@@ -49,6 +49,20 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QRadioDataPrivateRegisterMetaTypes
{
public:
QRadioDataPrivateRegisterMetaTypes()
{
qRegisterMetaType<QRadioData::Error>();
qRegisterMetaType<QRadioData::ProgramType>();
}
} _registerMetaTypes;
}
/*! /*!
\class QRadioData \class QRadioData
\brief The QRadioData class provides interfaces to the RDS functionality of the system radio. \brief The QRadioData class provides interfaces to the RDS functionality of the system radio.

View File

@@ -49,6 +49,24 @@
QT_BEGIN_NAMESPACE 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 \class QRadioTuner
\brief The QRadioTuner class provides an interface to the systems analog radio device. \brief The QRadioTuner class provides an interface to the systems analog radio device.

View File

@@ -25,6 +25,10 @@
** **
****************************************************************************/ ****************************************************************************/
#include "qtmedianamespace.h"
QT_BEGIN_NAMESPACE
/*! /*!
\namespace QtMultimedia \namespace QtMultimedia
\ingroup multimedia \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 \enum QtMultimedia::MetaData
@@ -206,3 +226,5 @@
\value ResourceError The service could not allocate resources required to function correctly. \value ResourceError The service could not allocate resources required to function correctly.
\value BusyError The service must wait for access to necessary resources. \value BusyError The service must wait for access to necessary resources.
*/ */
QT_END_NAMESPACE

View File

@@ -48,6 +48,19 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QAbstractVideoBufferPrivateRegisterMetaTypes
{
public:
QAbstractVideoBufferPrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
}
} _registerMetaTypes;
}
/*! /*!
\class QAbstractVideoBuffer \class QAbstractVideoBuffer
\brief The QAbstractVideoBuffer class is an abstraction for video data. \brief The QAbstractVideoBuffer class is an abstraction for video data.

View File

@@ -50,6 +50,17 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace
{
class QAbstractVideoSurfacePrivateRegisterMetaTypes
{
public:
QAbstractVideoSurfacePrivateRegisterMetaTypes()
{
qRegisterMetaType<QAbstractVideoSurface::Error>();
}
} _registerMetaTypes;
}
class QAbstractVideoSurfacePrivate { class QAbstractVideoSurfacePrivate {

View File

@@ -61,7 +61,9 @@ class QVideoFramePrivateRegisterMetaTypes
public: public:
QVideoFramePrivateRegisterMetaTypes() QVideoFramePrivateRegisterMetaTypes()
{ {
qRegisterMetaType<QVideoFrame::PixelFormat>("QVideoFrame::PixelFormat"); qRegisterMetaType<QVideoFrame>();
qRegisterMetaType<QVideoFrame::FieldType>();
qRegisterMetaType<QVideoFrame::PixelFormat>();
} }
} _registerMetaTypes; } _registerMetaTypes;
} }

View File

@@ -57,6 +57,8 @@ namespace
QVideoSurfaceFormatPrivateRegisterMetaTypes() QVideoSurfaceFormatPrivateRegisterMetaTypes()
{ {
qRegisterMetaType<QVideoSurfaceFormat>(); qRegisterMetaType<QVideoSurfaceFormat>();
qRegisterMetaType<QVideoSurfaceFormat::Direction>();
qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
} }
} _registerMetaTypes; } _registerMetaTypes;
} }