diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,75 +57,75 @@
 
 struct QWmpMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMediaServices::MetaData key;
     const wchar_t *token;
 };
 
 static const QWmpMetaDataKeyLookup qt_wmpMetaDataKeys[] =
 {
-    { QtMedia::Title, L"Title" },
-    { QtMedia::SubTitle, L"WM/SubTitle" },
-    { QtMedia::Author, L"Author" },
-    { QtMedia::Comment, L"Comment" },
-    { QtMedia::Description, L"Description" },
-    { QtMedia::Category, L"WM/Category" },
-    { QtMedia::Genre, L"WM/Genre" },
-    //{ QtMedia::Date, 0 },
-    { QtMedia::Year, L"WM/Year" },
-    { QtMedia::UserRating, L"UserRating" },
-    //{ QtMedia::MetaDatawords, 0 },
-    { QtMedia::Language, L"Language" },
-    { QtMedia::Publisher, L"WM/Publisher" },
-    { QtMedia::Copyright, L"Copyright" },
-    { QtMedia::ParentalRating, L"ParentalRating" },
-    { QtMedia::RatingOrganisation, L"RatingOrganisation" },
+    { QtMediaServices::Title, L"Title" },
+    { QtMediaServices::SubTitle, L"WM/SubTitle" },
+    { QtMediaServices::Author, L"Author" },
+    { QtMediaServices::Comment, L"Comment" },
+    { QtMediaServices::Description, L"Description" },
+    { QtMediaServices::Category, L"WM/Category" },
+    { QtMediaServices::Genre, L"WM/Genre" },
+    //{ QtMediaServices::Date, 0 },
+    { QtMediaServices::Year, L"WM/Year" },
+    { QtMediaServices::UserRating, L"UserRating" },
+    //{ QtMediaServices::MetaDatawords, 0 },
+    { QtMediaServices::Language, L"Language" },
+    { QtMediaServices::Publisher, L"WM/Publisher" },
+    { QtMediaServices::Copyright, L"Copyright" },
+    { QtMediaServices::ParentalRating, L"ParentalRating" },
+    { QtMediaServices::RatingOrganisation, L"RatingOrganisation" },
 
     // Media
-    { QtMedia::Size, L"FileSize" },
-    { QtMedia::MediaType, L"MediaType" },
-    { QtMedia::Duration, L"Duration" },
+    { QtMediaServices::Size, L"FileSize" },
+    { QtMediaServices::MediaType, L"MediaType" },
+    { QtMediaServices::Duration, L"Duration" },
 
     // Audio
-    { QtMedia::AudioBitRate, L"AudioBitrate" },
-    { QtMedia::AudioCodec, L"AudioCodec" },
-    { QtMedia::ChannelCount, L"Channels" },
-    { QtMedia::SampleRate, L"Frequency" },
+    { QtMediaServices::AudioBitRate, L"AudioBitrate" },
+    { QtMediaServices::AudioCodec, L"AudioCodec" },
+    { QtMediaServices::ChannelCount, L"Channels" },
+    { QtMediaServices::SampleRate, L"Frequency" },
 
     // Music
-    { QtMedia::AlbumTitle, L"WM/AlbumTitle" },
-    { QtMedia::AlbumArtist, L"WM/AlbumArtist" },
-    { QtMedia::ContributingArtist, L"Author" },
-    { QtMedia::Composer, L"WM/Composer" },
-    { QtMedia::Conductor, L"WM/Conductor" },
-    { QtMedia::Lyrics, L"WM/Lyrics" },
-    { QtMedia::Mood, L"WM/Mood" },
-    { QtMedia::TrackNumber, L"WM/TrackNumber" },
-    //{ QtMedia::TrackCount, 0 },
-    //{ QtMedia::CoverArtUrlSmall, 0 },
-    //{ QtMedia::CoverArtUrlLarge, 0 },
+    { QtMediaServices::AlbumTitle, L"WM/AlbumTitle" },
+    { QtMediaServices::AlbumArtist, L"WM/AlbumArtist" },
+    { QtMediaServices::ContributingArtist, L"Author" },
+    { QtMediaServices::Composer, L"WM/Composer" },
+    { QtMediaServices::Conductor, L"WM/Conductor" },
+    { QtMediaServices::Lyrics, L"WM/Lyrics" },
+    { QtMediaServices::Mood, L"WM/Mood" },
+    { QtMediaServices::TrackNumber, L"WM/TrackNumber" },
+    //{ QtMediaServices::TrackCount, 0 },
+    //{ QtMediaServices::CoverArtUrlSmall, 0 },
+    //{ QtMediaServices::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::FrameRate, 0 },
-    { QtMedia::VideoBitRate, L"VideoBitRate" },
-    { QtMedia::VideoCodec, L"VideoCodec" },
+    //{ QtMediaServices::FrameRate, 0 },
+    { QtMediaServices::VideoBitRate, L"VideoBitRate" },
+    { QtMediaServices::VideoCodec, L"VideoCodec" },
 
-    //{ QtMedia::PosterUrl, 0 },
+    //{ QtMediaServices::PosterUrl, 0 },
 
     // Movie
-    { QtMedia::ChapterNumber, L"ChapterNumber" },
-    { QtMedia::Director, L"WM/Director" },
-    { QtMedia::LeadPerformer, L"LeadPerformer" },
-    { QtMedia::Writer, L"WM/Writer" },
+    { QtMediaServices::ChapterNumber, L"ChapterNumber" },
+    { QtMediaServices::Director, L"WM/Director" },
+    { QtMediaServices::LeadPerformer, L"LeadPerformer" },
+    { QtMediaServices::Writer, L"WM/Writer" },
 
     // Photos
-    { QtMedia::CameraManufacturer, L"CameraManufacturer" },
-    { QtMedia::CameraModel, L"CameraModel" },
-    { QtMedia::Event, L"Event" },
-    { QtMedia::Subject, L"Subject" }
+    { QtMediaServices::CameraManufacturer, L"CameraManufacturer" },
+    { QtMediaServices::CameraModel, L"CameraModel" },
+    { QtMediaServices::Event, L"Event" },
+    { QtMediaServices::Subject, L"Subject" }
 };
 
 QWmpMetaData::QWmpMetaData(IWMPCore3 *player, QWmpEvents *events, QObject *parent)
@@ -155,12 +155,12 @@
     return m_media != 0;
 }
 
-QVariant QWmpMetaData::metaData(QtMedia::MetaData key) const
+QVariant QWmpMetaData::metaData(QtMediaServices::MetaData key) const
 {
     static const int  count = sizeof(qt_wmpMetaDataKeys) / sizeof(QWmpMetaDataKeyLookup);
 
     switch (key) {
-    case QtMedia::Date:
+    case QtMediaServices::Date:
         {
             QVariant day = value(m_media, QAutoBStr(L"ReleaseDateDay"));
             QVariant month = value(m_media, QAutoBStr(L"ReleaseDateMonth"));
@@ -170,11 +170,11 @@
                 return QDate(year.toInt(), month.toInt(), day.toInt());
         }
         break;
-    case QtMedia::CoverArtUrlSmall:
+    case QtMediaServices::CoverArtUrlSmall:
         return albumArtUrl(m_media, "_Small.jpg");
-    case QtMedia::CoverArtUrlLarge:
+    case QtMediaServices::CoverArtUrlLarge:
         return albumArtUrl(m_media, "_Large.jpg");
-    case QtMedia::Resolution:
+    case QtMediaServices::Resolution:
         {
             QVariant width = value(m_media, QAutoBStr(L"WM/VideoWidth"));
             QVariant height = value(m_media, QAutoBStr(L"WM/VideoHeight"));
@@ -183,7 +183,7 @@
                 return QSize(width.toInt(), height.toInt());
         }
         break;
-    case QtMedia::PixelAspectRatio:
+    case QtMediaServices::PixelAspectRatio:
         {
             QVariant x = value(m_media, QAutoBStr(L"PixelAspectRatioX"));
             QVariant y = value(m_media, QAutoBStr(L"PixelAspectRatioY"));
@@ -192,7 +192,7 @@
                 return QSize(x.toInt(), y.toInt());
         }
         break;
-    case QtMedia::VideoFrameRate:
+    case QtMediaServices::VideoFrameRate:
         break;
     default:
         for (int i = 0; i < count; ++i) {
@@ -204,7 +204,7 @@
     return QVariant();
 }
 
-void QWmpMetaData::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QWmpMetaData::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     static const int  count = sizeof(qt_wmpMetaDataKeys) / sizeof(QWmpMetaDataKeyLookup);
 
@@ -216,9 +216,9 @@
     }
 }
 
-QList<QtMedia::MetaData> QWmpMetaData::availableMetaData() const
+QList<QtMediaServices::MetaData> QWmpMetaData::availableMetaData() const
 {
-    QList<QtMedia::MetaData> keys;
+    QList<QtMediaServices::MetaData> keys;
 
     if (m_media) {
         // WMP will return a list of all possible keys so there's no point in filtering the keys
@@ -242,9 +242,9 @@
                 QDir dir = QFileInfo(url).absoluteDir();
 
                 if (dir.exists(albumArtLarge))
-                    keys.append(QtMedia::CoverArtUrlLarge);
+                    keys.append(QtMediaServices::CoverArtUrlLarge);
                 if (dir.exists(albumArtSmall))
-                    keys.append(QtMedia::CoverArtUrlSmall);
+                    keys.append(QtMediaServices::CoverArtUrlSmall);
             }
         }
     }