diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-10-31 19:37:48 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:19:57 +0100 |
| commit | 00d709216335b68b5eb81ae9bf726c82a079e12c (patch) | |
| tree | 571dcc87ca419e092512c62c76864fceff49088a /examples | |
| parent | 0affd9023ff1146c822cd188612c7727947ea618 (diff) | |
Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/camera/camera.cpp | 2 | ||||
| -rw-r--r-- | examples/player/player.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp index 99b01231f..e1031b108 100644 --- a/examples/camera/camera.cpp +++ b/examples/camera/camera.cpp @@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice) connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime())); connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError())); - mediaRecorder->setMetaData(QtMultimedia::MetaData::Title, QVariant(QLatin1String("Test Title"))); + mediaRecorder->setMetaData(QMediaMetaData::Title, QVariant(QLatin1String("Test Title"))); connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int))); diff --git a/examples/player/player.cpp b/examples/player/player.cpp index 653c491e9..9169f3c41 100644 --- a/examples/player/player.cpp +++ b/examples/player/player.cpp @@ -236,11 +236,11 @@ void Player::metaDataChanged() { if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMultimedia::MetaData::AlbumArtist).toString()) - .arg(player->metaData(QtMultimedia::MetaData::Title).toString())); + .arg(player->metaData(QMediaMetaData::AlbumArtist).toString()) + .arg(player->metaData(QMediaMetaData::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMultimedia::MetaData::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QMediaMetaData::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) |