diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qmediaencodersettings.h
--- a/qtmobility/src/multimedia/qmediaencodersettings.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <qmobilityglobal.h>
 #include "qtmedianamespace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QAudioEncoderSettingsPrivate;
@@ -66,8 +66,8 @@
 
     bool isNull() const;
 
-    QtMedia::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMedia::EncodingMode);
+    QtMediaServices::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMediaServices::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString& codec);
@@ -81,8 +81,8 @@
     int sampleRate() const;
     void setSampleRate(int rate);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QAudioEncoderSettingsPrivate> d;
@@ -103,8 +103,8 @@
 
     bool isNull() const;
 
-    QtMedia::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMedia::EncodingMode);
+    QtMediaServices::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMediaServices::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString &);
@@ -119,8 +119,8 @@
     int bitRate() const;
     void setBitRate(int bitrate);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QVideoEncoderSettingsPrivate> d;
@@ -148,13 +148,13 @@
     void setResolution(const QSize &);
     void setResolution(int width, int height);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QImageEncoderSettingsPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif