--- a/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -117,13 +117,17 @@
     {        
     }
 
-    QMediaControl* control(const char *iid) const
+    QMediaControl* requestControl(const char *iid)
     {
         if (qstrcmp(iid, QMediaPlaylistControl_iid) == 0)
             return mockControl;
         return 0;
     }
 
+    void releaseControl(QMediaControl *)
+    {
+    }
+
     MockPlaylistControl *mockControl;
 };
 
@@ -465,9 +469,9 @@
     QTest::addColumn<int>("pos");
     QTest::addColumn<int>("expectedNext");
 
-    QTest::newRow("Linear, 0") << QMediaPlaylist::Linear << -1 << 0 << 1;
-    QTest::newRow("Linear, 1") << QMediaPlaylist::Linear << 0 << 1 << 2;
-    QTest::newRow("Linear, 2") << QMediaPlaylist::Linear << 1 << 2 << -1;
+    QTest::newRow("Sequential, 0") << QMediaPlaylist::Sequential << -1 << 0 << 1;
+    QTest::newRow("Sequential, 1") << QMediaPlaylist::Sequential << 0 << 1 << 2;
+    QTest::newRow("Sequential, 2") << QMediaPlaylist::Sequential << 1 << 2 << -1;
 
     QTest::newRow("Loop, 0") << QMediaPlaylist::Loop << 2 << 0 << 1;
     QTest::newRow("Loop, 1") << QMediaPlaylist::Loop << 0 << 1 << 2;
@@ -490,7 +494,7 @@
     playlist.addMedia(content2);
     playlist.addMedia(content3);
 
-    QCOMPARE(playlist.playbackMode(), QMediaPlaylist::Linear);
+    QCOMPARE(playlist.playbackMode(), QMediaPlaylist::Sequential);
     QCOMPARE(playlist.currentIndex(), -1);
 
     playlist.setPlaybackMode(playbackMode);
@@ -534,7 +538,7 @@
 {
     MockReadOnlyPlaylistObject mediaObject;
     QMediaPlaylist playlist;
-    playlist.setMediaObject(&mediaObject);
+    mediaObject.bind(&playlist);
 
     QVERIFY(playlist.isReadOnly());
     QVERIFY(!playlist.isEmpty());
@@ -604,17 +608,17 @@
     QVERIFY(playlist.mediaObject() == 0);
     QVERIFY(!playlist.isReadOnly());
 
-    playlist.setMediaObject(&mediaObject);
+    mediaObject.bind(&playlist);
     QCOMPARE(playlist.mediaObject(), qobject_cast<QMediaObject*>(&mediaObject));
     QCOMPARE(playlist.mediaCount(), 3);
     QVERIFY(playlist.isReadOnly());
 
-    playlist.setMediaObject(0);
+    mediaObject.unbind(&playlist);
     QVERIFY(playlist.mediaObject() == 0);
     QCOMPARE(playlist.mediaCount(), 0);
     QVERIFY(!playlist.isReadOnly());
 
-    playlist.setMediaObject(&mediaObject);
+    mediaObject.bind(&playlist);
     QCOMPARE(playlist.mediaObject(), qobject_cast<QMediaObject*>(&mediaObject));
     QCOMPARE(playlist.mediaCount(), 3);
     QVERIFY(playlist.isReadOnly());