diff options
Diffstat (limited to 'src/plugins/mediaservices')
5 files changed, 6 insertions, 10 deletions
diff --git a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm index 5507633..d516a99 100644 --- a/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm +++ b/src/plugins/mediaservices/qt7/mediaplayer/qt7playersession.mm @@ -55,9 +55,6 @@ #include <QtCore/qurl.h> #include <QtCore/qdebug.h> - -QT_BEGIN_NAMESPACE - @interface QTMovieObserver : NSObject { @private @@ -149,6 +146,8 @@ QT_BEGIN_NAMESPACE @end +QT_BEGIN_NAMESPACE + static CFStringRef qString2CFStringRef(const QString &string) { return CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar *>(string.unicode()), diff --git a/src/plugins/mediaservices/qt7/qcvdisplaylink.mm b/src/plugins/mediaservices/qt7/qcvdisplaylink.mm index 98ae71d..00b4dc5 100644 --- a/src/plugins/mediaservices/qt7/qcvdisplaylink.mm +++ b/src/plugins/mediaservices/qt7/qcvdisplaylink.mm @@ -44,8 +44,7 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> - -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE static CVReturn CVDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp *inNow, diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.h b/src/plugins/mediaservices/qt7/qt7movievideowidget.h index 3acd373..558c3d7 100644 --- a/src/plugins/mediaservices/qt7/qt7movievideowidget.h +++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.h @@ -57,10 +57,10 @@ QT_BEGIN_HEADER -class GLVideoWidget; QT_BEGIN_NAMESPACE +class GLVideoWidget; class QCvDisplayLink; class QT7PlayerSession; class QT7PlayerService; diff --git a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm index b549487..b90470c 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewoutput.mm @@ -49,8 +49,6 @@ #include <QtCore/qdebug.h> -QT_BEGIN_NAMESPACE - #define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];} @interface TransparentQTMovieView : QTMovieView @@ -308,5 +306,3 @@ void QT7MovieViewOutput::setSaturation(int saturation) { m_saturation = saturation; } - -QT_END_NAMESPACE diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm index 342feb8..7271f5b 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm +++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.mm @@ -99,6 +99,7 @@ private: MapMode m_mode; }; +QT_END_NAMESPACE #define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];} @@ -223,6 +224,7 @@ VIDEO_TRANSPARENT(scrollWheel) @end +QT_BEGIN_NAMESPACE QT7MovieViewRenderer::QT7MovieViewRenderer(QObject *parent) :QT7VideoRendererControl(parent), |