diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/multimedia/qt7/qt7playermetadata.h --- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h Fri May 14 16:41:33 2010 +0300 @@ -44,7 +44,7 @@ #include -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QT7PlayerSession; @@ -58,9 +58,9 @@ bool isMetaDataAvailable() const; bool isWritable() const; - QVariant metaData(QtMedia::MetaData key) const; - void setMetaData(QtMedia::MetaData key, const QVariant &value); - QList availableMetaData() const; + QVariant metaData(QtMediaServices::MetaData key) const; + void setMetaData(QtMediaServices::MetaData key, const QVariant &value); + QList availableMetaData() const; QVariant extendedMetaData(const QString &key) const ; void setExtendedMetaData(const QString &key, const QVariant &value); @@ -71,9 +71,9 @@ private: QT7PlayerSession *m_session; - QMap m_tags; + QMap m_tags; }; -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif