Rename availabilityError to availability.

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

View File

@@ -1233,7 +1233,7 @@ void tst_QCamera::testQCameraIsAvailable()
{
QCamera camera;
QVERIFY(camera.isAvailable());
QVERIFY(camera.availabilityError() == QtMultimedia::NoError);
QVERIFY(camera.availability() == QtMultimedia::Available);
}
void tst_QCamera::testQCameraIsNotAvailable()
@@ -1243,7 +1243,7 @@ void tst_QCamera::testQCameraIsNotAvailable()
QCOMPARE(camera.error(), QCamera::ServiceMissingError);
QVERIFY(!camera.isAvailable());
QCOMPARE(camera.availabilityError(), QtMultimedia::ServiceMissingError);
QCOMPARE(camera.availability(), QtMultimedia::ServiceMissing);
}
/* Test case for searchAndLock ( QCamera::LockTypes locks ) */