Use Q_CONSTRUCTOR_FUNCTION macro to register multimedia meta types.

Task-number: QTBUG-39131
Change-Id: I2493c9e3e6f0065d0441a74ff240d7d91fbe059c
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

src/multimedia/audio/qaudio.cpp

@@ -45,22 +45,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace QAudio
+static void qRegisterAudioMetaTypes()
-{
-
-class RegisterMetaTypes
-{
-public:
-    RegisterMetaTypes()
 {
     qRegisterMetaType<QAudio::Error>();
     qRegisterMetaType<QAudio::State>();
     qRegisterMetaType<QAudio::Mode>();
 }
 
-} _register;
+Q_CONSTRUCTOR_FUNCTION(qRegisterAudioMetaTypes)
-
-}
 
 /*!
     \namespace QAudio

src/multimedia/audio/qaudiobuffer.cpp

@@ -47,17 +47,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+
-{
+static void qRegisterAudioBufferMetaTypes()
-    class QAudioBufferPrivateRegisterMetaTypes
-    {
-    public:
-        QAudioBufferPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QAudioBuffer>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterAudioBufferMetaTypes)
 
 
 class QAudioBufferPrivate : public QSharedData

src/multimedia/audio/qaudiodecoder.cpp

@@ -72,18 +72,13 @@ QT_BEGIN_NAMESPACE
     \sa QAudioBuffer
 */
 
