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

6
src/multimedia/camera/qcamera.cpp
View File

@@ -412,11 +412,11 @@ QCamera::~QCamera()
/*!
Returns the availability state of the camera service.
*/
QtMultimedia::AvailabilityError QCamera::availabilityError() const
QtMultimedia::AvailabilityStatus QCamera::availability() const
{
Q_D(const QCamera);
if (d->control == NULL)
return QtMultimedia::ServiceMissingError;
return QtMultimedia::ServiceMissing;
if (d->deviceControl && d->deviceControl->deviceCount() == 0)
return QtMultimedia::ResourceError;
@@ -424,7 +424,7 @@ QtMultimedia::AvailabilityError QCamera::availabilityError() const
if (d->error != QCamera::NoError)
return QtMultimedia::ResourceError;
return QMediaObject::availabilityError();
return QMediaObject::availability();
}