slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename availabilityError to availability.

Browse Source 
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Michael Goddard
2012-06-25 10:53:26 +10:00
committed by Qt by Nokia
parent bba28afe55
commit b0809c027c
44 changed files with 167 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/multimedia/radio/qradiodata.cpp
View File

@@ -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();
}
/*!

2
src/multimedia/radio/qradiodata.h
View File

@@ -91,7 +91,7 @@ public:
QRadioData(QMediaObject *mediaObject, QObject *parent = 0);
~QRadioData();
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
QMediaObject *mediaObject() const;

6
src/multimedia/radio/qradiotuner.cpp
View File

@@ -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();
}
/*!

2
src/multimedia/radio/qradiotuner.h
View File

@@ -87,7 +87,7 @@ public:
QRadioTuner(QObject *parent = 0);
~QRadioTuner();
QtMultimedia::AvailabilityError availabilityError() const;
QtMultimedia::AvailabilityStatus availability() const;
State state() const;