diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qmediaobject.cpp
--- a/qtmobility/src/multimedia/qmediaobject.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include "qmetadatacontrol.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 void QMediaObjectPrivate::_q_notify()
 {
@@ -96,9 +96,9 @@
     Returns the service availability error state.
 */
 
-QtMedia::AvailabilityError QMediaObject::availabilityError() const
+QtMediaServices::AvailabilityError QMediaObject::availabilityError() const
 {
-    return QtMedia::ServiceMissingError;
+    return QtMediaServices::ServiceMissingError;
 }
 
 /*!
@@ -305,7 +305,7 @@
 /*!
     Returns the value associated with a meta-data \a key.
 */
-QVariant QMediaObject::metaData(QtMedia::MetaData key) const
+QVariant QMediaObject::metaData(QtMediaServices::MetaData key) const
 {
     Q_D(const QMediaObject);
 
@@ -317,7 +317,7 @@
 /*!
     Sets a \a value for a meta-data \a key.
 */
-void QMediaObject::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QMediaObject::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     Q_D(QMediaObject);
 
@@ -328,13 +328,13 @@
 /*!
     Returns a list of keys there is meta-data available for.
 */
-QList<QtMedia::MetaData> QMediaObject::availableMetaData() const
+QList<QtMediaServices::MetaData> QMediaObject::availableMetaData() const
 {
     Q_D(const QMediaObject);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMedia::MetaData>();
+            : QList<QtMediaServices::MetaData>();
 }
 
 /*!
@@ -413,5 +413,5 @@
 
 
 #include "moc_qmediaobject.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE