diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-06-21 13:37:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 06:39:04 +0200 |
| commit | 6d301388e1484c55c4f715d26c136c91d1b5dea9 (patch) | |
| tree | fe4c1c477c8d76e87e9045e61018cb684a1cebe5 /src/multimedia | |
| parent | d006d874ba3af22edb4e4a891a066ba4454e06eb (diff) | |
Fix namespace compilation.
Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/multimedia')
6 files changed, 14 insertions, 7 deletions
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 |