-namespace
+static void qRegisterAudioDecoderMetaTypes()
-{
-class AudioDecoderRegisterMetaTypes
-{
-public:
-    AudioDecoderRegisterMetaTypes()
 {
     qRegisterMetaType<QAudioDecoder::State>("QAudioDecoder::State");
     qRegisterMetaType<QAudioDecoder::Error>("QAudioDecoder::Error");
 }
-} _registerPlayerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDecoderMetaTypes)
 
 class QAudioDecoderPrivate : public QMediaObjectPrivate
 {

src/multimedia/audio/qaudiodeviceinfo.cpp

@@ -47,17 +47,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterAudioDeviceInfoMetaTypes()
-{
-    class QAudioInfoPrivateRegisterMetaTypes
-    {
-    public:
-        QAudioInfoPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QAudioDeviceInfo>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterAudioDeviceInfoMetaTypes)
 
 class QAudioDeviceInfoPrivate : public QSharedData
 {

src/multimedia/audio/qaudioformat.cpp

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

src/multimedia/camera/qcamera.cpp

@@ -56,12 +56,9 @@
 
 #include <QDebug>
 
-namespace
+QT_BEGIN_NAMESPACE
-{
+
-class CameraRegisterMetaTypes
+static void qRegisterCameraMetaTypes()
-{
-public:
-    CameraRegisterMetaTypes()
 {
     qRegisterMetaType<QCamera::Error>("QCamera::Error");
     qRegisterMetaType<QCamera::State>("QCamera::State");
@@ -72,10 +69,8 @@ public:
     qRegisterMetaType<QCamera::LockChangeReason>("QCamera::LockChangeReason");
     qRegisterMetaType<QCamera::Position>("QCamera::Position");
 }
-} _registerCameraMetaTypes;
-}
 
-QT_BEGIN_NAMESPACE
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraMetaTypes)
 
 /*!
     \class QCamera

src/multimedia/camera/qcameraexposure.cpp

@@ -65,20 +65,14 @@ QT_BEGIN_NAMESPACE
 
 //#define DEBUG_EXPOSURE_CHANGES 1
 
-namespace
+static void qRegisterCameraExposureMetaTypes()
-{
-class CameraExposureRegisterMetaTypes
-{
-public:
-    CameraExposureRegisterMetaTypes()
 {
     qRegisterMetaType<QCameraExposure::ExposureMode>("QCameraExposure::ExposureMode");
     qRegisterMetaType<QCameraExposure::FlashModes>("QCameraExposure::FlashModes");
     qRegisterMetaType<QCameraExposure::MeteringMode>("QCameraExposure::MeteringMode");
 }
-} _registerCameraExposureMetaTypes;
-}
 
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraExposureMetaTypes)
 
 
 class QCameraExposurePrivate

src/multimedia/camera/qcamerafocus.cpp

@@ -55,18 +55,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterCameraFocusMetaTypes()
-{
-class CameraFocusRegisterMetaTypes
-{
-public:
-    CameraFocusRegisterMetaTypes()
 {
     qRegisterMetaType<QCameraFocus::FocusModes>("QCameraFocus::FocusModes");
     qRegisterMetaType<QCameraFocus::FocusPointMode>("QCameraFocus::FocusPointMode");
 }
-} _registerCameraFocusMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraFocusMetaTypes)
+
 
 class QCameraFocusFakeZoomControl : public QCameraZoomControl
 {

src/multimedia/camera/qcameraimagecapture.cpp

@@ -83,19 +83,14 @@ QT_BEGIN_NAMESPACE
     \value CaptureToBuffer  Capture the image to a buffer for further processing.
 */
 
-namespace
+static void qRegisterCameraImageCaptureMetaTypes()
-{
-class MediaRecorderRegisterMetaTypes
-{
-public:
-    MediaRecorderRegisterMetaTypes()
 {
     qRegisterMetaType<QCameraImageCapture::Error>("QCameraImageCapture::Error");
     qRegisterMetaType<QCameraImageCapture::CaptureDestination>("QCameraImageCapture::CaptureDestination");
     qRegisterMetaType<QCameraImageCapture::CaptureDestinations>("QCameraImageCapture::CaptureDestinations");
 }
-} _registerRecorderMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageCaptureMetaTypes)
 
 
 class QCameraImageCapturePrivate

src/multimedia/camera/qcameraimageprocessing.cpp

@@ -52,20 +52,15 @@
 
 #include <QtCore/QDebug>
 
-namespace
+QT_BEGIN_NAMESPACE
-{
+
-    class QCameraImageProcessingPrivateRegisterMetaTypes
+static void qRegisterCameraImageProcessingMetaTypes()
-    {
-    public:
-        QCameraImageProcessingPrivateRegisterMetaTypes()
         {
             qRegisterMetaType<QCameraImageProcessing::WhiteBalanceMode>();
         }
-    } _registerMetaTypes;
-}
 
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingMetaTypes)
 
-QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraImageProcessing

src/multimedia/controls/qcameraimageprocessingcontrol.cpp

@@ -44,17 +44,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterCameraImageProcessingControlMetaTypes()
-{
-    class QCameraImageProcessingControlPrivateRegisterMetaTypes
-    {
-    public:
-        QCameraImageProcessingControlPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QCameraImageProcessingControl::ProcessingParameter>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterCameraImageProcessingControlMetaTypes)
 
 /*!
     \class QCameraImageProcessingControl

src/multimedia/controls/qmediastreamscontrol.cpp

@@ -44,17 +44,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterMediaStreamControlMetaTypes()
-{
-    class QMediaStreamsControlPrivateRegisterMetaTypes
-    {
-    public:
-        QMediaStreamsControlPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaStreamsControl::StreamType>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaStreamControlMetaTypes)
+
 
 /*!
     \class QMediaStreamsControl

src/multimedia/playback/qmediacontent.cpp

@@ -48,17 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterMediaContentMetaTypes()
-{
-    class QMediaContentPrivateRegisterMetaTypes
-    {
-    public:
-        QMediaContentPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaContent>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaContentMetaTypes)
 
 
 class QMediaContentPrivate : public QSharedData

src/multimedia/playback/qmediaplayer.cpp

@@ -90,19 +90,15 @@ QT_BEGIN_NAMESPACE
     \sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist
 */
 
-namespace
+static void qRegisterMediaPlayerMetaTypes()
-{
-class MediaPlayerRegisterMetaTypes
-{
-public:
-    MediaPlayerRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaPlayer::State>("QMediaPlayer::State");
     qRegisterMetaType<QMediaPlayer::MediaStatus>("QMediaPlayer::MediaStatus");
     qRegisterMetaType<QMediaPlayer::Error>("QMediaPlayer::Error");
 }
-} _registerPlayerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlayerMetaTypes)
+
 
 #define MAX_NESTED_PLAYLISTS 16
 

src/multimedia/playback/qmediaplaylist.cpp

@@ -61,18 +61,13 @@ QT_BEGIN_NAMESPACE
 Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
         (QMediaPlaylistIOInterface_iid, QLatin1String("playlistformats"), Qt::CaseInsensitive))
 
-namespace
+static void qRegisterMediaPlaylistMetaTypes()
-{
-    class QMediaPlaylistPrivateRegisterMetaTypes
-    {
-    public:
-        QMediaPlaylistPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaPlaylist::Error>();
     qRegisterMetaType<QMediaPlaylist::PlaybackMode>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaPlaylistMetaTypes)
 
 
 /*!

src/multimedia/playback/qmediaresource.cpp

@@ -47,18 +47,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterMediaResourceMetaTypes()
-{
-    class QMediaResourcePrivateRegisterMetaTypes
-    {
-    public:
-        QMediaResourcePrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaResource>();
     qRegisterMetaType<QMediaResourceList>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaResourceMetaTypes)
+
 
 /*!
     \class QMediaResource

src/multimedia/qmultimedia.cpp

@@ -41,20 +41,16 @@ QT_BEGIN_NAMESPACE
 
 */
 
-namespace
+static void qRegisterMultimediaMetaTypes()
-{
-    class QMultimediaNamespacePrivateRegisterMetaTypes
-    {
-    public:
-        QMultimediaNamespacePrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QMultimedia::AvailabilityStatus>();
     qRegisterMetaType<QMultimedia::SupportEstimate>();
     qRegisterMetaType<QMultimedia::EncodingMode>();
     qRegisterMetaType<QMultimedia::EncodingQuality>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMultimediaMetaTypes)
+
 
 /*!
     \enum QMultimedia::SupportEstimate

src/multimedia/radio/qradiodata.cpp

@@ -50,19 +50,14 @@
 
 QT_BEGIN_NAMESPACE
 
-
+static void qRegisterRadioDataMetaTypes()
-namespace
-{
-    class QRadioDataPrivateRegisterMetaTypes
-    {
-    public:
-        QRadioDataPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QRadioData::Error>();
     qRegisterMetaType<QRadioData::ProgramType>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterRadioDataMetaTypes)
+
 
 /*!
     \class QRadioData

src/multimedia/radio/qradiotuner.cpp

@@ -52,12 +52,7 @@
 QT_BEGIN_NAMESPACE
 
 
-namespace
+static void qRegisterRadioTunerMetaTypes()
-{
-    class QRadioTunerPrivateRegisterMetaTypes
-    {
-    public:
-        QRadioTunerPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QRadioTuner::Band>();
     qRegisterMetaType<QRadioTuner::Error>();
@@ -65,8 +60,8 @@ namespace
     qRegisterMetaType<QRadioTuner::State>();
     qRegisterMetaType<QRadioTuner::StereoMode>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterRadioTunerMetaTypes)
 
 
 /*!

src/multimedia/recording/qmediaencodersettings.cpp

@@ -43,19 +43,15 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterEncoderSettingsMetaTypes()
-{
-class QMediaEncoderSettingsPrivateRegisterMetaTypes
-{
-public:
-    QMediaEncoderSettingsPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QAudioEncoderSettings>();
     qRegisterMetaType<QVideoEncoderSettings>();
     qRegisterMetaType<QImageEncoderSettings>();
 }
-} _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterEncoderSettingsMetaTypes)
+
 
 class QAudioEncoderSettingsPrivate  : public QSharedData
 {

src/multimedia/recording/qmediarecorder.cpp

@@ -80,19 +80,15 @@ QT_BEGIN_NAMESPACE
     \sa QAudioRecorder
 */
 
-namespace
+static void qRegisterMediaRecorderMetaTypes()
-{
-class MediaRecorderRegisterMetaTypes
-{
-public:
-    MediaRecorderRegisterMetaTypes()
 {
     qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
     qRegisterMetaType<QMediaRecorder::Status>("QMediaRecorder::Status");
     qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
 }
-} _registerRecorderMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes)
+
 
 QMediaRecorderPrivate::QMediaRecorderPrivate():
      mediaObject(0),

src/multimedia/video/qabstractvideobuffer.cpp

@@ -48,18 +48,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterAbstractVideoBufferMetaTypes()
-{
-    class QAbstractVideoBufferPrivateRegisterMetaTypes
-    {
-    public:
-        QAbstractVideoBufferPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QAbstractVideoBuffer::HandleType>();
     qRegisterMetaType<QAbstractVideoBuffer::MapMode>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterAbstractVideoBufferMetaTypes)
+
 
 /*!
     \class QAbstractVideoBuffer

src/multimedia/video/qabstractvideosurface.cpp

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

src/multimedia/video/qvideoframe.cpp

@@ -55,19 +55,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterVideoFrameMetaTypes()
-{
-class QVideoFramePrivateRegisterMetaTypes
-{
-public:
-    QVideoFramePrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QVideoFrame>();
     qRegisterMetaType<QVideoFrame::FieldType>();
     qRegisterMetaType<QVideoFrame::PixelFormat>();
 }
-} _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterVideoFrameMetaTypes)
 
 
 class QVideoFramePrivate : public QSharedData

src/multimedia/video/qvideosurfaceformat.cpp

@@ -49,19 +49,14 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterVideoSurfaceFormatMetaTypes()
-{
-    class QVideoSurfaceFormatPrivateRegisterMetaTypes
-    {
-    public:
-        QVideoSurfaceFormatPrivateRegisterMetaTypes()
 {
     qRegisterMetaType<QVideoSurfaceFormat>();
     qRegisterMetaType<QVideoSurfaceFormat::Direction>();
     qRegisterMetaType<QVideoSurfaceFormat::YCbCrColorSpace>();
 }
-    } _registerMetaTypes;
+
-}
+Q_CONSTRUCTOR_FUNCTION(qRegisterVideoSurfaceFormatMetaTypes)
 
 
 class QVideoSurfaceFormatPrivate : public QSharedData