diff options
author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-12-19 20:04:59 +0100 |
---|---|---|
committer | Mårten Nordheim <marten.nordheim@qt.io> | 2023-02-01 09:08:21 +0000 |
commit | a1dd5ff5c22b9ef8ae8c3feb844fce122b9de849 (patch) | |
tree | 1bedd71a6a22eb190577a0c80f595a04ebef1d61 | |
parent | c59b96c8b5263f27988537de3d1a987051defa8b (diff) |
Fix namespace issues
Fixes: QTBUG-109504
Change-Id: I117eed1ccb6886349eb21185a5c7fefb03bbc561
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 4088598ca61aef8793d1b255409a58532fb463f9)
9 files changed, 30 insertions, 13 deletions
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 7e2c6f9ec..22e59fcc7 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) @@ -2047,4 +2048,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 325219073..3944ba7b6 100644 --- a/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h +++ b/src/plugins/multimedia/windows/player/mfvideorenderercontrol_p.h @@ -21,13 +21,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 { @@ -60,4 +56,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 |