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>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp
index f9848245a..19870e477 100644
--- a/src/multimedia/playback/playlistfileparser.cpp
+++ b/src/multimedia/playback/playlistfileparser.cpp
@@ -103,18 +103,18 @@ public:
                     int length = line.mid(8, artistStart < 8 ? -1 : artistStart - 8).trimmed().toInt(&ok);
                     if (ok && length > 0) {
                         //convert from second to milisecond
-                        m_extraInfo[QtMultimedia::MetaData::Duration] = QVariant(length * 1000);
+                        m_extraInfo[QMediaMetaData::Duration] = QVariant(length * 1000);
                     }
                     if (artistStart > 0) {
                         int titleStart = getSplitIndex(line, artistStart);
                         if (titleStart > artistStart) {
-                            m_extraInfo[QtMultimedia::MetaData::Author] = line.mid(artistStart + 1,
+                            m_extraInfo[QMediaMetaData::Author] = line.mid(artistStart + 1,
                                                              titleStart - artistStart - 1).trimmed().
                                                              replace(QLatin1String("--"), QLatin1String("-"));
-                            m_extraInfo[QtMultimedia::MetaData::Title] = line.mid(titleStart + 1).trimmed().
+                            m_extraInfo[QMediaMetaData::Title] = line.mid(titleStart + 1).trimmed().
                                                    replace(QLatin1String("--"), QLatin1String("-"));
                         } else {
-                            m_extraInfo[QtMultimedia::MetaData::Title] = line.mid(artistStart + 1).trimmed().
+                            m_extraInfo[QMediaMetaData::Title] = line.mid(artistStart + 1).trimmed().
                                                    replace(QLatin1String("--"), QLatin1String("-"));
                         }
                     }
@@ -262,13 +262,13 @@ Version=2
                 m_item[QLatin1String("url")] = getValue(lineIndex, line);
                 setFlag(FileRead);
             } else if (!containsFlag(TitleRead) && line.startsWith(m_titleName)) {
-                m_item[QtMultimedia::MetaData::Title] = getValue(lineIndex, line);
+                m_item[QMediaMetaData::Title] = getValue(lineIndex, line);
                 setFlag(TitleRead);
             } else if (!containsFlag(LengthRead) && line.startsWith(m_lengthName)) {
                 //convert from seconds to miliseconds
                 int length = getValue(lineIndex, line).toInt();
                 if (length > 0)
-                    m_item[QtMultimedia::MetaData::Duration] = length * 1000;
+                    m_item[QMediaMetaData::Duration] = length * 1000;
                 setFlag(LengthRead);
             } else if (line.startsWith(QLatin1String("NumberOfEntries"))) {
                 m_state = Footer;