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/multimedia/radio | |
parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) | |
download | qtmultimedia-b0809c027c9fe2e49d37dff45aa4f03b0a4e0743.tar.gz |
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/multimedia/radio')
-rw-r--r-- | src/multimedia/radio/qradiodata.cpp | 12 | ||||
-rw-r--r-- | src/multimedia/radio/qradiodata.h | 2 | ||||
-rw-r--r-- | src/multimedia/radio/qradiotuner.cpp | 6 | ||||
-rw-r--r-- | src/multimedia/radio/qradiotuner.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index 1aa39647d..a2f396420 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -227,18 +227,18 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject) /*! Returns the availability of the radio data service. - A long as there is a media service which provides control, then the - \l{QtMultimedia::AvailabilityError}{availability error} will be that - of the \l{QRadioTuner::availabilityError()}{radio tuner}. + A long as there is a media service which provides radio functionality, then the + \l{QtMultimedia::AvailabilityStatus}{availability} will be that + of the \l{QRadioTuner::availability()}{radio tuner}. */ -QtMultimedia::AvailabilityError QRadioData::availabilityError() const +QtMultimedia::AvailabilityStatus QRadioData::availability() const { Q_D(const QRadioData); if (d->control == 0) - return QtMultimedia::ServiceMissingError; + return QtMultimedia::ServiceMissing; - return d->mediaObject->availabilityError(); + return d->mediaObject->availability(); } /*! diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index 6e282f3ee..5d409f8dd 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -91,7 +91,7 @@ public: QRadioData(QMediaObject *mediaObject, QObject *parent = 0); ~QRadioData(); - QtMultimedia::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityStatus availability() const; QMediaObject *mediaObject() const; diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp index f5dad4473..722419aa9 100644 --- a/src/multimedia/radio/qradiotuner.cpp +++ b/src/multimedia/radio/qradiotuner.cpp @@ -159,15 +159,15 @@ QRadioTuner::~QRadioTuner() /*! Returns the availability of the radio tuner. */ -QtMultimedia::AvailabilityError QRadioTuner::availabilityError() const +QtMultimedia::AvailabilityStatus QRadioTuner::availability() const { if (d_func()->control == 0) - return QtMultimedia::ServiceMissingError; + return QtMultimedia::ServiceMissing; if (!d_func()->control->isAntennaConnected()) return QtMultimedia::ResourceError; - return QMediaObject::availabilityError(); + return QMediaObject::availability(); } /*! diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index 8f11321cf..dbec6d849 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -87,7 +87,7 @@ public: QRadioTuner(QObject *parent = 0); ~QRadioTuner(); - QtMultimedia::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityStatus availability() const; State state() const; |