diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qmediarecorder.h --- a/qtmobility/src/multimedia/qmediarecorder.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/multimedia/qmediarecorder.h Fri May 14 16:41:33 2010 +0300 @@ -54,7 +54,7 @@ class QAudioFormat; QT_END_NAMESPACE -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QMediaRecorderService; class QAudioEncoderSettings; @@ -88,7 +88,7 @@ ~QMediaRecorder(); bool isAvailable() const; - QtMedia::AvailabilityError availabilityError() const; + QtMediaServices::AvailabilityError availabilityError() const; QUrl outputLocation() const; bool setOutputLocation(const QUrl &location); @@ -144,9 +144,9 @@ Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &)) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaRecorder::State)) -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaRecorder::Error)) +Q_DECLARE_METATYPE(QMediaRecorder::State) +Q_DECLARE_METATYPE(QMediaRecorder::Error) #endif // QMEDIARECORDER_H