diff -r 6fbed849b4f4 -r 1f895d8a5b2b qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm --- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm Wed Jun 23 19:08:38 2010 +0300 +++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm Tue Jul 06 15:12:50 2010 +0300 @@ -72,12 +72,12 @@ return false; } -QVariant QT7PlayerMetaDataControl::metaData(QtMultimedia::MetaData key) const +QVariant QT7PlayerMetaDataControl::metaData(QtMultimediaKit::MetaData key) const { return m_tags.value(key); } -QList QT7PlayerMetaDataControl::availableMetaData() const +QList QT7PlayerMetaDataControl::availableMetaData() const { return m_tags.keys(); } @@ -244,13 +244,13 @@ metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String])); #endif // QUICKTIME_C_API_AVAILABLE - m_tags.insert(QtMultimedia::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMultimedia::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMultimedia::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMultimedia::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMultimedia::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMultimedia::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMultimedia::Description, metaMap.value(QLatin1String("des"))); + m_tags.insert(QtMultimediaKit::AlbumArtist, metaMap.value(QLatin1String("ART"))); + m_tags.insert(QtMultimediaKit::AlbumTitle, metaMap.value(QLatin1String("alb"))); + m_tags.insert(QtMultimediaKit::Title, metaMap.value(QLatin1String("nam"))); + m_tags.insert(QtMultimediaKit::Date, metaMap.value(QLatin1String("day"))); + m_tags.insert(QtMultimediaKit::Genre, metaMap.value(QLatin1String("gnre"))); + m_tags.insert(QtMultimediaKit::TrackNumber, metaMap.value(QLatin1String("trk"))); + m_tags.insert(QtMultimediaKit::Description, metaMap.value(QLatin1String("des"))); } if (!wasEmpty || !m_tags.isEmpty())