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, 13 insertions, 13 deletions

diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
index 6f3965844..c544e990b 100644
--- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp
@@ -843,9 +843,9 @@ void tst_QMediaRecorder::nullMetaDataControl()
     QCOMPARE(recorder.isMetaDataAvailable(), false);
     QCOMPARE(recorder.isMetaDataWritable(), false);
 
-    recorder.setMetaData(QtMultimedia::MetaData::Title, title);
+    recorder.setMetaData(QMediaMetaData::Title, title);
 
-    QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), QString());
+    QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), QString());
     QCOMPARE(recorder.availableMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -959,19 +959,19 @@ void tst_QMediaRecorder::metaData()
     QMediaRecorder recorder(&object);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::AlbumArtist, artist);
-    service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::Title, title);
-    service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::Genre, genre);
+    service.mockMetaDataControl->m_data.insert(QMediaMetaData::AlbumArtist, artist);
+    service.mockMetaDataControl->m_data.insert(QMediaMetaData::Title, title);
+    service.mockMetaDataControl->m_data.insert(QMediaMetaData::Genre, genre);
     service.mockMetaDataControl->m_data.insert(QLatin1String("CustomEntry"), custom );
 
-    QCOMPARE(recorder.metaData(QtMultimedia::MetaData::AlbumArtist).toString(), artist);
-    QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), title);
+    QCOMPARE(recorder.metaData(QMediaMetaData::AlbumArtist).toString(), artist);
+    QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), title);
 
     QStringList metaDataKeys = recorder.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 4);
-    QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Title));
-    QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Genre));
+    QVERIFY(metaDataKeys.contains(QMediaMetaData::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QMediaMetaData::Title));
+    QVERIFY(metaDataKeys.contains(QMediaMetaData::Genre));
     QVERIFY(metaDataKeys.contains(QLatin1String("CustomEntry")));
 }
 
@@ -995,9 +995,9 @@ void tst_QMediaRecorder::setMetaData()
 
     QMediaRecorder recorder(&object);
 
-    recorder.setMetaData(QtMultimedia::MetaData::Title, title);
-    QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), title);
-    QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimedia::MetaData::Title).toString(), title);
+    recorder.setMetaData(QMediaMetaData::Title, title);
+    QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), title);
+    QCOMPARE(service.mockMetaDataControl->m_data.value(QMediaMetaData::Title).toString(), title);
 }
 
 void tst_QMediaRecorder::testAudioSettingsCopyConstructor()