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>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index c8853cb94..f6d380826 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -228,15 +228,15 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject)
     Returns the availability of the radio data service.
 
     A long as there is a media service which provides radio functionality, then the
-    \l{QtMultimedia::AvailabilityStatus}{availability} will be that
+    \l{QMultimedia::AvailabilityStatus}{availability} will be that
     of the \l{QRadioTuner::availability()}{radio tuner}.
 */
-QtMultimedia::AvailabilityStatus QRadioData::availability() const
+QMultimedia::AvailabilityStatus QRadioData::availability() const
 {
     Q_D(const QRadioData);
 
     if (d->control == 0)
-        return QtMultimedia::ServiceMissing;
+        return QMultimedia::ServiceMissing;
 
     return d->mediaObject->availability();
 }
diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h
index 6c6b0f411..6d67bce23 100644
--- a/src/multimedia/radio/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
@@ -89,7 +89,7 @@ public:
     QRadioData(QMediaObject *mediaObject, QObject *parent = 0);
     ~QRadioData();
 
-    QtMultimedia::AvailabilityStatus availability() const;
+    QMultimedia::AvailabilityStatus availability() const;
 
     QMediaObject *mediaObject() const;
 
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index ad2bcc7e6..d9d9cb6bf 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -159,13 +159,13 @@ QRadioTuner::~QRadioTuner()
 /*!
     Returns the availability of the radio tuner.
 */
-QtMultimedia::AvailabilityStatus QRadioTuner::availability() const
+QMultimedia::AvailabilityStatus QRadioTuner::availability() const
 {
     if (d_func()->control == 0)
-        return QtMultimedia::ServiceMissing;
+        return QMultimedia::ServiceMissing;
 
     if (!d_func()->control->isAntennaConnected())
-        return QtMultimedia::ResourceError;
+        return QMultimedia::ResourceError;
 
     return QMediaObject::availability();
 }
diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index eda8bc86f..463cafd00 100644
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -85,7 +85,7 @@ public:
     QRadioTuner(QObject *parent = 0);
     ~QRadioTuner();
 
-    QtMultimedia::AvailabilityStatus availability() const;
+    QMultimedia::AvailabilityStatus availability() const;
 
     State state() const;