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/multimedia/controls | |
| 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/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/qmediaavailabilitycontrol.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/controls/qmediaavailabilitycontrol.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp index 1610b0872..8c86ee755 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp +++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp @@ -90,7 +90,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl() /*! - \fn QtMultimedia::AvailabilityError QMediaAvailabilityControl::availability() const + \fn QtMultimedia::AvailabilityStatus QMediaAvailabilityControl::availability() const Returns the current availability of this instance of the media service. If the availability changes at run time (for example, some other media @@ -100,7 +100,7 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl() /*! - \fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityError availability) + \fn void QMediaAvailabilityControl::availabilityChanged(QtMultimedia::AvailabilityStatus availability) Signal emitted when the current \a availability value changed. */ diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 16f46f0f0..7117d2a2f 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -62,10 +62,10 @@ class Q_MULTIMEDIA_EXPORT QMediaAvailabilityControl : public QMediaControl public: ~QMediaAvailabilityControl(); - virtual QtMultimedia::AvailabilityError availability() const = 0; + virtual QtMultimedia::AvailabilityStatus availability() const = 0; signals: - void availabilityChanged(QtMultimedia::AvailabilityError availability); + void availabilityChanged(QtMultimedia::AvailabilityStatus availability); protected: QMediaAvailabilityControl(QObject* parent = 0); |