diff options
Diffstat (limited to 'src/plugins/directshow/helpers')
15 files changed, 52 insertions, 6 deletions
diff --git a/src/plugins/directshow/helpers/directshowbasefilter.cpp b/src/plugins/directshow/helpers/directshowbasefilter.cpp index fbf0f6204..3ca7e205e 100644 --- a/src/plugins/directshow/helpers/directshowbasefilter.cpp +++ b/src/plugins/directshow/helpers/directshowbasefilter.cpp @@ -35,6 +35,8 @@ #include "directshowpinenum.h" +QT_BEGIN_NAMESPACE + DirectShowBaseFilter::DirectShowBaseFilter() : m_mutex(QMutex::Recursive) , m_state(State_Stopped) @@ -265,3 +267,5 @@ HRESULT DirectShowBaseFilter::QueryVendorInfo(LPWSTR *pVendorInfo) Q_UNUSED(pVendorInfo); return E_NOTIMPL; } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowbasefilter.h b/src/plugins/directshow/helpers/directshowbasefilter.h index cc8588044..19c54233c 100644 --- a/src/plugins/directshow/helpers/directshowbasefilter.h +++ b/src/plugins/directshow/helpers/directshowbasefilter.h @@ -36,7 +36,7 @@ #include "directshowpin.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowBaseFilter : public DirectShowObject , public IBaseFilter @@ -90,4 +90,6 @@ private: Q_DISABLE_COPY(DirectShowBaseFilter) }; +QT_END_NAMESPACE + #endif // DIRECTSHOWBASEFILTER_H diff --git a/src/plugins/directshow/helpers/directshoweventloop.cpp b/src/plugins/directshow/helpers/directshoweventloop.cpp index 87f969e42..ef85c0429 100644 --- a/src/plugins/directshow/helpers/directshoweventloop.cpp +++ b/src/plugins/directshow/helpers/directshoweventloop.cpp @@ -42,6 +42,8 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qcoreevent.h> +QT_BEGIN_NAMESPACE + class DirectShowPostedEvent { public: @@ -146,3 +148,5 @@ void DirectShowEventLoop::processEvents() locker.relock(); } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshoweventloop.h b/src/plugins/directshow/helpers/directshoweventloop.h index 09d986de7..609e53134 100644 --- a/src/plugins/directshow/helpers/directshoweventloop.h +++ b/src/plugins/directshow/helpers/directshoweventloop.h @@ -46,6 +46,8 @@ #include <qt_windows.h> +QT_BEGIN_NAMESPACE + class DirectShowPostedEvent; class DirectShowEventLoop : public QObject @@ -73,4 +75,6 @@ private: QMutex m_mutex; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/helpers/directshowmediatype.h b/src/plugins/directshow/helpers/directshowmediatype.h index c590d406a..7f495f3b2 100644 --- a/src/plugins/directshow/helpers/directshowmediatype.h +++ b/src/plugins/directshow/helpers/directshowmediatype.h @@ -47,7 +47,7 @@ #include <dvdmedia.h> #include <QtCore/qglobal.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowMediaType { @@ -92,4 +92,6 @@ private: Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE); +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/helpers/directshowmediatypeenum.h b/src/plugins/directshow/helpers/directshowmediatypeenum.h index 050df0881..c022677cc 100644 --- a/src/plugins/directshow/helpers/directshowmediatypeenum.h +++ b/src/plugins/directshow/helpers/directshowmediatypeenum.h @@ -37,7 +37,7 @@ #include "directshowobject.h" #include <qlist.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowPin; class DirectShowMediaType; @@ -69,4 +69,6 @@ private: int m_index; }; +QT_END_NAMESPACE + #endif // DIRECTSHOWMEDIATYPEENUM_H diff --git a/src/plugins/directshow/helpers/directshowobject.cpp b/src/plugins/directshow/helpers/directshowobject.cpp index b9d989f6e..db1817a8d 100644 --- a/src/plugins/directshow/helpers/directshowobject.cpp +++ b/src/plugins/directshow/helpers/directshowobject.cpp @@ -39,6 +39,8 @@ #include "directshowobject.h" +QT_BEGIN_NAMESPACE + DirectShowObject::DirectShowObject() : m_ref(1) { @@ -81,3 +83,4 @@ HRESULT GetInterface(IUnknown *pUnk, void **ppv) return S_OK; } +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowobject.h b/src/plugins/directshow/helpers/directshowobject.h index 3aba06f46..4a8938635 100644 --- a/src/plugins/directshow/helpers/directshowobject.h +++ b/src/plugins/directshow/helpers/directshowobject.h @@ -36,7 +36,7 @@ #include "directshowglobal.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowObject { @@ -71,4 +71,6 @@ public: \ return unref(); \ }; +QT_END_NAMESPACE + #endif // DIRECTSHOWOBJECT_H diff --git a/src/plugins/directshow/helpers/directshowpin.cpp b/src/plugins/directshow/helpers/directshowpin.cpp index f501747f9..44c6b1520 100644 --- a/src/plugins/directshow/helpers/directshowpin.cpp +++ b/src/plugins/directshow/helpers/directshowpin.cpp @@ -39,6 +39,8 @@ #include <qdebug.h> +QT_BEGIN_NAMESPACE + DirectShowPin::DirectShowPin(DirectShowBaseFilter *filter, const QString &name, PIN_DIRECTION direction) : m_mutex(QMutex::Recursive) , m_filter(filter) @@ -728,3 +730,5 @@ HRESULT DirectShowInputPin::ReceiveCanBlock() return outputPins == 0 ? S_OK : S_FALSE; } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowpin.h b/src/plugins/directshow/helpers/directshowpin.h index b8207abae..d518726b4 100644 --- a/src/plugins/directshow/helpers/directshowpin.h +++ b/src/plugins/directshow/helpers/directshowpin.h @@ -40,7 +40,7 @@ #include <qstring.h> #include <qmutex.h> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowBaseFilter; @@ -181,4 +181,6 @@ private: Q_DISABLE_COPY(DirectShowInputPin) }; +QT_END_NAMESPACE + #endif // DIRECTSHOWPIN_H diff --git a/src/plugins/directshow/helpers/directshowpinenum.cpp b/src/plugins/directshow/helpers/directshowpinenum.cpp index 61aca8b9c..910bba77d 100644 --- a/src/plugins/directshow/helpers/directshowpinenum.cpp +++ b/src/plugins/directshow/helpers/directshowpinenum.cpp @@ -40,6 +40,8 @@ #include "directshowpinenum.h" #include "directshowbasefilter.h" +QT_BEGIN_NAMESPACE + DirectShowPinEnum::DirectShowPinEnum(DirectShowBaseFilter *filter) : m_filter(filter) , m_index(0) @@ -124,3 +126,5 @@ HRESULT DirectShowPinEnum::Clone(IEnumPins **ppEnum) return E_POINTER; } } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowpinenum.h b/src/plugins/directshow/helpers/directshowpinenum.h index 84c2a7579..77214e376 100644 --- a/src/plugins/directshow/helpers/directshowpinenum.h +++ b/src/plugins/directshow/helpers/directshowpinenum.h @@ -45,7 +45,7 @@ #include <QtCore/qlist.h> #include "directshowpin.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class DirectShowBaseFilter; @@ -76,4 +76,6 @@ private: int m_index; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/directshow/helpers/directshowutils.cpp b/src/plugins/directshow/helpers/directshowutils.cpp index d9701fd99..96fabd6da 100644 --- a/src/plugins/directshow/helpers/directshowutils.cpp +++ b/src/plugins/directshow/helpers/directshowutils.cpp @@ -39,6 +39,8 @@ #include "directshowutils.h" +QT_BEGIN_NAMESPACE + /** * @brief DirectShowUtils::isPinConnected * @param pin @@ -307,3 +309,5 @@ bool DirectShowUtils::connectFilters(IGraphBuilder *graph, return SUCCEEDED(*hrOut); } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.cpp b/src/plugins/directshow/helpers/directshowvideobuffer.cpp index 3204e9f7e..7f94da97e 100644 --- a/src/plugins/directshow/helpers/directshowvideobuffer.cpp +++ b/src/plugins/directshow/helpers/directshowvideobuffer.cpp @@ -39,6 +39,8 @@ #include "directshowvideobuffer.h" +QT_BEGIN_NAMESPACE + DirectShowVideoBuffer::DirectShowVideoBuffer(IMediaSample *sample, int bytesPerLine) : QAbstractVideoBuffer(NoHandle) , m_sample(sample) @@ -82,3 +84,5 @@ QAbstractVideoBuffer::MapMode DirectShowVideoBuffer::mapMode() const { return m_mapMode; } + +QT_END_NAMESPACE diff --git a/src/plugins/directshow/helpers/directshowvideobuffer.h b/src/plugins/directshow/helpers/directshowvideobuffer.h index 10089c75a..85e02b53d 100644 --- a/src/plugins/directshow/helpers/directshowvideobuffer.h +++ b/src/plugins/directshow/helpers/directshowvideobuffer.h @@ -44,6 +44,8 @@ #include <qabstractvideobuffer.h> +QT_BEGIN_NAMESPACE + class DirectShowVideoBuffer : public QAbstractVideoBuffer { public: @@ -63,5 +65,6 @@ private: MapMode m_mapMode; }; +QT_END_NAMESPACE #endif |