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 /src/plugins/qt7 | |
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 'src/plugins/qt7')
-rw-r--r-- | src/plugins/qt7/mediaplayer/qt7playermetadata.mm | 14 | ||||
-rw-r--r-- | src/plugins/qt7/mediaplayer/qt7playerservice.h | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm index 9c14c4542..7217b4395 100644 --- a/src/plugins/qt7/mediaplayer/qt7playermetadata.mm +++ b/src/plugins/qt7/mediaplayer/qt7playermetadata.mm @@ -233,13 +233,13 @@ void QT7PlayerMetaDataControl::updateTags() metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String])); #endif // QUICKTIME_C_API_AVAILABLE - m_tags.insert(QtMultimedia::MetaData::AlbumArtist, metaMap.value(QLatin1String("ART"))); - m_tags.insert(QtMultimedia::MetaData::AlbumTitle, metaMap.value(QLatin1String("alb"))); - m_tags.insert(QtMultimedia::MetaData::Title, metaMap.value(QLatin1String("nam"))); - m_tags.insert(QtMultimedia::MetaData::Date, metaMap.value(QLatin1String("day"))); - m_tags.insert(QtMultimedia::MetaData::Genre, metaMap.value(QLatin1String("gnre"))); - m_tags.insert(QtMultimedia::MetaData::TrackNumber, metaMap.value(QLatin1String("trk"))); - m_tags.insert(QtMultimedia::MetaData::Description, metaMap.value(QLatin1String("des"))); + m_tags.insert(QMediaMetaData::AlbumArtist, metaMap.value(QLatin1String("ART"))); + m_tags.insert(QMediaMetaData::AlbumTitle, metaMap.value(QLatin1String("alb"))); + m_tags.insert(QMediaMetaData::Title, metaMap.value(QLatin1String("nam"))); + m_tags.insert(QMediaMetaData::Date, metaMap.value(QLatin1String("day"))); + m_tags.insert(QMediaMetaData::Genre, metaMap.value(QLatin1String("gnre"))); + m_tags.insert(QMediaMetaData::TrackNumber, metaMap.value(QLatin1String("trk"))); + m_tags.insert(QMediaMetaData::Description, metaMap.value(QLatin1String("des"))); } if (!wasEmpty || !m_tags.isEmpty()) diff --git a/src/plugins/qt7/mediaplayer/qt7playerservice.h b/src/plugins/qt7/mediaplayer/qt7playerservice.h index 0c9a0b9f7..ae9cc11bf 100644 --- a/src/plugins/qt7/mediaplayer/qt7playerservice.h +++ b/src/plugins/qt7/mediaplayer/qt7playerservice.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE -class QMediaMetaData; class QMediaPlayerControl; class QMediaPlaylist; class QMediaPlaylistNavigator; |