From cc61a0a8c72d9e6c92c750851e9ff417aefda410 Mon Sep 17 00:00:00 2001
From: Toby Tomkins <toby.tomkins@nokia.com>
Date: Mon, 21 Nov 2011 17:37:31 +1000
Subject: Fixed qtmultimedia imports -qtnamespace issues.

Change-Id: Ie7896faf92b3cc5fdf2b6dbe885913c2669e6e36
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 src/imports/multimedia/qdeclarativeradio.cpp       | 2 ++
 src/imports/multimedia/qdeclarativeradiodata.cpp   | 2 ++
 src/imports/multimedia/qdeclarativevideooutput.cpp | 4 ++++
 src/imports/multimedia/qdeclarativevideooutput_p.h | 4 ++++
 4 files changed, 12 insertions(+)

(limited to 'src/imports/multimedia')

diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index e2b495db5..da9846ab0 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -216,3 +216,5 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
     emit error(static_cast<QDeclarativeRadio::Error>(errorCode));
     emit errorChanged();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index debea99a3..306e09167 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -116,3 +116,5 @@ void QDeclarativeRadioData::_q_error(QRadioData::Error errorCode)
     emit error(static_cast<QDeclarativeRadioData::Error>(errorCode));
     emit errorChanged();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index e161d9d5d..82c7da034 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -57,6 +57,8 @@
 //#define DEBUG_VIDEOITEM
 Q_DECLARE_METATYPE(QAbstractVideoSurface*)
 
+QT_BEGIN_NAMESPACE
+
 class QSGVideoItemSurface : public QAbstractVideoSurface
 {
 public:
@@ -382,3 +384,5 @@ QSGNode *QDeclarativeVideoOutput::updatePaintNode(QSGNode *oldNode, UpdatePaintN
     videoNode->setCurrentFrame(m_frame);
     return videoNode;
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/multimedia/qdeclarativevideooutput_p.h b/src/imports/multimedia/qdeclarativevideooutput_p.h
index c33110c4b..d15c164e8 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_p.h
+++ b/src/imports/multimedia/qdeclarativevideooutput_p.h
@@ -51,6 +51,8 @@
 
 #include "qsgvideonode_p.h"
 
+QT_BEGIN_NAMESPACE
+
 class QSGVideoItemSurface;
 class QVideoRendererControl;
 class QMediaService;
@@ -120,4 +122,6 @@ private:
     QRectF m_sourceRect;
 };
 
+QT_END_NAMESPACE
+
 #endif // QDECLARATIVEVIDEOOUTPUT_H
-- 
cgit v1.2.3