--- a/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <qmediaservice.h>
 #include <qmetadatacontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaObject : public QObject
 {
     Q_OBJECT
@@ -93,13 +93,13 @@
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMedia::MetaData> availableMetaData() const { return m_data.keys(); }
+    QList<QtMediaServices::MetaData> availableMetaData() const { return m_data.keys(); }
 
     bool isWritable() const { return m_writable; }
     void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
 
-    QVariant metaData(QtMedia::MetaData key) const { return m_data.value(key); }
-    void setMetaData(QtMedia::MetaData key, const QVariant &value) {
+    QVariant metaData(QtMediaServices::MetaData key) const { return m_data.value(key); }
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value) {
         m_data.insert(key, value); }
 
     QVariant extendedMetaData(const QString &key) const { return m_extendedData.value(key); }
@@ -117,7 +117,7 @@
 
     bool m_available;
     bool m_writable;
-    QMap<QtMedia::MetaData, QVariant> m_data;
+    QMap<QtMediaServices::MetaData, QVariant> m_data;
     QMap<QString, QVariant> m_extendedData;
 };
 
@@ -376,12 +376,12 @@
     QCOMPARE(object.isMetaDataAvailable(), false);
     QCOMPARE(object.isMetaDataWritable(), false);
 
-    object.setMetaData(QtMedia::Title, title);
+    object.setMetaData(QtMediaServices::Title, title);
     object.setExtendedMetaData(titleKey, title);
 
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), QString());
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), QString());
     QCOMPARE(object.extendedMetaData(titleKey).toString(), QString());
-    QCOMPARE(object.availableMetaData(), QList<QtMedia::MetaData>());
+    QCOMPARE(object.availableMetaData(), QList<QtMediaServices::MetaData>());
     QCOMPARE(object.availableExtendedMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -470,18 +470,18 @@
     QtTestMediaObject object(&service);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.metaData.m_data.insert(QtMedia::AlbumArtist, artist);
-    service.metaData.m_data.insert(QtMedia::Title, title);
-    service.metaData.m_data.insert(QtMedia::Genre, genre);
+    service.metaData.m_data.insert(QtMediaServices::AlbumArtist, artist);
+    service.metaData.m_data.insert(QtMediaServices::Title, title);
+    service.metaData.m_data.insert(QtMediaServices::Genre, genre);
 
-    QCOMPARE(object.metaData(QtMedia::AlbumArtist).toString(), artist);
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), title);
+    QCOMPARE(object.metaData(QtMediaServices::AlbumArtist).toString(), artist);
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title);
 
-    QList<QtMedia::MetaData> metaDataKeys = object.availableMetaData();
+    QList<QtMediaServices::MetaData> metaDataKeys = object.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 3);
-    QVERIFY(metaDataKeys.contains(QtMedia::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMedia::Title));
-    QVERIFY(metaDataKeys.contains(QtMedia::Genre));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::Title));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::Genre));
 }
 
 void tst_QMediaObject::setMetaData_data()
@@ -501,9 +501,9 @@
 
     QtTestMediaObject object(&service);
 
-    object.setMetaData(QtMedia::Title, title);
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), title);
-    QCOMPARE(service.metaData.m_data.value(QtMedia::Title).toString(), title);
+    object.setMetaData(QtMediaServices::Title, title);
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title);
+    QCOMPARE(service.metaData.m_data.value(QtMediaServices::Title).toString(), title);
 }
 
 void tst_QMediaObject::extendedMetaData()