diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qradiotuner.h --- a/qtmobility/src/multimedia/qradiotuner.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/multimedia/qradiotuner.h Fri May 14 16:41:33 2010 +0300 @@ -49,7 +49,7 @@ #include -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QRadioTunerPrivate; class Q_MEDIA_EXPORT QRadioTuner : public QMediaObject @@ -79,7 +79,7 @@ ~QRadioTuner(); bool isAvailable() const; - QtMedia::AvailabilityError availabilityError() const; + QtMediaServices::AvailabilityError availabilityError() const; State state() const; @@ -135,11 +135,11 @@ Q_DECLARE_PRIVATE(QRadioTuner) }; -QTM_END_NAMESPACE +QT_END_NAMESPACE -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::State); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::Band); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::Error); -Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::StereoMode); +Q_DECLARE_METATYPE(QRadioTuner::State); +Q_DECLARE_METATYPE(QRadioTuner::Band); +Q_DECLARE_METATYPE(QRadioTuner::Error); +Q_DECLARE_METATYPE(QRadioTuner::StereoMode); #endif // QRADIOPLAYER_H