--- a/qtmobility/src/multimedia/qmediaserviceprovider.h Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.h Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
#include <qmobilityglobal.h>
#include "qtmedianamespace.h"
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
class QMediaService;
@@ -101,7 +101,7 @@
virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
virtual void releaseService(QMediaService *service) = 0;
- virtual QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType,
+ virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
const QString &mimeType,
const QStringList& codecs,
int flags = 0) const;
@@ -162,6 +162,6 @@
#define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
#endif // QMEDIASERVICEPROVIDER_H