Rename namespace QtMultimedia -> QMultimedia

Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp

For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h b/tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h
index 159abf9bd..c63b62d6b 100644
--- a/tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockavailabilitycontrol.h
@@ -50,18 +50,18 @@ class MockAvailabilityControl : public QMediaAvailabilityControl
     Q_OBJECT
 
 public:
-    MockAvailabilityControl(QtMultimedia::AvailabilityStatus available)
+    MockAvailabilityControl(QMultimedia::AvailabilityStatus available)
         : m_availability(available)
     {
 
     }
 
-    QtMultimedia::AvailabilityStatus availability() const
+    QMultimedia::AvailabilityStatus availability() const
     {
         return m_availability;
     }
 
-    void setAvailability(QtMultimedia::AvailabilityStatus availability)
+    void setAvailability(QMultimedia::AvailabilityStatus availability)
     {
         if (m_availability != availability) {
             m_availability = availability;
@@ -69,7 +69,7 @@ public:
         }
     }
 
-    QtMultimedia::AvailabilityStatus m_availability;
+    QMultimedia::AvailabilityStatus m_availability;
 };
 
 #endif // MOCKAVAILABILITYCONTROL_H
diff --git a/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h b/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h
index a2335907b..39e7898c9 100644
--- a/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h
+++ b/tests/auto/unit/qmultimedia_common/mockimageencodercontrol.h
@@ -65,12 +65,12 @@ public:
                 settings.resolution() == QSize(320,240))
                 resolutions << settings.resolution();
 
-            if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480))
+            if (settings.quality() == QMultimedia::HighQuality && settings.resolution() == QSize(640,480))
                 resolutions << settings.resolution();
         } else {
             resolutions << QSize(160, 120);
             resolutions << QSize(320, 240);
-            if (settings.quality() == QtMultimedia::HighQuality)
+            if (settings.quality() == QMultimedia::HighQuality)
                 resolutions << QSize(640, 480);
         }