13 files changed, 48 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
index f155770..d903f81 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
@@ -52,6 +52,8 @@
 
 #include "qaudiodeviceinfo_alsa_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QAudioDeviceInfoPrivate::QAudioDeviceInfoPrivate(QByteArray dev, QAudio::Mode mode)
 {
     handle = 0;
@@ -391,4 +393,4 @@ QByteArray QAudioDeviceInfoPrivate::defaultOutputDevice()
     return QByteArray("default");
 }
 
-
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
index ca8179f..5f17b71 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
@@ -65,6 +65,8 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudioengine.h>
 
+QT_BEGIN_NAMESPACE
+
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] =
     { 8000, 11025, 22050, 44100, 48000 };
@@ -109,5 +111,7 @@ private:
     snd_pcm_hw_params_t *params;
 };
 
+QT_END_NAMESPACE
+
 #endif
 
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 58e7f8b..21b0e9c 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -55,6 +55,8 @@
 #include <mmsystem.h>
 #include "qaudiodeviceinfo_win32_p.h"
 
+QT_BEGIN_NAMESPACE
+
 // For mingw toolchain mmsystem.h only defines half the defines, so add if needed.
 #ifndef WAVE_FORMAT_44M08
 #define WAVE_FORMAT_44M08 0x00000100
@@ -376,3 +378,4 @@ QByteArray QAudioDeviceInfoPrivate::defaultInputDevice()
     return QByteArray("default");
 }
 
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
index 9e0d1ea..f5f575b 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
@@ -63,6 +63,8 @@
 #include <QtMultimedia/qaudioengine.h>
 
 
+QT_BEGIN_NAMESPACE
+
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
 
@@ -105,4 +107,6 @@ private:
     QList<QAudioFormat::SampleType> typez;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
index 595c9df..0b3d337 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
@@ -53,6 +53,8 @@
 #include <QtCore/qcoreapplication.h>
 #include "qaudioinput_alsa_p.h"
 
+QT_BEGIN_NAMESPACE
+
 //#define DEBUG_AUDIO 1
 
 QAudioInputPrivate::QAudioInputPrivate(const QByteArray &device, const QAudioFormat& audioFormat):
@@ -686,3 +688,4 @@ void InputPrivate::trigger()
     emit readyRead();
 }
 
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.h b/src/multimedia/audio/qaudioinput_alsa_p.h
index 3f7c85e..400157e 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
@@ -67,6 +67,8 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudioengine.h>
 
+QT_BEGIN_NAMESPACE
+
 class InputPrivate;
 
 class QAudioInputPrivate : public QAbstractAudioInput
@@ -148,4 +150,6 @@ private:
     QAudioInputPrivate *audioDevice;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 6da80ee..fd6984f 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -53,6 +53,8 @@
 
 #include "qaudioinput_win32_p.h"
 
+QT_BEGIN_NAMESPACE
+
 //#define DEBUG_AUDIO 1
 
 static CRITICAL_SECTION waveInCriticalSection;
@@ -539,3 +541,4 @@ void InputPrivate::trigger()
     emit readyRead();
 }
 
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h
index 7f7b823..f14ce96 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
@@ -68,6 +68,8 @@
 #include <QtMultimedia/qaudioengine.h>
 
 
+QT_BEGIN_NAMESPACE
+
 class QAudioInputPrivate : public QAbstractAudioInput
 {
     Q_OBJECT
@@ -149,4 +151,6 @@ private:
     QAudioInputPrivate *audioDevice;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 5997d31..a5ac177 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -53,6 +53,8 @@
 #include <QtCore/qcoreapplication.h>
 #include "qaudiooutput_alsa_p.h"
 
+QT_BEGIN_NAMESPACE
+
 //#define DEBUG_AUDIO 1
 
 QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat):
@@ -704,3 +706,5 @@ qint64 OutputPrivate::writeData(const char* data, qint64 len)
     return written;
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.h b/src/multimedia/audio/qaudiooutput_alsa_p.h
index 295927b..068428d 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -66,6 +66,8 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudioengine.h>
 
+QT_BEGIN_NAMESPACE
+
 class OutputPrivate;
 
 class QAudioOutputPrivate : public QAbstractAudioOutput
@@ -156,4 +158,6 @@ private:
     QAudioOutputPrivate *audioDevice;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index bace4a6..99229df 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -54,6 +54,8 @@
 
 //#define DEBUG_AUDIO 1
 
+QT_BEGIN_NAMESPACE
+
 static CRITICAL_SECTION waveOutCriticalSection;
 
 QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat):
@@ -502,3 +504,5 @@ qint64 OutputPrivate::writeData(const char* data, qint64 len)
     }
     return written;
 }
+
+QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h
index c6c025f..3906d9d 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -67,6 +67,8 @@
 #include <QtMultimedia/qaudioengine.h>
 
 
+QT_BEGIN_NAMESPACE
+
 class QAudioOutputPrivate : public QAbstractAudioOutput
 {
     Q_OBJECT
@@ -149,4 +151,6 @@ private:
     QAudioOutputPrivate *audioDevice;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp
index d63f145..6af0c41 100644
--- a/src/multimedia/video/qimagevideobuffer.cpp
+++ b/src/multimedia/video/qimagevideobuffer.cpp
@@ -46,6 +46,8 @@
 #include <qimage.h>
 #include <qvariant.h>
 
+QT_BEGIN_NAMESPACE
+
 class QImageVideoBufferPrivate : public QAbstractVideoBufferPrivate
 {
 public:
@@ -100,3 +102,5 @@ void QImageVideoBuffer::unmap()
 
     d->mapMode = NotMapped;
 }
+
+QT_END_NAMESPACE