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>

1 files changed, 16 insertions, 4 deletions

diff --git a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
index b391424be..8351fa9e2 100644
--- a/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
+++ b/tests/auto/unit/qradiotuner/tst_qradiotuner.cpp
@@ -64,6 +64,7 @@ class tst_QRadioTuner: public QObject
 public slots:
     void initTestCase();
     void cleanupTestCase();
+    void init();
 
 private slots:
     void testNullService();
@@ -93,7 +94,9 @@ void tst_QRadioTuner::initTestCase()
     mock = new MockRadioTunerControl(this);
     service = new MockMediaService(this, mock);
     provider = new MockMediaServiceProvider(service);
-    radio = new QRadioTuner(0,provider);
+    QMediaServiceProvider::setDefaultServiceProvider(provider);
+
+    radio = new QRadioTuner;
     QVERIFY(radio->service() != 0);
     QVERIFY(radio->isAvailable());
     QVERIFY(radio->availabilityError() == QtMultimedia::NoError);
@@ -128,12 +131,19 @@ void tst_QRadioTuner::cleanupTestCase()
     delete provider;
 }
 
+void tst_QRadioTuner::init()
+{
+    QMediaServiceProvider::setDefaultServiceProvider(provider);
+}
+
 void tst_QRadioTuner::testNullService()
 {
     const QPair<int, int> nullRange(0, 0);
 
     MockMediaServiceProvider provider(0);
-    QRadioTuner radio(0, &provider);
+    QMediaServiceProvider::setDefaultServiceProvider(&provider);
+
+    QRadioTuner radio;
     QVERIFY(!radio.isAvailable());
     radio.start();
     QCOMPARE(radio.error(), QRadioTuner::ResourceError);
@@ -161,7 +171,8 @@ void tst_QRadioTuner::testNullControl()
 
     MockMediaService service(0, 0);
     MockMediaServiceProvider provider(&service);
-    QRadioTuner radio(0, &provider);
+    QMediaServiceProvider::setDefaultServiceProvider(&provider);
+    QRadioTuner radio;
     QVERIFY(!radio.isAvailable());
     radio.start();
 
@@ -346,7 +357,8 @@ void tst_QRadioTuner::errorSignal()
     MockRadioTunerControl dctrl(&obj);
     MockMediaService service(&obj, &dctrl);
     MockMediaServiceProvider provider(&service);
-    QRadioTuner radio(0,&provider);
+    QMediaServiceProvider::setDefaultServiceProvider(&provider);
+    QRadioTuner radio;
     QSignalSpy spy(&radio, SIGNAL(error(QRadioTuner::Error)));
     QVERIFY(radio.service() != 0);
     QVERIFY(radio.isAvailable());