diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/multimedia/wmp/qwmpmetadata.h --- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h Fri May 14 16:41:33 2010 +0300 @@ -47,13 +47,13 @@ #include -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QMediaContent; -QTM_END_NAMESPACE +QT_END_NAMESPACE class QWmpEvents; -QTM_USE_NAMESPACE +QT_USE_NAMESPACE class QWmpMetaData : public QMetaDataControl { @@ -65,9 +65,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);