From efa4628e7489677166aadde5f94376d5e41146f9 Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lopes@digia.com>
Date: Mon, 26 May 2014 16:20:49 +0200
Subject: 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/recording/qmediaencodersettings.cpp | 18 +++++++-----------
 src/multimedia/recording/qmediarecorder.cpp        | 18 +++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'src/multimedia/recording')

diff --git a/src/multimedia/recording/qmediaencodersettings.cpp b/src/multimedia/recording/qmediaencodersettings.cpp
index 731692643..e75115116 100644
--- a/src/multimedia/recording/qmediaencodersettings.cpp
+++ b/src/multimedia/recording/qmediaencodersettings.cpp
@@ -43,20 +43,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace
+static void qRegisterEncoderSettingsMetaTypes()
 {
-class QMediaEncoderSettingsPrivateRegisterMetaTypes
-{
-public:
-    QMediaEncoderSettingsPrivateRegisterMetaTypes()
-    {
-        qRegisterMetaType<QAudioEncoderSettings>();
-        qRegisterMetaType<QVideoEncoderSettings>();
-        qRegisterMetaType<QImageEncoderSettings>();
-    }
-} _registerMetaTypes;
+    qRegisterMetaType<QAudioEncoderSettings>();
+    qRegisterMetaType<QVideoEncoderSettings>();
+    qRegisterMetaType<QImageEncoderSettings>();
 }
 
+Q_CONSTRUCTOR_FUNCTION(qRegisterEncoderSettingsMetaTypes)
+
+
 class QAudioEncoderSettingsPrivate  : public QSharedData
 {
 public:
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index f38de025c..7c28caf98 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -80,20 +80,16 @@ 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;
+    qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
+    qRegisterMetaType<QMediaRecorder::Status>("QMediaRecorder::Status");
+    qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
 }
 
+Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes)
+
+
 QMediaRecorderPrivate::QMediaRecorderPrivate():
      mediaObject(0),
      control(0),
-- 
cgit v1.2.3