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/imports/multimedia/qdeclarativecamera_p.h | |
parent | bba28afe559837321a2083b3ce046ab774a7ef6b (diff) |
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/imports/multimedia/qdeclarativecamera_p.h')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index e36a9c971..137df3b82 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -216,9 +216,9 @@ public: }; enum Availability { - Available = QtMultimedia::NoError, - Busy = QtMultimedia::BusyError, - Unavailable = QtMultimedia::ServiceMissingError, + Available = QtMultimedia::Available, + Busy = QtMultimedia::Busy, + Unavailable = QtMultimedia::ServiceMissing, ResourceMissing = QtMultimedia::ResourceError }; @@ -287,7 +287,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_updateState(QCamera::State); void _q_error(QCamera::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); protected: void classBegin(); |