diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-11-01 00:33:21 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:20:06 +0100 |
| commit | 832c3929f2222e0e10ada33549c9d1cf90373018 (patch) | |
| tree | 81160e77da3704c2403d03ad0cc60f06ace98ac8 /src/multimedia/qmediaobject.cpp | |
| parent | 13fd00199a6a41af2bdbb876fe33c75547e3d996 (diff) | |
| download | qtmultimedia-832c3929f2222e0e10ada33549c9d1cf90373018.tar.gz | |
Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/multimedia/qmediaobject.cpp')
| -rw-r--r-- | src/multimedia/qmediaobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index 249562203..d1cafbf66 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -121,15 +121,15 @@ QMediaObject::~QMediaObject() audio playback during a phone call or similar). */ -QtMultimedia::AvailabilityStatus QMediaObject::availability() const +QMultimedia::AvailabilityStatus QMediaObject::availability() const { if (d_func()->service == 0) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (d_func()->availabilityControl) return d_func()->availabilityControl->availability(); - return QtMultimedia::Available; + return QMultimedia::Available; } /*! @@ -138,7 +138,7 @@ QtMultimedia::AvailabilityStatus QMediaObject::availability() const bool QMediaObject::isAvailable() const { - return availability() == QtMultimedia::Available; + return availability() == QMultimedia::Available; } /*! @@ -408,7 +408,7 @@ void QMediaObject::setupControls() d->availabilityControl = d->service->requestControl<QMediaAvailabilityControl*>(); if (d->availabilityControl) { connect(d->availabilityControl, - SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), + SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), SLOT(_q_availabilityChanged())); } } @@ -421,7 +421,7 @@ void QMediaObject::setupControls() */ /*! - \fn QMediaObject::availabilityChanged(QtMultimedia::AvailabilityStatus availability) + \fn QMediaObject::availabilityChanged(QMultimedia::AvailabilityStatus availability) Signal emitted when the availability of the service has changed to \a availabilty */ |