summaryrefslogtreecommitdiffstats
path: root/src/multimedia/playback/qmediaplayer.cpp
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-06-25 10:53:26 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-29 02:47:41 +0200
commitb0809c027c9fe2e49d37dff45aa4f03b0a4e0743 (patch)
treed647951ecb69c9b39f004198d76fbc4972174549 /src/multimedia/playback/qmediaplayer.cpp
parentbba28afe559837321a2083b3ce046ab774a7ef6b (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/playback/qmediaplayer.cpp')
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 067893ef1..2d4247997 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
\list
\li Accessing the currently playing media's metadata (\l {QMediaObject::metaData()} and \l {QtMultimedia::MetaData}{predefined meta-data keys})
- \li Checking to see if the media playback service is currently available (\l {QMediaObject::availabilityError()})
+ \li Checking to see if the media playback service is currently available (\l {QMediaObject::availability()})
\endlist
\sa QMediaObject, QMediaService, QVideoWidget, QMediaPlaylist
@@ -1013,14 +1013,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
}
/*! \reimp */
-QtMultimedia::AvailabilityError QMediaPlayer::availabilityError() const
+QtMultimedia::AvailabilityStatus QMediaPlayer::availability() const
{
Q_D(const QMediaPlayer);
if (!d->control)
- return QtMultimedia::ServiceMissingError;
+ return QtMultimedia::ServiceMissing;
- return QMediaObject::availabilityError();
+ return QMediaObject::availability();
}