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

Rename namespace QtMultimedia -> QMultimedia

Browse Source 
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>
This commit is contained in:
Sze Howe Koh
2012-11-01 00:33:21 +08:00
committed by The Qt Project
parent 13fd00199a
commit 832c3929f2
78 changed files with 381 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/multimedia/recording/qmediarecorder.cpp
View File

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