Enable the "#include <QMultimedia>" camel-case header

Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have
sync.profile generate the camel-case header during compilation.

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

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

src/multimedia/audio/qaudio.h

@@ -44,7 +44,7 @@
 #define QAUDIO_H
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include <QtCore/qmetatype.h>
 

src/multimedia/audio/qaudiobuffer.h

@@ -45,7 +45,7 @@
 #include <QSharedDataPointer>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include <qaudio.h>
 #include <qaudioformat.h>

src/multimedia/audio/qaudiobuffer_p.h

@@ -43,7 +43,7 @@
 #define QAUDIOBUFFER_P_H
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include "qaudioformat.h"
 

src/multimedia/audio/qaudiodevicefactory_p.h

@@ -57,7 +57,7 @@
 #include <QtCore/qlist.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include "qaudiodeviceinfo.h"
 

src/multimedia/audio/qaudiodeviceinfo.h

@@ -50,7 +50,7 @@
 #include <QtCore/qlist.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include <qaudio.h>
 #include <qaudioformat.h>

src/multimedia/audio/qaudioformat.h

@@ -47,7 +47,7 @@
 #include <QtCore/qshareddata.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 QT_BEGIN_HEADER
 

src/multimedia/audio/qaudioinput.h

@@ -46,7 +46,7 @@
 #include <QtCore/qiodevice.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include <qaudio.h>
 #include <qaudioformat.h>

src/multimedia/audio/qaudiooutput.h

@@ -46,7 +46,7 @@
 #include <QtCore/qiodevice.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include <qaudio.h>
 #include <qaudioformat.h>

src/multimedia/audio/qaudiosystem.h

@@ -43,7 +43,7 @@
 #define QAUDIOSYSTEM_H
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include "qaudio.h"
 #include "qaudioformat.h"

src/multimedia/audio/qaudiosystemplugin.h

@@ -47,7 +47,7 @@
 #include <QtCore/qplugin.h>
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 #include "qaudioformat.h"
 #include "qaudiodeviceinfo.h"

src/multimedia/controls/qmediaavailabilitycontrol.h

@@ -44,7 +44,7 @@
 
 #include <qmediacontrol.h>
 #include <qmediaobject.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 QT_BEGIN_HEADER
 

src/multimedia/controls/qmediastreamscontrol.h

@@ -44,7 +44,7 @@
 #define QMEDIASTREAMSCONTROL_H
 
 #include "qmediacontrol.h"
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 #include "qtmultimediadefs.h"
 #include <qmediaenumdebug.h>
 

src/multimedia/controls/qmetadatareadercontrol.h

@@ -48,7 +48,7 @@
 #include <qmediaresource.h>
 
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_HEADER
 

src/multimedia/controls/qmetadatawritercontrol.h

@@ -48,7 +48,7 @@
 #include "qmediaresource.h"
 
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_HEADER
 

src/multimedia/multimedia.pro

@@ -31,7 +31,7 @@ PUBLIC_HEADERS += \
     qmediaservice.h \
     qmediaserviceproviderplugin.h \
     qmediatimerange.h \
-    qtmedianamespace.h \
+    qmultimedia.h \
     qtmultimediadefs.h \
 
 SOURCES += \
@@ -43,10 +43,10 @@ SOURCES += \
     qmediaservice.cpp \
     qmediaserviceprovider.cpp \
     qmediatimerange.cpp \
-    qtmedianamespace.cpp \
     qmediaresourcepolicyplugin_p.cpp \
     qmediaresourcepolicy_p.cpp \
-    qmediaresourceset_p.cpp
+    qmediaresourceset_p.cpp \
+    qmultimedia.cpp
 
 include(audio/audio.pri)
 include(camera/camera.pri)

src/multimedia/playback/playlistfileparser.cpp

@@ -43,7 +43,7 @@
 #include <qfileinfo.h>
 #include <QtNetwork/QNetworkReply>
 #include "qmediaobject_p.h"
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_NAMESPACE
 

src/multimedia/qmediaobject.h

@@ -46,7 +46,7 @@
 #include <QtCore/qstringlist.h>
 
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_HEADER
 

src/multimedia/qmediaserviceprovider_p.h

@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 #include "qmediaserviceproviderplugin.h"
 
 QT_BEGIN_HEADER

src/multimedia/qmediaserviceproviderplugin.h

@@ -44,7 +44,7 @@
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qplugin.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 #include <qtmultimediadefs.h>
 
 #ifdef Q_MOC_RUN

src/multimedia/qmediatimerange.h

@@ -43,7 +43,7 @@
 #define QMEDIATIMERANGE_H
 
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 #include <QtCore/qshareddata.h>
 
 QT_BEGIN_HEADER

src/multimedia/qmultimedia.cpp

@@ -25,13 +25,12 @@
 **
 ****************************************************************************/
 
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \namespace QMultimedia
-    \inheaderfile qtmedianamespace.h
     \ingroup multimedia
     \inmodule QtMultimedia
 

src/multimedia/qmultimedia.h

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTMEDIANAMESPACE_H
+#ifndef QMULTIMEDIA_H
-#define QTMEDIANAMESPACE_H
+#define QMULTIMEDIA_H
 
 #include <QtCore/qpair.h>
 #include <QtCore/qmetatype.h>

src/multimedia/recording/qmediaencodersettings.h

@@ -47,7 +47,7 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qvariant.h>
 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"
 
 QT_BEGIN_HEADER
 

src/multimedia/recording/qmediarecorder.h

@@ -42,7 +42,7 @@
 #ifndef QMEDIARECORDER_H
 #define QMEDIARECORDER_H
 
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 #include <qmediaobject.h>
 #include <qmediaencodersettings.h>
 #include <qmediabindableinterface.h>

src/multimedia/video/qabstractvideobuffer.h

@@ -43,7 +43,7 @@
 #define QABSTRACTVIDEOBUFFER_H
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 
 #include <QtCore/qmetatype.h>

src/multimedia/video/qabstractvideobuffer_p.h

@@ -57,7 +57,7 @@
 #include "qabstractvideobuffer.h"
 
 #include <qtmultimediadefs.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>
 
 
 QT_BEGIN_HEADER

src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm

@@ -42,7 +42,7 @@
 #include "avfmediaplayermetadatacontrol.h"
 #include "avfmediaplayersession.h"
 
-#include <QtMultimedia/qtmedianamespace.h>
+#include <QtMultimedia/qmultimedia.h>
 
 #import <AVFoundation/AVFoundation.h>
 

sync.profile

@@ -8,7 +8,8 @@
 );
 
 %classnames = (
-    "qmediametadata.h" => "QMediaMetaData"
+    "qmediametadata.h" => "QMediaMetaData",
+    "qmultimedia.h" => "QMultimedia"
 );
 
 # Module dependencies.