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>
2012-11-01 00:42:35 +08:00
parent 832c3929f2
commit 47fe5f9b39
28 changed files with 32 additions and 32 deletions
--- a/src/multimedia/audio/qaudio.h
+++ b/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>

--- a/src/multimedia/audio/qaudiobuffer.h
+++ b/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>
--- a/src/multimedia/audio/qaudiobuffer_p.h
+++ b/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"

--- a/src/multimedia/audio/qaudiodevicefactory_p.h
+++ b/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"

--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/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>
--- a/src/multimedia/audio/qaudioformat.h
+++ b/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

--- a/src/multimedia/audio/qaudioinput.h
+++ b/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>
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/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>
--- a/src/multimedia/audio/qaudiosystem.h
+++ b/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"
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/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"
--- a/src/multimedia/controls/qmediaavailabilitycontrol.h
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -44,7 +44,7 @@

 #include <qmediacontrol.h>
 #include <qmediaobject.h>
-#include <qtmedianamespace.h>
+#include <qmultimedia.h>

 QT_BEGIN_HEADER

--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/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>

--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -48,7 +48,7 @@
 #include <qmediaresource.h>

 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"

 QT_BEGIN_HEADER

--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -48,7 +48,7 @@
 #include "qmediaresource.h"

 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"

 QT_BEGIN_HEADER

--- a/src/multimedia/multimedia.pro
+++ b/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)
--- a/src/multimedia/playback/playlistfileparser.cpp
+++ b/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

--- a/src/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -46,7 +46,7 @@
 #include <QtCore/qstringlist.h>

 #include <qtmultimediadefs.h>
-#include "qtmedianamespace.h"
+#include "qmultimedia.h"

 QT_BEGIN_HEADER

--- a/src/multimedia/qmediaserviceprovider_p.h
+++ b/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
--- a/src/multimedia/qmediaserviceproviderplugin.h
+++ b/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
--- a/src/multimedia/qmediatimerange.h
+++ b/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
--- a/src/multimedia/qtmedianamespace.cpp
+++ b/src/multimedia/qtmedianamespace.cpp
@@ -25,13 +25,12 @@
 **
 ****************************************************************************/

-#include "qtmedianamespace.h"
+#include "qmultimedia.h"

 QT_BEGIN_NAMESPACE

 /*!
    \namespace QMultimedia
-    \inheaderfile qtmedianamespace.h
    \ingroup multimedia
    \inmodule QtMultimedia

--- a/src/multimedia/qtmedianamespace.h
+++ b/src/multimedia/qtmedianamespace.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/

-#ifndef QTMEDIANAMESPACE_H
-#define QTMEDIANAMESPACE_H
+#ifndef QMULTIMEDIA_H
+#define QMULTIMEDIA_H

 #include <QtCore/qpair.h>
 #include <QtCore/qmetatype.h>
--- a/src/multimedia/recording/qmediaencodersettings.h
+++ b/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

--- a/src/multimedia/recording/qmediarecorder.h
+++ b/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>
--- a/src/multimedia/video/qabstractvideobuffer.h
+++ b/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>
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/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
--- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm
+++ b/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>

--- a/sync.profile
+++ b/sync.profile
@@ -8,7 +8,8 @@
 );

 %classnames = (
-    "qmediametadata.h" => "QMediaMetaData"
+    "qmediametadata.h" => "QMediaMetaData",
+    "qmultimedia.h" => "QMultimedia"
 );

 # Module dependencies.