--- a/qtmobility/src/multimedia/qmediarecorder.cpp Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecorder.cpp Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
#include <QtMultimedia/qaudioformat.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
/*!
\class QMediaRecorder
@@ -80,7 +80,7 @@
QAudioEncoderSettings audioSettings;
audioSettings.setCodec("audio/vorbis");
- audioSettings.setQuality(QtMedia::HighQuality);
+ audioSettings.setQuality(QtMediaServices::HighQuality);
recorder->setEncodingSettings(audioSettings);
@@ -235,12 +235,12 @@
/*!
Returns the availability error code.
*/
-QtMedia::AvailabilityError QMediaRecorder::availabilityError() const
+QtMediaServices::AvailabilityError QMediaRecorder::availabilityError() const
{
if (d_func()->control != NULL)
- return QtMedia::NoError;
+ return QtMediaServices::NoError;
else
- return QtMedia::ServiceMissingError;
+ return QtMediaServices::ServiceMissingError;
}
QUrl QMediaRecorder::outputLocation() const
@@ -563,5 +563,5 @@
#include "moc_qmediarecorder.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE