--- a/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 # pragma Q_MOC_EXPAND_MACROS
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaService;
 
@@ -63,32 +63,22 @@
     virtual void release(QMediaService *service) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceProviderFactoryInterface_iid \
     "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 struct Q_MEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 {
     virtual ~QMediaServiceSupportedFormatsInterface() {}
-    virtual QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
+    virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
     virtual QStringList supportedMimeTypes() const = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceSupportedFormatsInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedFormatsInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 struct Q_MEDIA_EXPORT QMediaServiceSupportedDevicesInterface
 {
@@ -97,15 +87,11 @@
     virtual QString deviceDescription(const QByteArray &service, const QByteArray &device) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceSupportedDevicesInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedDevicesInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
 
-QTM_BEGIN_NAMESPACE
+
 
 struct Q_MEDIA_EXPORT QMediaServiceFeaturesInterface
 {
@@ -113,21 +99,15 @@
     virtual QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const = 0;
 };
 
-QTM_END_NAMESPACE
-
-//MOC doesn't recognire paramitized macros
 #define QMediaServiceFeaturesInterface_iid \
     "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceProviderFactoryInterface:QFactoryInterface)
+    Q_INTERFACES(QMediaServiceProviderFactoryInterface:QFactoryInterface)
 
 public:
     virtual QStringList keys() const = 0;
@@ -135,7 +115,7 @@
     virtual void release(QMediaService *service) = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 #endif  // QMEDIASERVICEPROVIDERPLUGIN_H