--- a/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -56,9 +56,6 @@
 class QByteArray;
 class QIODevice;
 class QStringList;
-QT_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaPlaylistReader
 {
@@ -92,21 +89,13 @@
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface"
-//MOC doesn't recognire paramitized macros
-//Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QMediaPlaylistIOInterface), QMediaPlaylistIOInterface_iid);
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
-QT_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
 
 class Q_MEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface
 {
 Q_OBJECT
-Q_INTERFACES(QtMobility::QMediaPlaylistIOInterface:QFactoryInterface)
+Q_INTERFACES(QMediaPlaylistIOInterface:QFactoryInterface)
 public:
     explicit QMediaPlaylistIOPlugin(QObject *parent = 0);
     virtual ~QMediaPlaylistIOPlugin();
@@ -124,6 +113,6 @@
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLISTIOPLUGIN_H