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/recording/qmediarecorder.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/recording/qmediarecorder.cpp')
| -rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index e6bbcdd7e..dd303a12b 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -185,7 +185,7 @@ void QMediaRecorderPrivate::_q_applySettings() } } -void QMediaRecorderPrivate::_q_availabilityChanged(QtMultimedia::AvailabilityStatus availability) +void QMediaRecorderPrivate::_q_availabilityChanged(QMultimedia::AvailabilityStatus availability) { Q_Q(QMediaRecorder); Q_UNUSED(error) @@ -327,8 +327,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) service->releaseControl(d->metaDataControl); } if (d->availabilityControl) { - disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + disconnect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); service->releaseControl(d->availabilityControl); } } @@ -379,8 +379,8 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) d->availabilityControl = service->requestControl<QMediaAvailabilityControl*>(); if (d->availabilityControl) { - connect(d->availabilityControl, SIGNAL(availabilityChanged(QtMultimedia::AvailabilityStatus)), - this, SLOT(_q_availabilityChanged(QtMultimedia::AvailabilityStatus))); + connect(d->availabilityControl, SIGNAL(availabilityChanged(QMultimedia::AvailabilityStatus)), + this, SLOT(_q_availabilityChanged(QMultimedia::AvailabilityStatus))); } connect(d->control, SIGNAL(stateChanged(QMediaRecorder::State)), @@ -449,7 +449,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object) */ bool QMediaRecorder::isAvailable() const { - return availability() == QtMultimedia::Available; + return availability() == QMultimedia::Available; } /*! @@ -457,15 +457,15 @@ bool QMediaRecorder::isAvailable() const \sa availabilityChanged() */ -QtMultimedia::AvailabilityStatus QMediaRecorder::availability() const +QMultimedia::AvailabilityStatus QMediaRecorder::availability() const { if (d_func()->control == NULL) - return QtMultimedia::ServiceMissing; + return QMultimedia::ServiceMissing; if (d_func()->availabilityControl) return d_func()->availabilityControl->availability(); - return QtMultimedia::Available; + return QMultimedia::Available; } QUrl QMediaRecorder::outputLocation() const @@ -987,7 +987,7 @@ void QMediaRecorder::stop() */ /*! - \fn QMediaRecorder::availabilityChanged(QtMultimedia::AvailabilityStatus availability) + \fn QMediaRecorder::availabilityChanged(QMultimedia::AvailabilityStatus availability) Signals that the service availability has changed to \a availability. */ |