diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2012-11-01 00:42:35 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-06 18:20:09 +0100 |
| commit | 47fe5f9b39575130fa7e5c3e05ec7775bbf81c99 (patch) | |
| tree | b6651cb78569fcf30edd3bc1fc82ea1661302be9 /src/multimedia/audio | |
| parent | 832c3929f2222e0e10ada33549c9d1cf90373018 (diff) | |
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>
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qaudio.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiobuffer.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiobuffer_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodevicefactory_p.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioformat.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiosystem.h | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiosystemplugin.h | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index f03411665..2337da44f 100644 --- 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> diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 652dea73f..ce656243b 100644 --- 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> diff --git a/src/multimedia/audio/qaudiobuffer_p.h b/src/multimedia/audio/qaudiobuffer_p.h index dfdc98061..20265444a 100644 --- 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" diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h index 75e14cd68..40b08aae9 100644 --- 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" diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index d1bbcdeb3..545726fee 100644 --- 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> diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 38076c784..8acc36bd4 100644 --- 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 diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 583eb1892..fbeea840f 100644 --- 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> diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 98bf10628..ac1dac623 100644 --- 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> diff --git a/src/multimedia/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h index 0ad2f6b6a..b68b8f884 100644 --- 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" diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index b07dacc09..743045100 100644 --- 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" |