diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/multimedia/qradiotunercontrol.h --- a/qtmobility/src/multimedia/qradiotunercontrol.h Mon May 03 13:18:40 2010 +0300 +++ b/qtmobility/src/multimedia/qradiotunercontrol.h Fri May 14 16:41:33 2010 +0300 @@ -45,7 +45,7 @@ #include "qmediacontrol.h" #include "qradiotuner.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class Q_MEDIA_EXPORT QRadioTunerControl : public QMediaControl { @@ -55,7 +55,7 @@ ~QRadioTunerControl(); virtual bool isAvailable() const = 0; - virtual QtMedia::AvailabilityError availabilityError() const = 0; + virtual QtMediaServices::AvailabilityError availabilityError() const = 0; virtual QRadioTuner::State state() const = 0; @@ -110,6 +110,6 @@ #define QRadioTunerControl_iid "com.nokia.Qt.QRadioTunerControl/1.0" Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid) -QTM_END_NAMESPACE +QT_END_NAMESPACE #endif // QRADIOTUNERCONTROL_H