Cleanup include files.

5 files changed, 50 insertions, 17 deletions

diff --git a/src/multimedia/qml/qsoundeffect_p.h b/src/multimedia/qml/qsoundeffect_p.h
index 00bf64b..6d5790d 100644
--- a/src/multimedia/qml/qsoundeffect_p.h
+++ b/src/multimedia/qml/qsoundeffect_p.h
@@ -56,7 +56,12 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
-#include <qml.h>
+#include <QtDeclarative/qml.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QSoundEffectPrivate;
 class QSoundEffect : public QObject
@@ -111,6 +116,11 @@ private:
     QSoundEffectPrivate* d;
 };
 
-QML_DECLARE_TYPE(QSoundEffect)
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QSoundEffect))
+
+QT_END_HEADER
+
 
 #endif // QSOUNDEFFECT_H
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.h b/src/multimedia/qml/qsoundeffect_pulse_p.h
index 7e857d2..155d7fc 100644
--- a/src/multimedia/qml/qsoundeffect_pulse_p.h
+++ b/src/multimedia/qml/qsoundeffect_pulse_p.h
@@ -54,17 +54,17 @@
 //
 
 
-#include <QtCore/qobject.h>
-
-#include <QTime>
-
-#include <qmediaplayer.h>
-
 #include "qsoundeffect_p.h"
 
+#include <QtCore/qobject.h>
+#include <QtCore/qtime.h>
+#include <QtMultimedia/qmediaplayer.h>
 #include <pulse/pulseaudio.h>
 
-QTM_USE_NAMESPACE
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
 class QNetworkAccessManager;
@@ -131,4 +131,8 @@ private:
     QNetworkAccessManager *m_networkAccessManager;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QSOUNDEFFECT_PULSE_H
diff --git a/src/multimedia/qml/qsoundeffect_qmedia_p.h b/src/multimedia/qml/qsoundeffect_qmedia_p.h
index d04c0d6..e17d720 100644
--- a/src/multimedia/qml/qsoundeffect_qmedia_p.h
+++ b/src/multimedia/qml/qsoundeffect_qmedia_p.h
@@ -56,13 +56,13 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
+#include <QtMultimedia/qmediaplayer.h>
+#include "qsoundeffect_p.h"
 
-#include <qmediaplayer.h>
-#include <qmobilityglobal.h>
 
-#include "qsoundeffect_p.h"
+QT_BEGIN_HEADER
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class WaveDecoder;
 
@@ -102,4 +102,8 @@ private:
     QMediaPlayer *m_player;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QSOUNDEFFECT_QMEDIA_H
diff --git a/src/multimedia/qml/qsoundeffect_qsound_p.h b/src/multimedia/qml/qsoundeffect_qsound_p.h
index 991da22..45c0888 100644
--- a/src/multimedia/qml/qsoundeffect_qsound_p.h
+++ b/src/multimedia/qml/qsoundeffect_qsound_p.h
@@ -56,13 +56,14 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qdatetime.h>
-
-#include <qmediaplayer.h>
+#include <QtMultimedia/qmediaplayer.h>
 
 #include "qsoundeffect_p.h"
 
 
-QTM_USE_NAMESPACE
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
 
 class QTimer;
 class QSound;
@@ -121,4 +122,8 @@ private:
     QTimer *m_timer;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // QSOUNDEFFECT_QSOUND_H
diff --git a/src/multimedia/qml/wavedecoder_p.h b/src/multimedia/qml/wavedecoder_p.h
index 70b485c..3bcd90d 100644
--- a/src/multimedia/qml/wavedecoder_p.h
+++ b/src/multimedia/qml/wavedecoder_p.h
@@ -45,9 +45,15 @@
 #include <QtCore/qiodevice.h>
 #include <QtMultimedia/qaudioformat.h>
 
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+
 class WaveDecoder : public QIODevice
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     explicit WaveDecoder(QIODevice *source, QObject *parent = 0);
@@ -110,4 +116,8 @@ private:
     CombinedHeader header;
 };
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif // WAVEDECODER_H