diff options
author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-25 15:38:27 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-25 06:52:21 +0100 |
commit | 581564c9902702626a5dc89cb47632c6a624b514 (patch) | |
tree | bb51980dee89de3b3119d85f3941bbe99f76969e /src/gsttools | |
parent | b05819f9394418d9e47b44e1c5536934dda99575 (diff) |
Fixed QtMultimedia core namespace compilation.
Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/gsttools')
-rw-r--r-- | src/gsttools/qgstbufferpoolinterface.cpp | 3 | ||||
-rw-r--r-- | src/gsttools/qgstreamerbushelper.cpp | 3 | ||||
-rw-r--r-- | src/gsttools/qgstreamermessage.cpp | 3 | ||||
-rw-r--r-- | src/gsttools/qgstutils.cpp | 4 | ||||
-rw-r--r-- | src/gsttools/qgstvideobuffer.cpp | 2 | ||||
-rw-r--r-- | src/gsttools/qgstxvimagebuffer.cpp | 4 |
6 files changed, 17 insertions, 2 deletions
diff --git a/src/gsttools/qgstbufferpoolinterface.cpp b/src/gsttools/qgstbufferpoolinterface.cpp index 01e88734a..a07568b03 100644 --- a/src/gsttools/qgstbufferpoolinterface.cpp +++ b/src/gsttools/qgstbufferpoolinterface.cpp @@ -48,7 +48,6 @@ QGstBufferPoolPlugin::QGstBufferPoolPlugin(QObject *parent) : { } -#include "moc_qgstbufferpoolinterface_p.cpp" - QT_END_NAMESPACE +#include "moc_qgstbufferpoolinterface_p.cpp" diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index 211c364df..870398c74 100644 --- a/src/gsttools/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -46,6 +46,7 @@ #include "qgstreamerbushelper_p.h" +QT_BEGIN_NAMESPACE #ifndef QT_NO_GLIB class QGstreamerBusHelperPrivate : public QObject @@ -234,4 +235,6 @@ void QGstreamerBusHelper::removeMessageFilter(QObject *filter) d->busFilters.removeAll(busFilter); } +QT_END_NAMESPACE + #include "qgstreamerbushelper.moc" diff --git a/src/gsttools/qgstreamermessage.cpp b/src/gsttools/qgstreamermessage.cpp index d36fa92fe..1b0eef7de 100644 --- a/src/gsttools/qgstreamermessage.cpp +++ b/src/gsttools/qgstreamermessage.cpp @@ -43,6 +43,7 @@ #include "qgstreamermessage_p.h" +QT_BEGIN_NAMESPACE static int wuchi = qRegisterMetaType<QGstreamerMessage>(); @@ -91,3 +92,5 @@ QGstreamerMessage& QGstreamerMessage::operator=(QGstreamerMessage const& rhs) return *this; } + +QT_END_NAMESPACE diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 4e501e91d..bc29b2520 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -46,6 +46,8 @@ #include <QtCore/qvariant.h> #include <QtCore/qsize.h> +QT_BEGIN_NAMESPACE + //internal static void addTagToMap(const GstTagList *list, const gchar *tag, @@ -163,3 +165,5 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps) return size; } + +QT_END_NAMESPACE diff --git a/src/gsttools/qgstvideobuffer.cpp b/src/gsttools/qgstvideobuffer.cpp index a1a93c0ef..ecf41a506 100644 --- a/src/gsttools/qgstvideobuffer.cpp +++ b/src/gsttools/qgstvideobuffer.cpp @@ -41,6 +41,7 @@ #include "qgstvideobuffer_p.h" +QT_BEGIN_NAMESPACE QGstVideoBuffer::QGstVideoBuffer(GstBuffer *buffer, int bytesPerLine) : QAbstractVideoBuffer(NoHandle) @@ -95,3 +96,4 @@ void QGstVideoBuffer::unmap() m_mode = NotMapped; } +QT_END_NAMESPACE diff --git a/src/gsttools/qgstxvimagebuffer.cpp b/src/gsttools/qgstxvimagebuffer.cpp index 90ca86701..eb28999fc 100644 --- a/src/gsttools/qgstxvimagebuffer.cpp +++ b/src/gsttools/qgstxvimagebuffer.cpp @@ -50,6 +50,8 @@ #ifndef QT_NO_XVIDEO +QT_BEGIN_NAMESPACE + GstBufferClass *QGstXvImageBuffer::parent_class = NULL; GType QGstXvImageBuffer::get_type(void) @@ -307,5 +309,7 @@ void QGstXvImageBufferPool::destroyBuffer(QGstXvImageBuffer *xvBuffer) QMetaObject::invokeMethod(this, "queuedDestroy", Qt::QueuedConnection); } +QT_END_NAMESPACE + #endif //QT_NO_XVIDEO |