From b0809c027c9fe2e49d37dff45aa4f03b0a4e0743 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Mon, 25 Jun 2012 10:53:26 +1000 Subject: Rename availabilityError to availability. It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu --- src/multimedia/camera/qcamera.cpp | 6 +++--- src/multimedia/camera/qcamera.h | 2 +- src/multimedia/camera/qcameraimagecapture.cpp | 8 ++++---- src/multimedia/camera/qcameraimagecapture.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/multimedia/camera') diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 063e28093..3d081d909 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -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(); } diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 851521d4e..7fc52269e 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -152,7 +152,7 @@ public: static QList availableDevices(); static QString deviceDescription(const QByteArray &device); - QtMultimedia::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityStatus availability() const; State state() const; Status status() const; diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 4b86fb301..4bf247294 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -312,14 +312,14 @@ bool QCameraImageCapture::isAvailable() const } /*! - Returns the availability error code. + Returns the availability of this functionality. */ -QtMultimedia::AvailabilityError QCameraImageCapture::availabilityError() const +QtMultimedia::AvailabilityStatus QCameraImageCapture::availability() const { if (d_func()->control != NULL) - return QtMultimedia::NoError; + return QtMultimedia::Available; else - return QtMultimedia::ServiceMissingError; + return QtMultimedia::ServiceMissing; } /*! diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index f050d5206..1d1fa2e9c 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -97,7 +97,7 @@ public: ~QCameraImageCapture(); bool isAvailable() const; - QtMultimedia::AvailabilityError availabilityError() const; + QtMultimedia::AvailabilityStatus availability() const; QMediaObject *mediaObject() const; -- cgit v1.2.1