diff options
11 files changed, 25 insertions, 12 deletions
diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp index 9c56a06de..5910372e1 100644 --- a/src/gsttools/qgstreamervideowidget.cpp +++ b/src/gsttools/qgstreamervideowidget.cpp @@ -54,6 +54,8 @@ #include <gst/interfaces/xoverlay.h> #include <gst/interfaces/propertyprobe.h> +QT_BEGIN_NAMESPACE + class QGstreamerVideoWidget : public QWidget { public: @@ -350,3 +352,5 @@ void QGstreamerVideoWidgetControl::setSaturation(int saturation) emit saturationChanged(saturation); } } + +QT_END_NAMESPACE diff --git a/src/gsttools/qvideosurfacegstsink.cpp b/src/gsttools/qvideosurfacegstsink.cpp index afbc69c92..0347c168c 100644 --- a/src/gsttools/qvideosurfacegstsink.cpp +++ b/src/gsttools/qvideosurfacegstsink.cpp @@ -57,6 +57,8 @@ //#define DEBUG_VIDEO_SURFACE_SINK +QT_BEGIN_NAMESPACE + Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, bufferPoolLoader, (QGstBufferPoolInterface_iid, QLatin1String("video/bufferpool"), Qt::CaseInsensitive)) @@ -895,3 +897,4 @@ GstFlowReturn QVideoSurfaceGstSink::render(GstBaseSink *base, GstBuffer *buffer) return sink->delegate->render(buffer); } +QT_END_NAMESPACE diff --git a/src/imports/audioengine/qdeclarative_audioengine_p.cpp b/src/imports/audioengine/qdeclarative_audioengine_p.cpp index fa021775d..1275523ac 100644 --- a/src/imports/audioengine/qdeclarative_audioengine_p.cpp +++ b/src/imports/audioengine/qdeclarative_audioengine_p.cpp @@ -53,7 +53,7 @@ #define DEBUG_AUDIOENGINE -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE /*! \qmlclass AudioEngine QDeclarativeAudioEngine @@ -536,6 +536,4 @@ void QDeclarativeAudioEngine::handleLoadingChanged() The corresponding handler is \c onIsLoadingChanged. */ - QT_END_NAMESPACE - diff --git a/src/imports/audioengine/qsoundinstance_p.cpp b/src/imports/audioengine/qsoundinstance_p.cpp index a2effd9b0..83ba03dc8 100644 --- a/src/imports/audioengine/qsoundinstance_p.cpp +++ b/src/imports/audioengine/qsoundinstance_p.cpp @@ -54,7 +54,7 @@ #define DEBUG_AUDIOENGINE -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE QSoundInstance::QSoundInstance(QObject *parent) : QObject(parent) diff --git a/src/multimedia/gsttools_headers/qgstappsrc_p.h b/src/multimedia/gsttools_headers/qgstappsrc_p.h index dc817e8f0..df7821933 100644 --- a/src/multimedia/gsttools_headers/qgstappsrc_p.h +++ b/src/multimedia/gsttools_headers/qgstappsrc_p.h @@ -49,6 +49,8 @@ #include <gst/app/gstappsrc.h> #include <gst/app/gstappbuffer.h> +QT_BEGIN_NAMESPACE + class QGstAppSrc : public QObject { Q_OBJECT @@ -103,4 +105,6 @@ private: bool m_forceData; }; +QT_END_NAMESPACE + #endif diff --git a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h index 58e843bcf..f1f1c8b85 100644 --- a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h +++ b/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h @@ -47,6 +47,8 @@ #include <gst/gst.h> +QT_BEGIN_NAMESPACE + class QGstCodecsInfo { public: @@ -69,4 +71,6 @@ private: }; +QT_END_NAMESPACE + #endif diff --git a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h index c92c5fff3..d40625a85 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h @@ -48,11 +48,8 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; -QT_END_NAMESPACE class QX11VideoSurface; -QT_BEGIN_NAMESPACE - class QGstreamerVideoOverlay : public QVideoWindowControl, public QGstreamerVideoRendererInterface { Q_OBJECT diff --git a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h index da8af5a8c..9762e4274 100644 --- a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h +++ b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h @@ -50,11 +50,8 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; -QT_END_NAMESPACE class QX11VideoSurface; -QT_BEGIN_NAMESPACE - class QGstreamerVideoWindow : public QVideoWindowControl, public QGstreamerVideoRendererInterface, public QGstreamerSyncMessageFilter diff --git a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h index 26d46554b..aafeab026 100644 --- a/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h +++ b/src/multimedia/gsttools_headers/qgstxvimagebuffer_p.h @@ -88,8 +88,12 @@ struct QGstXvImageBuffer { static GstBufferClass *parent_class; }; +QT_END_NAMESPACE + Q_DECLARE_METATYPE(XvImage*) +QT_BEGIN_NAMESPACE + class QGstXvImageBufferPool : public QObject, public QGstBufferPoolInterface { Q_OBJECT Q_INTERFACES(QGstBufferPoolInterface) diff --git a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h index c87db3aad..dab13fe85 100644 --- a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h +++ b/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h @@ -68,7 +68,6 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; -QT_END_NAMESPACE #ifdef HAVE_XVIDEO class QGstXvImageBuffer; @@ -182,4 +181,6 @@ public: GstVideoSinkClass parent_class; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h index c32592a1a..c09d577c4 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -50,9 +50,10 @@ #include <limits.h> +QT_BEGIN_NAMESPACE + class QMediaPlayerResourceSetInterface; -QT_BEGIN_NAMESPACE class QMediaPlaylist; class QMediaPlaylistNavigator; class QSocketNotifier; |