diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2011-10-06 14:31:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 06:16:34 +0200 |
commit | 03f22bcdaf1f80083618856d6e4140d3062f175b (patch) | |
tree | fdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /src/plugins/wmf/player/mfmetadatacontrol.cpp | |
parent | 55bc4f2b46b0099d187db16e049d760cd55626e6 (diff) |
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.
Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/plugins/wmf/player/mfmetadatacontrol.cpp')
-rw-r--r-- | src/plugins/wmf/player/mfmetadatacontrol.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/wmf/player/mfmetadatacontrol.cpp b/src/plugins/wmf/player/mfmetadatacontrol.cpp index 4d62b9091..4e6270606 100644 --- a/src/plugins/wmf/player/mfmetadatacontrol.cpp +++ b/src/plugins/wmf/player/mfmetadatacontrol.cpp @@ -65,7 +65,7 @@ bool MFMetaDataControl::isMetaDataAvailable() const return m_content || m_metaData; } -QVariant MFMetaDataControl::metaData(QtMultimediaKit::MetaData key) const +QVariant MFMetaDataControl::metaData(QtMultimedia::MetaData key) const { QVariant value; if (!isMetaDataAvailable()) @@ -113,7 +113,7 @@ QVariant MFMetaDataControl::convertValue(const PROPVARIANT& var) const return value; } -QList<QtMultimediaKit::MetaData> MFMetaDataControl::availableMetaData() const +QList<QtMultimedia::MetaData> MFMetaDataControl::availableMetaData() const { return m_availableMetaDatas; } @@ -173,15 +173,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed continue; bool common = true; if (key == PKEY_Author) { - m_availableMetaDatas.push_back(QtMultimediaKit::Author); + m_availableMetaDatas.push_back(QtMultimedia::Author); } else if (key == PKEY_Title) { - m_availableMetaDatas.push_back(QtMultimediaKit::Title); + m_availableMetaDatas.push_back(QtMultimedia::Title); } else if (key == PKEY_ParentalRating) { - m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating); + m_availableMetaDatas.push_back(QtMultimedia::ParentalRating); } else if (key == PKEY_Comment) { - m_availableMetaDatas.push_back(QtMultimediaKit::Description); + m_availableMetaDatas.push_back(QtMultimedia::Description); } else if (key == PKEY_Copyright) { - m_availableMetaDatas.push_back(QtMultimediaKit::Copyright); + m_availableMetaDatas.push_back(QtMultimedia::Copyright); //TODO: add more common keys } else { common = false; @@ -213,15 +213,15 @@ void MFMetaDataControl::updateSource(IMFPresentationDescriptor* sourcePD, IMFMed #endif bool common = true; if (wcscmp(sName, L"Author") == 0) { - m_availableMetaDatas.push_back(QtMultimediaKit::Author); + m_availableMetaDatas.push_back(QtMultimedia::Author); } else if (wcscmp(sName, L"Title") == 0) { - m_availableMetaDatas.push_back(QtMultimediaKit::Title); + m_availableMetaDatas.push_back(QtMultimedia::Title); } else if (wcscmp(sName, L"Rating") == 0) { - m_availableMetaDatas.push_back(QtMultimediaKit::ParentalRating); + m_availableMetaDatas.push_back(QtMultimedia::ParentalRating); } else if (wcscmp(sName, L"Description") == 0) { - m_availableMetaDatas.push_back(QtMultimediaKit::Description); + m_availableMetaDatas.push_back(QtMultimedia::Description); } else if (wcscmp(sName, L"Copyright") == 0) { - m_availableMetaDatas.push_back(QtMultimediaKit::Copyright); + m_availableMetaDatas.push_back(QtMultimedia::Copyright); //TODO: add more common keys } else { common = false; |