diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-21 15:37:59 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-26 10:32:06 +0000 |
commit | f97d5eaaa539e2569f3ca3b8eef6649827b07bc1 (patch) | |
tree | 7eba6cb287af03a883a3d859188d76408f7d298b /src/plugins/directshow/player | |
parent | 56185dedd2a075e5b7e72c18e766a60b890c14a1 (diff) | |
download | qtmultimedia-f97d5eaaa539e2569f3ca3b8eef6649827b07bc1.tar.gz |
DirectShow: Fix namespaced build with MinGW
Remove QT_USE_NAMESPACE from headers and enclose headers/sources in
QT_BEGIN/END_NAMESPACE. Fixes MinGW build error:
qtbase/src/corelib/global/qtypeinfo.h:246:7: error: specialization of 'template<class T> class tn::QTypeInfo' in different namespace [-fpermissive]
class QTypeInfo<TYPE > \
^
qtbase/src/corelib/global/qtypeinfo.h:265:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO_BODY'
Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS)
^
helpers\directshowmediatype.h:92:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO'
Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE);
^
qtbase/src/corelib/global/qtypeinfo.h:57:7: error: from definition of 'template<class T> class tn::QTypeInfo' [-fpermissive]
class QTypeInfo
^
Task-number: QTBUG-60118
Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/directshow/player')
15 files changed, 52 insertions, 16 deletions
diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp index f4e75f4e2..78733972a 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.cpp @@ -42,6 +42,8 @@ #include "directshowglobal.h" #include "directshowplayerservice.h" +QT_BEGIN_NAMESPACE + DirectShowAudioEndpointControl::DirectShowAudioEndpointControl( DirectShowPlayerService *service, QObject *parent) : QAudioOutputSelectorControl(parent) @@ -157,3 +159,5 @@ void DirectShowAudioEndpointControl::updateEndpoints() oleMalloc->Release(); } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/player/directshowaudioendpointcontrol.h b/src/plugins/directshow/player/directshowaudioendpointcontrol.h index 2d1763ea3..e0e6a1545 100644 --- a/src/plugins/directshow/player/directshowaudioendpointcontrol.h +++ b/src/plugins/directshow/player/directshowaudioendpointcontrol.h @@ -44,9 +44,9 @@ #include <dshow.h> -class DirectShowPlayerService; +QT_BEGIN_NAMESPACE -QT_USE_NAMESPACE +class DirectShowPlayerService; class DirectShowAudioEndpointControl : public QAudioOutputSelectorControl { @@ -76,5 +76,7 @@ private: QString m_activeEndpoint; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/directshowevrvideowindowcontrol.h b/src/plugins/directshow/player/directshowevrvideowindowcontrol.h index 5aa304bca..fb661780f 100644 --- a/src/plugins/directshow/player/directshowevrvideowindowcontrol.h +++ b/src/plugins/directshow/player/directshowevrvideowindowcontrol.h @@ -44,7 +44,7 @@ struct IBaseFilter; -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowEvrVideoWindowControl : public EvrVideoWindowControl { @@ -58,4 +58,6 @@ private: IBaseFilter *m_evrFilter; }; +QT_END_NAMESPACE + #endif // DIRECTSHOWEVRVIDEOWINDOWCONTROL_H diff --git a/src/plugins/directshow/player/directshowioreader.cpp b/src/plugins/directshow/player/directshowioreader.cpp index a35124b1e..7f3303633 100644 --- a/src/plugins/directshow/player/directshowioreader.cpp +++ b/src/plugins/directshow/player/directshowioreader.cpp @@ -48,6 +48,8 @@ #include <QtCore/qiodevice.h> #include <QtCore/qthread.h> +QT_BEGIN_NAMESPACE + class DirectShowSampleRequest { public: @@ -492,3 +494,5 @@ void DirectShowIOReader::flushRequests() m_readyHead = m_readyTail; } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/player/directshowioreader.h b/src/plugins/directshow/player/directshowioreader.h index deb5d5327..2d62c0b95 100644 --- a/src/plugins/directshow/player/directshowioreader.h +++ b/src/plugins/directshow/player/directshowioreader.h @@ -48,7 +48,6 @@ QT_BEGIN_NAMESPACE class QIODevice; -QT_END_NAMESPACE class DirectShowEventLoop; class DirectShowIOSource; @@ -115,4 +114,6 @@ private: QWaitCondition m_wait; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp index 96b4b14bf..b3aa3fab9 100644 --- a/src/plugins/directshow/player/directshowiosource.cpp +++ b/src/plugins/directshow/player/directshowiosource.cpp @@ -47,6 +47,8 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qurl.h> +QT_BEGIN_NAMESPACE + static const GUID directshow_subtypes[] = { MEDIASUBTYPE_NULL, @@ -581,3 +583,5 @@ HRESULT DirectShowIOSource::QueryDirection(PIN_DIRECTION *pPinDir) return S_OK; } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/player/directshowiosource.h b/src/plugins/directshow/player/directshowiosource.h index 702bfed61..43df6c34f 100644 --- a/src/plugins/directshow/player/directshowiosource.h +++ b/src/plugins/directshow/player/directshowiosource.h @@ -46,6 +46,8 @@ #include <QtCore/qfile.h> +QT_BEGIN_NAMESPACE + class DirectShowIOSource : public IBaseFilter , public IAMFilterMiscFlags @@ -131,4 +133,6 @@ private: QMutex m_mutex; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.h b/src/plugins/directshow/player/directshowmetadatacontrol.h index b42b48c67..3d2fa5e8e 100644 --- a/src/plugins/directshow/player/directshowmetadatacontrol.h +++ b/src/plugins/directshow/player/directshowmetadatacontrol.h @@ -48,9 +48,7 @@ #include <QtCore/qcoreevent.h> -class DirectShowPlayerService; - -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowMetaDataControl : public QMetaDataReaderControl { @@ -83,4 +81,6 @@ private: bool m_available; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/directshowplayercontrol.h b/src/plugins/directshow/player/directshowplayercontrol.h index 184951544..fd2c21c38 100644 --- a/src/plugins/directshow/player/directshowplayercontrol.h +++ b/src/plugins/directshow/player/directshowplayercontrol.h @@ -49,7 +49,7 @@ #include "directshowplayerservice.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowPlayerControl : public QMediaPlayerControl { @@ -148,4 +148,6 @@ private: }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp index 5fbb6ef05..4a75c9551 100644 --- a/src/plugins/directshow/player/directshowplayerservice.cpp +++ b/src/plugins/directshow/player/directshowplayerservice.cpp @@ -77,6 +77,8 @@ # include <comdef.h> #endif +QT_BEGIN_NAMESPACE + Q_GLOBAL_STATIC(DirectShowEventLoop, qt_directShowEventLoop) static QString comError(HRESULT hr) @@ -1454,3 +1456,5 @@ void DirectShowPlayerService::run() m_executingTask = 0; } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h index d933bd660..dc0226001 100644 --- a/src/plugins/directshow/player/directshowplayerservice.h +++ b/src/plugins/directshow/player/directshowplayerservice.h @@ -55,17 +55,15 @@ #include <QtCore/qurl.h> #include <QtCore/qwaitcondition.h> +QT_BEGIN_NAMESPACE + class DirectShowAudioEndpointControl; class DirectShowMetaDataControl; class DirectShowPlayerControl; class DirectShowVideoRendererControl; -QT_BEGIN_NAMESPACE class QMediaContent; class QVideoWindowControl; -QT_END_NAMESPACE - -QT_USE_NAMESPACE class DirectShowPlayerService : public QMediaService { @@ -213,5 +211,6 @@ private: friend class DirectShowPlayerServiceThread; }; +QT_END_NAMESPACE #endif diff --git a/src/plugins/directshow/player/directshowvideorenderercontrol.h b/src/plugins/directshow/player/directshowvideorenderercontrol.h index 36c5b2248..ce515a329 100644 --- a/src/plugins/directshow/player/directshowvideorenderercontrol.h +++ b/src/plugins/directshow/player/directshowvideorenderercontrol.h @@ -47,13 +47,13 @@ #include <QtMultimedia/private/qtmultimedia-config_p.h> +QT_BEGIN_NAMESPACE + class DirectShowEventLoop; #if QT_CONFIG(evr) class EVRCustomPresenter; #endif -QT_USE_NAMESPACE - class DirectShowVideoRendererControl : public QVideoRendererControl { Q_OBJECT @@ -78,4 +78,6 @@ private: #endif }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp index 13f767a85..656cd5a7c 100644 --- a/src/plugins/directshow/player/videosurfacefilter.cpp +++ b/src/plugins/directshow/player/videosurfacefilter.cpp @@ -49,6 +49,8 @@ #include <initguid.h> +QT_BEGIN_NAMESPACE + Q_LOGGING_CATEGORY(qLcRenderFilter, "qt.multimedia.plugins.directshow.renderfilter") // { e23cad72-153d-406c-bf3f-4c4b523d96f2 } @@ -786,3 +788,5 @@ bool VideoSurfaceFilter::event(QEvent *e) return QObject::event(e); } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/player/videosurfacefilter.h b/src/plugins/directshow/player/videosurfacefilter.h index 6d6cc7593..ad253d564 100644 --- a/src/plugins/directshow/player/videosurfacefilter.h +++ b/src/plugins/directshow/player/videosurfacefilter.h @@ -49,8 +49,8 @@ #include <qwaitcondition.h> QT_BEGIN_NAMESPACE + class QAbstractVideoSurface; -QT_END_NAMESPACE class DirectShowEventLoop; class VideoSurfaceInputPin; @@ -157,4 +157,6 @@ private: friend class VideoSurfaceInputPin; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/player/vmr9videowindowcontrol.h b/src/plugins/directshow/player/vmr9videowindowcontrol.h index 6f6e55362..ed3b53233 100644 --- a/src/plugins/directshow/player/vmr9videowindowcontrol.h +++ b/src/plugins/directshow/player/vmr9videowindowcontrol.h @@ -46,7 +46,7 @@ #include <d3d9.h> #include <vmr9.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class Vmr9VideoWindowControl : public QVideoWindowControl { @@ -103,4 +103,6 @@ private: bool m_fullScreen; }; +QT_END_NAMESPACE + #endif |