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/multimedia/controls | |
| 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/multimedia/controls')
| -rw-r--r-- | src/multimedia/controls/qmediastreamscontrol.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/controls/qmetadatareadercontrol.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qmetadatawritercontrol.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp index 292b5326d..501f97fcf 100644 --- a/src/multimedia/controls/qmediastreamscontrol.cpp +++ b/src/multimedia/controls/qmediastreamscontrol.cpp @@ -129,8 +129,8 @@ QMediaStreamsControl::~QMediaStreamsControl() Returns the meta-data value of \a key for a given \a stream. - Useful metadata keys are QtMultimedia::MetaData::Title, - QtMultimedia::MetaData::Description and QtMultimedia::MetaData::Language. + Useful metadata keys are QMediaMetaData::Title, + QMediaMetaData::Description and QMediaMetaData::Language. */ /*! diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 514a9edeb..aef80a3d0 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE its current media it will implement QMetaDataReaderControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the keys defined in the - QtMultimedia::MetaData namespace. + QMediaMetaData namespace. The functionality provided by this control is exposed to application code by the meta-data members of QMediaObject, and so meta-data access diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp index 9f62da58b..45d43dafd 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.cpp +++ b/src/multimedia/controls/qmetadatawritercontrol.cpp @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE current media it will implement QMetaDataWriterControl. This control provides functions for both retrieving and setting meta-data values. Meta-data may be addressed by the keys defined in the - QtMultimedia::MetaData namespace. + QMediaMetaData namespace. The functionality provided by this control is exposed to application code by the meta-data members of QMediaObject, and so meta-data access is |