--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
#include <QMetaDataControl>
#include "ms60mediaplayerresolver.h"
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
class S60MediaPlayerSession;
@@ -60,16 +60,16 @@
bool isMetaDataAvailable() const;
bool isWritable() const;
- QVariant metaData(QtMedia::MetaData key) const;
- void setMetaData(QtMedia::MetaData key, const QVariant &value);
- QList<QtMedia::MetaData> availableMetaData() const;
+ QVariant metaData(QtMediaServices::MetaData key) const;
+ void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+ QList<QtMediaServices::MetaData> availableMetaData() const;
QVariant extendedMetaData(const QString &key) const ;
void setExtendedMetaData(const QString &key, const QVariant &value);
QStringList availableExtendedMetaData() const;
private:
- QString metaDataKeyAsString(QtMedia::MetaData key) const;
+ QString metaDataKeyAsString(QtMediaServices::MetaData key) const;
private:
MS60MediaPlayerResolver& m_mediaPlayerResolver;