slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename availabilityError to availability.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/controls/qmediaavailabilitycontrol.cpp
View File

@@ -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.
*/

4
src/multimedia/controls/qmediaavailabilitycontrol.h
View File

@@ -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);