summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-01-06 13:18:39 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-01-06 15:22:24 (GMT)
commitbd01114b3fcf2cc702fdd9e303a15bcc900cfe95 (patch)
tree78cb0bc89f296975fb1f83ec3456824dc9576efe
parent70496884450d3989829a63baac8db48d36190a25 (diff)
downloadQt-bd01114b3fcf2cc702fdd9e303a15bcc900cfe95.zip
Qt-bd01114b3fcf2cc702fdd9e303a15bcc900cfe95.tar.gz
Qt-bd01114b3fcf2cc702fdd9e303a15bcc900cfe95.tar.bz2
Use the lowercase/shortname.h headers for Phonon includes
Task-number: QTBUG-4685 Reviewed-by: TrustMe
-rw-r--r--demos/qmediaplayer/mediaplayer.h18
-rw-r--r--examples/phonon/capabilities/window.h16
-rw-r--r--examples/phonon/qmusicplayer/mainwindow.h10
-rw-r--r--tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h4
4 files changed, 24 insertions, 24 deletions
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h
index 8c80f44..890b597 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 0a5b022..a0da461 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 0e70fe7..48f3a59 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 e22a630..8ed614e 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