From a78a95ccd4c876bca7fe748c44c9744e828d375e Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Thu, 19 Jan 2012 10:01:02 +1000
Subject: Removed QMediaServiceProvider parameter from media objects
 constructors.

QMediaServiceProvider should be removed from the public API,
to provide media objects with a custom media service.

A protected QMediaPlayer/QCamera/QRadioTuner/etc constructor
with QMediaService* parameter is a cleaner and more
flexible solution.

Change-Id: I335cce4bbebe0e548c3df338f206e7be7c93c3dd
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
---
 src/multimedia/camera/qcamera.cpp | 9 ++++++---
 src/multimedia/camera/qcamera.h   | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/multimedia/camera')

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 6160ccb64..a5e5be57c 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -41,6 +41,7 @@
 
 #include "qvideosurfaceoutput_p.h"
 #include "qmediaobject_p.h"
+#include "qmediaserviceprovider.h"
 
 #include <qcamera.h>
 #include <qcameracontrol.h>
@@ -338,11 +339,13 @@ void QCameraPrivate::_q_updateLockStatus(QCamera::LockType type, QCamera::LockSt
     Construct a QCamera from service \a provider and \a parent.
 */
 
-QCamera::QCamera(QObject *parent, QMediaServiceProvider *provider):
-    QMediaObject(*new QCameraPrivate, parent, provider->requestService(Q_MEDIASERVICE_CAMERA))
+QCamera::QCamera(QObject *parent):
+    QMediaObject(*new QCameraPrivate,
+                 parent,
+                 QMediaServiceProvider::defaultServiceProvider()->requestService(Q_MEDIASERVICE_CAMERA))
 {
     Q_D(QCamera);
-    d->provider = provider;
+    d->provider = QMediaServiceProvider::defaultServiceProvider();
     d->initControls();
     d->cameraExposure = new QCameraExposure(this);
     d->cameraFocus = new QCameraFocus(this);
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 5ea9b4420..da84a692e 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -56,7 +56,6 @@
 #include <qcamerafocus.h>
 #include <qcameraimageprocessing.h>
 
-#include <qmediaserviceprovider.h>
 #include <qmediaenumdebug.h>
 
 QT_BEGIN_HEADER
@@ -144,7 +143,7 @@ public:
     };
     Q_DECLARE_FLAGS(LockTypes, LockType)
 
-    QCamera(QObject *parent = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
+    QCamera(QObject *parent = 0);
     QCamera(const QByteArray& device, QObject *parent = 0);
     ~QCamera();
 
-- 
cgit v1.2.1