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/wmf | |
| 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/wmf')
| -rw-r--r-- | src/plugins/wmf/player/mfmetadatacontrol.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp index a3df0dc47..18c6a4204 100644 --- a/src/plugins/wmf/player/mfmetadatacontrol.cpp +++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp @@ -144,15 +144,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed continue; bool common = true; if (key == PKEY_Author) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Author); + m_availableMetaDatas.push_back(QMediaMetaData::Author); } else if (key == PKEY_Title) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Title); + m_availableMetaDatas.push_back(QMediaMetaData::Title); } else if (key == PKEY_ParentalRating) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::ParentalRating); + m_availableMetaDatas.push_back(QMediaMetaData::ParentalRating); } else if (key == PKEY_Comment) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Description); + m_availableMetaDatas.push_back(QMediaMetaData::Description); } else if (key == PKEY_Copyright) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Copyright); + m_availableMetaDatas.push_back(QMediaMetaData::Copyright); //TODO: add more common keys } else { common = false; @@ -183,15 +183,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed qDebug() << "metadata: " << QString::fromUtf16(sName); #endif if (wcscmp(sName, L"Author") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Author); + m_availableMetaDatas.push_back(QMediaMetaData::Author); } else if (wcscmp(sName, L"Title") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Title); + m_availableMetaDatas.push_back(QMediaMetaData::Title); } else if (wcscmp(sName, L"Rating") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::ParentalRating); + m_availableMetaDatas.push_back(QMediaMetaData::ParentalRating); } else if (wcscmp(sName, L"Description") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Description); + m_availableMetaDatas.push_back(QMediaMetaData::Description); } else if (wcscmp(sName, L"Copyright") == 0) { - m_availableMetaDatas.push_back(QtMultimedia::MetaData::Copyright); + m_availableMetaDatas.push_back(QMediaMetaData::Copyright); //TODO: add more common keys } else { m_availableMetaDatas.push_back(QString::fromUtf16(reinterpret_cast<const ushort*>(sName))); |