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/imports/multimedia/qdeclarativeaudio_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/imports/multimedia/qdeclarativeaudio_p.h') diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h index 7116131d2..f4cfa8ad4 100644 --- a/src/imports/multimedia/qdeclarativeaudio_p.h +++ b/src/imports/multimedia/qdeclarativeaudio_p.h @@ -138,9 +138,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 }; @@ -237,7 +237,7 @@ Q_SIGNALS: private Q_SLOTS: void _q_error(QMediaPlayer::Error); - void _q_availabilityChanged(QtMultimedia::AvailabilityError); + void _q_availabilityChanged(QtMultimedia::AvailabilityStatus); void _q_statusChanged(); private: -- cgit v1.2.3