diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qmetadatacontrol.h
--- a/qtmobility/src/multimedia/qmetadatacontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmetadatacontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include "qmediaresource.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class Q_MEDIA_EXPORT QMetaDataControl : public QMediaControl
@@ -60,9 +60,9 @@
     virtual bool isWritable() const = 0;
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMedia::MetaData key) const = 0;
-    virtual void setMetaData(QtMedia::MetaData key, const QVariant &value) = 0;
-    virtual QList<QtMedia::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMediaServices::MetaData key) const = 0;
+    virtual void setMetaData(QtMediaServices::MetaData key, const QVariant &value) = 0;
+    virtual QList<QtMediaServices::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0;
@@ -82,6 +82,6 @@
 #define QMetaDataControl_iid "com.nokia.Qt.QMetaDataControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMetaDataControl, QMetaDataControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMETADATAPROVIDER_H