From 47fe5f9b39575130fa7e5c3e05ec7775bbf81c99 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Thu, 1 Nov 2012 00:42:35 +0800 Subject: [PATCH] Enable the "#include " 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 Reviewed-by: Stephen Kelly --- src/multimedia/audio/qaudio.h | 2 +- src/multimedia/audio/qaudiobuffer.h | 2 +- src/multimedia/audio/qaudiobuffer_p.h | 2 +- src/multimedia/audio/qaudiodevicefactory_p.h | 2 +- src/multimedia/audio/qaudiodeviceinfo.h | 2 +- src/multimedia/audio/qaudioformat.h | 2 +- src/multimedia/audio/qaudioinput.h | 2 +- src/multimedia/audio/qaudiooutput.h | 2 +- src/multimedia/audio/qaudiosystem.h | 2 +- src/multimedia/audio/qaudiosystemplugin.h | 2 +- src/multimedia/controls/qmediaavailabilitycontrol.h | 2 +- src/multimedia/controls/qmediastreamscontrol.h | 2 +- src/multimedia/controls/qmetadatareadercontrol.h | 2 +- src/multimedia/controls/qmetadatawritercontrol.h | 2 +- src/multimedia/multimedia.pro | 6 +++--- src/multimedia/playback/playlistfileparser.cpp | 2 +- src/multimedia/qmediaobject.h | 2 +- src/multimedia/qmediaserviceprovider_p.h | 2 +- src/multimedia/qmediaserviceproviderplugin.h | 2 +- src/multimedia/qmediatimerange.h | 2 +- src/multimedia/{qtmedianamespace.cpp => qmultimedia.cpp} | 3 +-- src/multimedia/{qtmedianamespace.h => qmultimedia.h} | 4 ++-- src/multimedia/recording/qmediaencodersettings.h | 2 +- src/multimedia/recording/qmediarecorder.h | 2 +- src/multimedia/video/qabstractvideobuffer.h | 2 +- src/multimedia/video/qabstractvideobuffer_p.h | 2 +- .../mediaplayer/avfmediaplayermetadatacontrol.mm | 2 +- sync.profile | 3 ++- 28 files changed, 32 insertions(+), 32 deletions(-) rename src/multimedia/{qtmedianamespace.cpp => qmultimedia.cpp} (98%) rename src/multimedia/{qtmedianamespace.h => qmultimedia.h} (98%) diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index f0341166..2337da44 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -44,7 +44,7 @@ #define QAUDIO_H #include -#include +#include #include diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 652dea73..ce656243 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/src/multimedia/audio/qaudiobuffer_p.h b/src/multimedia/audio/qaudiobuffer_p.h index dfdc9806..20265444 100644 --- a/src/multimedia/audio/qaudiobuffer_p.h +++ b/src/multimedia/audio/qaudiobuffer_p.h @@ -43,7 +43,7 @@ #define QAUDIOBUFFER_P_H #include -#include +#include #include "qaudioformat.h" diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h index 75e14cd6..40b08aae 100644 --- a/src/multimedia/audio/qaudiodevicefactory_p.h +++ b/src/multimedia/audio/qaudiodevicefactory_p.h @@ -57,7 +57,7 @@ #include #include -#include +#include #include "qaudiodeviceinfo.h" diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index d1bbcdeb..545726fe 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 38076c78..8acc36bd 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 583eb189..fbeea840 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 98bf1062..ac1dac62 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include diff --git a/src/multimedia/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h index 0ad2f6b6..b68b8f88 100644 --- a/src/multimedia/audio/qaudiosystem.h +++ b/src/multimedia/audio/qaudiosystem.h @@ -43,7 +43,7 @@ #define QAUDIOSYSTEM_H #include -#include +#include #include "qaudio.h" #include "qaudioformat.h" diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index b07dacc0..74304510 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -47,7 +47,7 @@ #include #include -#include +#include #include "qaudioformat.h" #include "qaudiodeviceinfo.h" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index ee1b642f..190e460d 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index a1b0f285..de13f95c 100644 --- 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 diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 5d1972cd..1d9b94a8 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -48,7 +48,7 @@ #include #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 88de69e2..ecbf329e 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -48,7 +48,7 @@ #include "qmediaresource.h" #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 7df18e52..e8ced991 100644 --- 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) diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index 19870e47..64bff81e 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -43,7 +43,7 @@ #include #include #include "qmediaobject_p.h" -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 258b430b..7a70bb4c 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -46,7 +46,7 @@ #include #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/qmediaserviceprovider_p.h b/src/multimedia/qmediaserviceprovider_p.h index c0689efb..f6dc203d 100644 --- a/src/multimedia/qmediaserviceprovider_p.h +++ b/src/multimedia/qmediaserviceprovider_p.h @@ -45,7 +45,7 @@ #include #include #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include "qmediaserviceproviderplugin.h" QT_BEGIN_HEADER diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index d45c8589..65dbae1d 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #ifdef Q_MOC_RUN diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index ae4bd137..4f5ad1d0 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -43,7 +43,7 @@ #define QMEDIATIMERANGE_H #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include QT_BEGIN_HEADER diff --git a/src/multimedia/qtmedianamespace.cpp b/src/multimedia/qmultimedia.cpp similarity index 98% rename from src/multimedia/qtmedianamespace.cpp rename to src/multimedia/qmultimedia.cpp index 4c6bb468..15eda0b5 100644 --- a/src/multimedia/qtmedianamespace.cpp +++ b/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 diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qmultimedia.h similarity index 98% rename from src/multimedia/qtmedianamespace.h rename to src/multimedia/qmultimedia.h index e7fdfb64..336c4184 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qmultimedia.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTMEDIANAMESPACE_H -#define QTMEDIANAMESPACE_H +#ifndef QMULTIMEDIA_H +#define QMULTIMEDIA_H #include #include diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 3f9bae3a..6cd3e558 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -47,7 +47,7 @@ #include #include #include -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 56ef888e..1f27b6f3 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -42,7 +42,7 @@ #ifndef QMEDIARECORDER_H #define QMEDIARECORDER_H -#include +#include #include #include #include diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index 9315605e..59edc322 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -43,7 +43,7 @@ #define QABSTRACTVIDEOBUFFER_H #include -#include +#include #include diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index b06847a4..5b355ff1 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -57,7 +57,7 @@ #include "qabstractvideobuffer.h" #include -#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm index 3a7e860e..7e7d88fb 100644 --- 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 +#include #import diff --git a/sync.profile b/sync.profile index 477fe1dd..5c92f265 100644 --- a/sync.profile +++ b/sync.profile @@ -8,7 +8,8 @@ ); %classnames = ( - "qmediametadata.h" => "QMediaMetaData" + "qmediametadata.h" => "QMediaMetaData", + "qmultimedia.h" => "QMultimedia" ); # Module dependencies.