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/multimedia | |
| parent | b05819f9394418d9e47b44e1c5536934dda99575 (diff) | |
Fixed QtMultimedia core namespace compilation.
Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia')
6 files changed, 20 insertions, 2 deletions
diff --git a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h index 7dbccfdbc..0adf242c1 100644 --- a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h +++ b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h @@ -61,6 +61,8 @@ #include <gst/gst.h> +QT_BEGIN_NAMESPACE + const QLatin1String QGstBufferPoolPluginKey("bufferpool"); /*! @@ -118,4 +120,6 @@ public: virtual QStringList keys() const = 0; }; +QT_END_NAMESPACE + #endif diff --git a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h index 0ae5b8978..4fc1c76d3 100644 --- a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h +++ b/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h @@ -58,6 +58,8 @@ #include "qgstreamermessage_p.h" #include <gst/gst.h> +QT_BEGIN_NAMESPACE + class QGstreamerSyncMessageFilter { public: //returns true if message was processed and should be dropped, false otherwise @@ -97,4 +99,6 @@ private: QGstreamerBusHelperPrivate* d; }; +QT_END_NAMESPACE + #endif diff --git a/src/multimedia/gsttools_headers/qgstreamermessage_p.h b/src/multimedia/gsttools_headers/qgstreamermessage_p.h index b0a568de2..db58e65d4 100644 --- a/src/multimedia/gsttools_headers/qgstreamermessage_p.h +++ b/src/multimedia/gsttools_headers/qgstreamermessage_p.h @@ -57,6 +57,7 @@ #include <gst/gst.h> +QT_BEGIN_NAMESPACE class QGstreamerMessage { @@ -74,6 +75,8 @@ private: GstMessage* m_message; }; +QT_END_NAMESPACE + Q_DECLARE_METATYPE(QGstreamerMessage); #endif diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h index ea99e560f..f402ea616 100644 --- a/src/multimedia/gsttools_headers/qgstutils_p.h +++ b/src/multimedia/gsttools_headers/qgstutils_p.h @@ -56,6 +56,8 @@ #include <QtCore/qmap.h> #include <gst/gst.h> +QT_BEGIN_NAMESPACE + class QSize; class QVariant; class QByteArray; @@ -67,4 +69,6 @@ namespace QGstUtils { QSize capsCorrectedResolution(const GstCaps *caps); } +QT_END_NAMESPACE + #endif diff --git a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h index 0f14a8fec..311dc21c9 100644 --- a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h +++ b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h @@ -58,6 +58,8 @@ #include <gst/gst.h> +QT_BEGIN_NAMESPACE + class QGstVideoBuffer : public QAbstractVideoBuffer { public: @@ -79,5 +81,6 @@ private: QVariant m_handle; }; +QT_END_NAMESPACE #endif diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp index fd1fe5b3c..8ba3aa6ee 100644 --- a/src/multimedia/qcamera.cpp +++ b/src/multimedia/qcamera.cpp @@ -54,8 +54,6 @@ #include <QDebug> -QT_USE_NAMESPACE - namespace { class CameraRegisterMetaTypes @@ -74,6 +72,7 @@ public: } _registerCameraMetaTypes; } +QT_BEGIN_NAMESPACE /*! \class QCamera @@ -1031,5 +1030,6 @@ void QCamera::unlock() \since 1.1 */ +QT_END_NAMESPACE #include "moc_qcamera.cpp" |