diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-06 13:18:39 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 09:33:41 (GMT) |
| commit | 76d6c14a5c39b72cb4569bc71f4acb929a0eed79 (patch) | |
| tree | dfcd2fb02b66503803db7b517d322918571fd8ec | |
| parent | d1ece2b76abf64b7dff250551c5aeb3bbf5803e3 (diff) | |
| download | Qt-76d6c14a5c39b72cb4569bc71f4acb929a0eed79.zip Qt-76d6c14a5c39b72cb4569bc71f4acb929a0eed79.tar.gz Qt-76d6c14a5c39b72cb4569bc71f4acb929a0eed79.tar.bz2 | |
Use the lowercase/shortname.h headers for Phonon includes
Task-number: QTBUG-4685
Reviewed-by: TrustMe
(cherry picked from commit bd01114b3fcf2cc702fdd9e303a15bcc900cfe95)
| -rw-r--r-- | demos/qmediaplayer/mediaplayer.h | 18 | ||||
| -rw-r--r-- | examples/phonon/capabilities/window.h | 16 | ||||
| -rw-r--r-- | examples/phonon/qmusicplayer/mainwindow.h | 10 | ||||
| -rw-r--r-- | tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h | 4 |
4 files changed, 24 insertions, 24 deletions
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h index 32cabf4..c663399 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h @@ -50,15 +50,15 @@ #include <QtCore/QBasicTimer> #include <QtGui/QAction> -#include <Phonon/AudioOutput> -#include <Phonon/BackendCapabilities> -#include <Phonon/Effect> -#include <Phonon/EffectParameter> -#include <Phonon/EffectWidget> -#include <Phonon/MediaObject> -#include <Phonon/SeekSlider> -#include <Phonon/VideoWidget> -#include <Phonon/VolumeSlider> +#include <phonon/audiooutput.h> +#include <phonon/backendcapabilities.h> +#include <phonon/effect.h> +#include <phonon/effectparameter.h> +#include <phonon/effectwidget.h> +#include <phonon/mediaobject.h> +#include <phonon/seekslider.h> +#include <phonon/videowidget.h> +#include <phonon/volumeslider.h> QT_BEGIN_NAMESPACE class QPushButton; diff --git a/examples/phonon/capabilities/window.h b/examples/phonon/capabilities/window.h index 04f1e59..3890f13 100644 --- a/examples/phonon/capabilities/window.h +++ b/examples/phonon/capabilities/window.h @@ -44,14 +44,14 @@ #include <QWidget> -#include <Phonon/AudioOutput> -#include <Phonon/SeekSlider> -#include <Phonon/MediaObject> -#include <Phonon/VolumeSlider> -#include <Phonon/BackendCapabilities> -#include <Phonon/Effect> -#include <Phonon/EffectParameter> -#include <Phonon/ObjectDescriptionModel> +#include <phonon/audiooutput.h> +#include <phonon/seekslider.h> +#include <phonon/mediaobject.h> +#include <phonon/volumeslider.h> +#include <phonon/backendcapabilities.h> +#include <phonon/effect.h> +#include <phonon/effectparameter.h> +#include <phonon/objectdescriptionmodel.h> #include <QList> QT_BEGIN_NAMESPACE diff --git a/examples/phonon/qmusicplayer/mainwindow.h b/examples/phonon/qmusicplayer/mainwindow.h index 6fbdca3..813747a 100644 --- a/examples/phonon/qmusicplayer/mainwindow.h +++ b/examples/phonon/qmusicplayer/mainwindow.h @@ -43,11 +43,11 @@ #define MAINWINDOW_H #include <QMainWindow> -#include <Phonon/AudioOutput> -#include <Phonon/SeekSlider> -#include <Phonon/MediaObject> -#include <Phonon/VolumeSlider> -#include <Phonon/BackendCapabilities> +#include <phonon/audiooutput.h> +#include <phonon/seekslider.h> +#include <phonon/mediaobject.h> +#include <phonon/volumeslider.h> +#include <phonon/backendcapabilities.h> #include <QList> QT_BEGIN_NAMESPACE diff --git a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h index 5713cde..daf906e 100644 --- a/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h +++ b/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h @@ -47,8 +47,8 @@ #include <QtDesigner/QDesignerTaskMenuExtension> #include <QtDesigner/private/extensionfactory_p.h> -#include <Phonon/BackendCapabilities> -#include <Phonon/VideoPlayer> +#include <phonon/backendcapabilities.h> +#include <phonon/videoplayer.h> QT_BEGIN_NAMESPACE |