7 files changed, 27 insertions, 11 deletions
diff --git a/src/plugins/common/evr/evrcustompresenter.cpp b/src/plugins/common/evr/evrcustompresenter.cpp
index 7a26afd10..38e8c3a8f 100644
--- a/src/plugins/common/evr/evrcustompresenter.cpp
+++ b/src/plugins/common/evr/evrcustompresenter.cpp
@@ -53,6 +53,8 @@
 #include <float.h>
 #include <evcode.h>
 
+QT_BEGIN_NAMESPACE
+
 const static MFRatio g_DefaultFrameRate = { 30, 1 };
 static const DWORD SCHEDULER_TIMEOUT = 5000;
 static const MFTIME ONE_SECOND = 10000000;
@@ -2044,3 +2046,5 @@ static QVideoFrame::PixelFormat pixelFormatFromMediaType(IMFMediaType *type)
 
     return QVideoFrame::Format_Invalid;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/common/evr/evrcustompresenter.h b/src/plugins/common/evr/evrcustompresenter.h
index 67ae61991..5c240ea95 100644
--- a/src/plugins/common/evr/evrcustompresenter.h
+++ b/src/plugins/common/evr/evrcustompresenter.h
@@ -49,14 +49,12 @@
 #include "evrdefs.h"
 
 QT_BEGIN_NAMESPACE
-class QAbstractVideoSurface;
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
 
 class EVRCustomPresenter;
 class D3DPresentEngine;
 
+class QAbstractVideoSurface;
+
 template<class T>
 class AsyncCallback : public IMFAsyncCallback
 {
@@ -375,4 +373,6 @@ private:
 
 bool qt_evr_setCustomPresenter(IUnknown *evr, EVRCustomPresenter *presenter);
 
+QT_END_NAMESPACE
+
 #endif // EVRCUSTOMPRESENTER_H
diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp
index ae3d69fc2..4bc2bac83 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.cpp
+++ b/src/plugins/common/evr/evrd3dpresentengine.cpp
@@ -57,6 +57,8 @@
 
 static const int PRESENTER_BUFFER_COUNT = 3;
 
+QT_BEGIN_NAMESPACE
+
 #ifdef MAYBE_ANGLE
 
 EGLWrapper::EGLWrapper()
@@ -642,3 +644,5 @@ done:
 }
 
 #endif // MAYBE_ANGLE
+
+QT_END_NAMESPACE
diff --git a/src/plugins/common/evr/evrd3dpresentengine.h b/src/plugins/common/evr/evrd3dpresentengine.h
index d181689ec..18a7409fa 100644
--- a/src/plugins/common/evr/evrd3dpresentengine.h
+++ b/src/plugins/common/evr/evrd3dpresentengine.h
@@ -50,10 +50,6 @@
 # define MAYBE_ANGLE
 #endif
 
-QT_BEGIN_NAMESPACE
-class QAbstractVideoSurface;
-QT_END_NAMESPACE
-
 struct IDirect3D9Ex;
 struct IDirect3DDevice9Ex;
 struct IDirect3DDeviceManager9;
@@ -66,7 +62,9 @@ struct IMFMediaType;
 static const GUID MFSamplePresenter_SampleCounter =
 { 0xb0bb83cc, 0xf10f, 0x4e2e, { 0xaa, 0x2b, 0x29, 0xea, 0x5e, 0x92, 0xef, 0x85 } };
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+
+class QAbstractVideoSurface;
 
 #ifdef MAYBE_ANGLE
 
@@ -153,4 +151,6 @@ private:
     friend class IMFSampleVideoBuffer;
 };
 
+QT_END_NAMESPACE
+
 #endif // EVRD3DPRESENTENGINE_H
diff --git a/src/plugins/common/evr/evrhelpers.cpp b/src/plugins/common/evr/evrhelpers.cpp
index 2e9d4fae6..f4710b1a0 100644
--- a/src/plugins/common/evr/evrhelpers.cpp
+++ b/src/plugins/common/evr/evrhelpers.cpp
@@ -46,6 +46,8 @@
 #define D3DFMT_NV12 (D3DFORMAT)MAKEFOURCC ('N', 'V', '1', '2')
 #endif
 
+QT_BEGIN_NAMESPACE
+
 HRESULT qt_evr_getFourCC(IMFMediaType *type, DWORD *fourCC)
 {
     if (!fourCC)
@@ -180,3 +182,5 @@ D3DFORMAT qt_evr_D3DFormatFromPixelFormat(QVideoFrame::PixelFormat format)
         return D3DFMT_UNKNOWN;
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/common/evr/evrhelpers.h b/src/plugins/common/evr/evrhelpers.h
index 54ab8b848..d2fdfdcae 100644
--- a/src/plugins/common/evr/evrhelpers.h
+++ b/src/plugins/common/evr/evrhelpers.h
@@ -43,7 +43,7 @@
 #include "evrdefs.h"
 #include <qvideoframe.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 template<class T>
 static inline void qt_evr_safe_release(T **unk)
@@ -93,5 +93,7 @@ inline HRESULT qt_evr_getFrameRate(IMFMediaType *pType, MFRatio *pRatio)
 QVideoFrame::PixelFormat qt_evr_pixelFormatFromD3DFormat(D3DFORMAT format);
 D3DFORMAT qt_evr_D3DFormatFromPixelFormat(QVideoFrame::PixelFormat format);
 
+QT_END_NAMESPACE
+
 #endif // EVRHELPERS_H
 
diff --git a/src/plugins/common/evr/evrvideowindowcontrol.h b/src/plugins/common/evr/evrvideowindowcontrol.h
index 7994b1b5e..fcfe20958 100644
--- a/src/plugins/common/evr/evrvideowindowcontrol.h
+++ b/src/plugins/common/evr/evrvideowindowcontrol.h
@@ -44,7 +44,7 @@
 
 #include "evrdefs.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class EvrVideoWindowControl : public QVideoWindowControl
 {
@@ -104,4 +104,6 @@ private:
     IMFVideoProcessor *m_processor;
 };
 
+QT_END_NAMESPACE
+
 #endif