diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-25 10:53:26 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:47:41 +0200 |
commit | b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch) | |
tree | d647951ecb69c9b39f004198d76fbc4972174549 /src/imports | |
parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) |
Rename availabilityError to availability.
It's perhaps clearer in the usual case.
Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio_p.h | 8 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 8 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradio_p.h | 8 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata.cpp | 10 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativeradiodata_p.h | 8 |
9 files changed, 35 insertions, 41 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 779f164f4..7743df429 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -1434,9 +1434,9 @@ Module { Parameter { name: "available"; type: "bool" } } Signal { - name: "availabilityErrorChanged" + name: "availabilityChanged" type: "void" - Parameter { name: "error"; type: "QtMultimedia::AvailabilityError" } + Parameter { name: "error"; type: "QtMultimedia::AvailabilityStatus" } } } Component { diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index aaf43febd..e9fda4f5a 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -99,7 +99,7 @@ void QDeclarativeAudio::_q_error(QMediaPlayer::Error errorCode) emit errorChanged(); } -void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityError) +void QDeclarativeAudio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus) { emit availabilityChanged(availability()); } @@ -153,7 +153,7 @@ QDeclarativeAudio::Availability QDeclarativeAudio::availability() const { if (!m_player) return Unavailable; - return Availability(m_player->availabilityError()); + return Availability(m_player->availability()); } QUrl QDeclarativeAudio::source() const @@ -658,10 +658,10 @@ void QDeclarativeAudio::classBegin() connect(m_player, SIGNAL(videoAvailableChanged(bool)), this, SIGNAL(hasVideoChanged())); - m_error = m_player->availabilityError() == QtMultimedia::ServiceMissingError ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; + m_error = m_player->availability() == QtMultimedia::ServiceMissing ? QMediaPlayer::ServiceMissingError : QMediaPlayer::NoError; - connect(m_player, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError))); + connect(m_player, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); m_metaData.reset(new QDeclarativeMediaMetaData(m_player)); diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 7116131d2..f4cfa8ad4 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -138,9 +138,9 @@ public: }; enum Availability { - Available = QtMultimedia::NoError, - Busy = QtMultimedia::BusyError, - Unavailable = QtMultimedia::ServiceMissingError, + Available = QtMultimedia::Available, + Busy = QtMultimedia::Busy, + Unavailable = QtMultimedia::ServiceMissing, ResourceMissing = QtMultimedia::ResourceError }; @@ -237,7 +237,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_error(QMediaPlayer::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_statusChanged(); private: diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 6308edc4e..d1219add1 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -68,9 +68,9 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state) emit cameraStateChanged(QDeclarativeCamera::State(state)); } -void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError error) +void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) { - emit availabilityChanged(Availability(error)); + emit availabilityChanged(Availability(availability)); } /*! @@ -188,9 +188,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State))); connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(cameraStatusChanged())); connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(_q_error(QCamera::Error))); - - // Note we map availabilityError->availability - connect(m_camera, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError))); + connect(m_camera, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_camera->focus(), SIGNAL(opticalZoomChanged(qreal)), this, SIGNAL(opticalZoomChanged(qreal))); connect(m_camera->focus(), SIGNAL(digitalZoomChanged(qreal)), this, SIGNAL(digitalZoomChanged(qreal))); @@ -260,7 +258,7 @@ QString QDeclarativeCamera::errorString() const */ QDeclarativeCamera::Availability QDeclarativeCamera::availability() const { - return Availability(m_camera->availabilityError()); + return Availability(m_camera->availability()); } diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index e36a9c971..137df3b82 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -216,9 +216,9 @@ public: }; enum Availability { - Available = QtMultimedia::NoError, - Busy = QtMultimedia::BusyError, - Unavailable = QtMultimedia::ServiceMissingError, + Available = QtMultimedia::Available, + Busy = QtMultimedia::Busy, + Unavailable = QtMultimedia::ServiceMissing, ResourceMissing = QtMultimedia::ResourceError }; @@ -287,7 +287,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_updateState(QCamera::State); void _q_error(QCamera::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); protected: void classBegin(); diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp index 128a9979f..74d7d496c 100644 --- a/src/imports/multimedia/qdeclarativeradio.cpp +++ b/src/imports/multimedia/qdeclarativeradio.cpp @@ -115,9 +115,7 @@ QDeclarativeRadio::QDeclarativeRadio(QObject *parent) : connect(m_radioTuner, SIGNAL(mutedChanged(bool)), this, SIGNAL(mutedChanged(bool))); connect(m_radioTuner, SIGNAL(stationFound(int, QString)), this, SIGNAL(stationFound(int, QString))); connect(m_radioTuner, SIGNAL(antennaConnectedChanged(bool)), this, SIGNAL(antennaConnectedChanged(bool))); - - // Note we map availabilityError->availability - connect(m_radioTuner, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError))); + connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_radioTuner, SIGNAL(error(QRadioTuner::Error)), this, SLOT(_q_error(QRadioTuner::Error))); } @@ -339,7 +337,7 @@ bool QDeclarativeRadio::isAntennaConnected() const */ QDeclarativeRadio::Availability QDeclarativeRadio::availability() const { - return Availability(m_radioTuner->availabilityError()); + return Availability(m_radioTuner->availability()); } void QDeclarativeRadio::setBand(QDeclarativeRadio::Band band) @@ -528,9 +526,9 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode) emit errorChanged(); } -void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityError error) +void QDeclarativeRadio::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) { - emit availabilityChanged(Availability(error)); + emit availabilityChanged(Availability(availability)); } /*! diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h index 3829c84e2..e247c7f0c 100644 --- a/src/imports/multimedia/qdeclarativeradio_p.h +++ b/src/imports/multimedia/qdeclarativeradio_p.h @@ -120,9 +120,9 @@ public: }; enum Availability { - Available = QtMultimedia::NoError, - Busy = QtMultimedia::BusyError, - Unavailable = QtMultimedia::ServiceMissingError, + Available = QtMultimedia::Available, + Busy = QtMultimedia::Busy, + Unavailable = QtMultimedia::ServiceMissing, ResourceMissing = QtMultimedia::ResourceError }; @@ -189,7 +189,7 @@ private Q_SLOTS: void _q_stateChanged(QRadioTuner::State state); void _q_bandChanged(QRadioTuner::Band band); void _q_error(QRadioTuner::Error errorCode); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); private: Q_DISABLE_COPY(QDeclarativeRadio) diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp index 76cae0fc0..b03579ec1 100644 --- a/src/imports/multimedia/qdeclarativeradiodata.cpp +++ b/src/imports/multimedia/qdeclarativeradiodata.cpp @@ -141,7 +141,7 @@ QDeclarativeRadioData::~QDeclarativeRadioData() */ QDeclarativeRadioData::Availability QDeclarativeRadioData::availability() const { - return Availability(m_radioData->availabilityError()); + return Availability(m_radioData->availability()); } @@ -281,9 +281,9 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode) emit errorChanged(); } -void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityError error) +void QDeclarativeRadioData::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) { - emit availabilityChanged(Availability(error)); + emit availabilityChanged(Availability(availability)); } void QDeclarativeRadioData::connectSignals() @@ -297,10 +297,8 @@ void QDeclarativeRadioData::connectSignals() connect(m_radioData, SIGNAL(radioTextChanged(QString)), this, SIGNAL(radioTextChanged(QString))); connect(m_radioData, SIGNAL(alternativeFrequenciesEnabledChanged(bool)), this, SIGNAL(alternativeFrequenciesEnabledChanged(bool))); - - // Note we map availabilityError->availability // Since the radio data type depends on the service for the tuner, the availability is also dictated from the tuner - connect(m_radioTuner, SIGNAL(availabilityErrorChanged(QtMultimedia::AvailabilityError)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityError))); + connect(m_radioTuner, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); connect(m_radioData, SIGNAL(error(QRadioData::Error)), this, SLOT(_q_error(QRadioData::Error))); } diff --git a/src/imports/multimedia/qdeclarativeradiodata_p.h b/src/imports/multimedia/qdeclarativeradiodata_p.h index ce157e7b0..9740e767d 100644 --- a/src/imports/multimedia/qdeclarativeradiodata_p.h +++ b/src/imports/multimedia/qdeclarativeradiodata_p.h @@ -137,9 +137,9 @@ public: }; enum Availability { - Available = QtMultimedia::NoError, - Busy = QtMultimedia::BusyError, - Unavailable = QtMultimedia::ServiceMissingError, + Available = QtMultimedia::Available, + Busy = QtMultimedia::Busy, + Unavailable = QtMultimedia::ServiceMissing, ResourceMissing = QtMultimedia::ResourceError }; @@ -176,7 +176,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_programTypeChanged(QRadioData::ProgramType programType); void _q_error(QRadioData::Error errorCode); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); private: void connectSignals(); |