Fix namespace issues

Pick-to: 6.5
Change-Id: I117eed1ccb6886349eb21185a5c7fefb03bbc561
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>

10 files changed, 32 insertions, 15 deletions

diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_uwp.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_uwp.cpp
index d2d886a88..7f2a59200 100644
--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_uwp.cpp
+++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_uwp.cpp
@@ -44,14 +44,14 @@ auto wait_for(Async const& async, Windows::Foundation::TimeSpan const& timeout);
 
 Q_LOGGING_CATEGORY(qLcScreenCaptureUwp, "qt.multimedia.ffmpeg.screencapture.uwp")
 
-QT_BEGIN_NAMESPACE
-
 namespace winrt {
     using namespace winrt::Windows::Graphics::Capture;
     using namespace winrt::Windows::Graphics::DirectX;
     using namespace winrt::Windows::Graphics::DirectX::Direct3D11;
 }
 
+QT_BEGIN_NAMESPACE
+
 using namespace Windows::Graphics::DirectX::Direct3D11;
 using namespace std::chrono;
 using namespace QWindowsMultimediaUtils;
diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
index a5fb6b7c2..41957f448 100644
--- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
+++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol_p.h
@@ -21,7 +21,7 @@
 #include <private/qwindowsiupointer_p.h>
 #include <private/qwindowsresampler_p.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class MFAudioDecoderControl : public QPlatformAudioDecoder
 {
@@ -70,4 +70,6 @@ private:
     bool                    m_deferredStart = false;
 };
 
+QT_END_NAMESPACE
+
 #endif//MFAUDIODECODERCONTROL_H
diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
index ac60e8c29..7603865c3 100644
--- a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
+++ b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h
@@ -20,7 +20,7 @@
 
 #include <QtCore/qcoreevent.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class MFPlayerSession;
 
@@ -98,4 +98,6 @@ private:
     MFPlayerSession *m_session;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
index 2084a168a..14d811a63 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
@@ -36,6 +36,7 @@
 
 //#define DEBUG_MEDIAFOUNDATION
 
+QT_BEGIN_NAMESPACE
 
 MFPlayerSession::MFPlayerSession(MFPlayerControl *playerControl)
     : m_cRef(1)
@@ -2042,4 +2043,6 @@ QMediaMetaData MFPlayerSession::trackMetaData(QPlatformMediaPlayer::TrackType ty
     return m_trackInfo[type].metaData.at(trackNumber);
 }
 
+QT_END_NAMESPACE
+
 #include "moc_mfplayersession_p.cpp"
diff --git a/src/plugins/multimedia/windows/player/mfplayersession_p.h b/src/plugins/multimedia/windows/player/mfplayersession_p.h
index 434431e34..ddc2b77ba 100644
--- a/src/plugins/multimedia/windows/player/mfplayersession_p.h
+++ b/src/plugins/multimedia/windows/player/mfplayersession_p.h
@@ -32,10 +32,8 @@
 #include "mfplayercontrol_p.h"
 
 QT_BEGIN_NAMESPACE
-class QUrl;
-QT_END_NAMESPACE
 
-QT_USE_NAMESPACE
+class QUrl;
 
 class SourceResolver;
 class MFVideoRendererControl;
@@ -242,5 +240,6 @@ private:
     qint64 m_lastPosition = -1;
 };
 
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/multimedia/windows/player/mftvideo_p.h b/src/plugins/multimedia/windows/player/mftvideo_p.h
index fa7afccad..c47d96fc6 100644
--- a/src/plugins/multimedia/windows/player/mftvideo_p.h
+++ b/src/plugins/multimedia/windows/player/mftvideo_p.h
@@ -21,13 +21,12 @@
 #include <QtCore/qmutex.h>
 #include <QtMultimedia/qvideoframeformat.h>
 
-QT_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class MFVideoProbeControl;
 
-QT_BEGIN_NAMESPACE
 class QVideoFrame;
-QT_END_NAMESPACE
 
 class MFTransform: public IMFTransform
 {
@@ -92,4 +91,6 @@ private:
     int m_bytesPerLine;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
index 0dd094460..1bb1aeba7 100644
--- a/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
+++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol.cpp
@@ -22,6 +22,8 @@
 //#define DEBUG_MEDIAFOUNDATION
 #define PAD_TO_DWORD(x)  (((x) + 3) & ~3)
 
+QT_BEGIN_NAMESPACE
+
 namespace
 {
     class MediaSampleVideoBuffer : public QAbstractVideoBuffer
@@ -2279,5 +2281,7 @@ void EVRCustomPresenterActivate::setCropRect(QRect cropRect)
         m_presenter->setCropRect(cropRect);
 }
 
+QT_END_NAMESPACE
+
 #include "moc_mfvideorenderercontrol_p.cpp"
 #include "mfvideorenderercontrol.moc"
diff --git a/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h b/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h
index 588768eee..09b7acc2d 100644
--- a/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h
+++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h
@@ -20,13 +20,9 @@
 #include <mfapi.h>
 #include <mfidl.h>
 
-QT_USE_NAMESPACE
-
-class EVRCustomPresenterActivate;
-
 QT_BEGIN_NAMESPACE
+class EVRCustomPresenterActivate;
 class QVideoSink;
-QT_END_NAMESPACE
 
 class MFVideoRendererControl : public QObject
 {
@@ -59,4 +55,6 @@ private:
     EVRCustomPresenterActivate *m_presenterActivate = nullptr;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/multimedia/windows/player/samplegrabber_p.h b/src/plugins/multimedia/windows/player/samplegrabber_p.h
index 58296ee24..5bb4b3c7e 100644
--- a/src/plugins/multimedia/windows/player/samplegrabber_p.h
+++ b/src/plugins/multimedia/windows/player/samplegrabber_p.h
@@ -21,6 +21,8 @@
 #include <mfapi.h>
 #include <mfidl.h>
 
+QT_BEGIN_NAMESPACE
+
 class SampleGrabberCallback : public IMFSampleGrabberSinkCallback
 {
 public:
@@ -64,4 +66,6 @@ private:
     QAudioFormat m_format;
 };
 
+QT_END_NAMESPACE
+
 #endif // SAMPLEGRABBER_H
diff --git a/src/plugins/multimedia/windows/sourceresolver_p.h b/src/plugins/multimedia/windows/sourceresolver_p.h
index 86bb9ecb7..57ac6fc9d 100644
--- a/src/plugins/multimedia/windows/sourceresolver_p.h
+++ b/src/plugins/multimedia/windows/sourceresolver_p.h
@@ -18,6 +18,8 @@
 #include "mfstream_p.h"
 #include <QUrl>
 
+QT_BEGIN_NAMESPACE
+
 class SourceResolver: public QObject, public IMFAsyncCallback
 {
     Q_OBJECT
@@ -76,4 +78,6 @@ private:
     QMutex            m_mutex;
 };
 
+QT_END_NAMESPACE
+
 #endif