diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
     #undef check // avoid name clash;
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT7PlayerMetaDataControl::QT7PlayerMetaDataControl(QT7PlayerSession *session, QObject *parent)
     :QMetaDataControl(parent), m_session(session)
@@ -72,18 +72,18 @@
     return false;
 }
 
-QVariant QT7PlayerMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant QT7PlayerMetaDataControl::metaData(QtMediaServices::MetaData key) const
 {
     return m_tags.value(key);
 }
 
-void QT7PlayerMetaDataControl::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void QT7PlayerMetaDataControl::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
 
-QList<QtMedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
+QList<QtMediaServices::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
 {
     return m_tags.keys();
 }
@@ -243,13 +243,13 @@
         metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
 #endif // QUICKTIME_C_API_AVAILABLE
 
-        m_tags.insert(QtMedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
-        m_tags.insert(QtMedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
-        m_tags.insert(QtMedia::Title, metaMap.value(QLatin1String("nam")));
-        m_tags.insert(QtMedia::Date, metaMap.value(QLatin1String("day")));
-        m_tags.insert(QtMedia::Genre, metaMap.value(QLatin1String("gnre")));
-        m_tags.insert(QtMedia::TrackNumber, metaMap.value(QLatin1String("trk")));
-        m_tags.insert(QtMedia::Description, metaMap.value(QLatin1String("des")));
+        m_tags.insert(QtMediaServices::AlbumArtist, metaMap.value(QLatin1String("ART")));
+        m_tags.insert(QtMediaServices::AlbumTitle, metaMap.value(QLatin1String("alb")));
+        m_tags.insert(QtMediaServices::Title, metaMap.value(QLatin1String("nam")));
+        m_tags.insert(QtMediaServices::Date, metaMap.value(QLatin1String("day")));
+        m_tags.insert(QtMediaServices::Genre, metaMap.value(QLatin1String("gnre")));
+        m_tags.insert(QtMediaServices::TrackNumber, metaMap.value(QLatin1String("trk")));
+        m_tags.insert(QtMediaServices::Description, metaMap.value(QLatin1String("des")));
     }
 
     if (!wasEmpty || !m_tags.isEmpty())