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/multimedia/qdeclarativeradio.cpp | |
| 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/multimedia/qdeclarativeradio.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeradio.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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)); } /*! |