Fixed QtMultimedia core namespace compilation.

Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>

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"

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"

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

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

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

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
 

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

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

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

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

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

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"

src/multimediawidgets/qcameraviewfinder.cpp

@@ -48,7 +48,7 @@
 
 #include <QtCore/QDebug>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QCameraViewfinder
@@ -110,4 +110,6 @@ bool QCameraViewfinder::setMediaObject(QMediaObject *object)
     return QVideoWidget::setMediaObject(object);
 }
 
+QT_END_NAMESPACE
+
 #include "moc_qcameraviewfinder.cpp"

src/plugins/gstreamer/mediacapture/qgstreameraudioencode.h

@@ -43,7 +43,6 @@
 #define QGSTREAMERAUDIOENCODE_H
 
 #include <qaudioencodercontrol.h>
-class QGstreamerCaptureSession;
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
@@ -53,7 +52,9 @@ class QGstreamerCaptureSession;
 
 #include <qaudioformat.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+
+class QGstreamerCaptureSession;
 
 class QGstreamerAudioEncode : public QAudioEncoderControl
 {
@@ -94,4 +95,6 @@ private:
     QAudioEncoderSettings m_audioSettings;
 };
 
+QT_END_NAMESPACE
+
 #endif

src/plugins/gstreamer/mediacapture/qgstreamercameracontrol.h

@@ -47,8 +47,7 @@
 #include <qcameracontrol.h>
 #include "qgstreamercapturesession.h"
 
-QT_USE_NAMESPACE
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerCameraControl : public QCameraControl
 {
@@ -95,4 +94,6 @@ private:
     bool m_reloadPending;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAMERACONTROL_H

src/plugins/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h

@@ -44,7 +44,7 @@
 
 #include <qmetadatawritercontrol.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerCaptureMetaDataControl : public QMetaDataWriterControl
 {
@@ -72,4 +72,6 @@ private:
     QMap<QByteArray, QVariant> m_values;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAPTUREMETADATACONTROL_H

src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp

@@ -62,6 +62,7 @@
 
 #include <qmediaserviceprovider.h>
 
+QT_BEGIN_NAMESPACE
 
 QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObject *parent):
     QMediaService(parent)
@@ -182,3 +183,5 @@ void QGstreamerCaptureService::releaseControl(QMediaControl *control)
         m_captureSession->setVideoPreview(0);
     }
 }
+
+QT_END_NAMESPACE

src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h

@@ -49,7 +49,6 @@
 QT_BEGIN_NAMESPACE
 class QAudioEndpointSelector;
 class QVideoDeviceControl;
-QT_END_NAMESPACE
 
 class QGstreamerCaptureSession;
 class QGstreamerCameraControl;
@@ -93,4 +92,6 @@ private:
     QGstreamerImageCaptureControl *m_imageCaptureControl;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAPTURESERVICE_H

src/plugins/gstreamer/mediacapture/qgstreamercapturesession.cpp

@@ -61,6 +61,8 @@
 
 #include <QtGui/qimage.h>
 
+QT_BEGIN_NAMESPACE
+
 #define gstRef(element) { gst_object_ref(GST_OBJECT(element)); gst_object_sink(GST_OBJECT(element)); }
 #define gstUnref(element) { if (element) { gst_object_unref(GST_OBJECT(element)); element = 0; } }
 
@@ -1022,3 +1024,5 @@ void QGstreamerCaptureSession::setMuted(bool muted)
         emit mutedChanged(muted);
     }
 }
+
+QT_END_NAMESPACE

src/plugins/gstreamer/mediacapture/qgstreamercapturesession.h

@@ -51,7 +51,7 @@
 
 #include <private/qgstreamerbushelper_p.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerMessage;
 class QGstreamerBusHelper;
@@ -208,4 +208,6 @@ public:
     int m_imageRequestId;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAPTURESESSION_H

src/plugins/gstreamer/mediacapture/qgstreamerimagecapturecontrol.h

@@ -45,7 +45,8 @@
 
 #include <qcameraimagecapturecontrol.h>
 #include "qgstreamercapturesession.h"
-QT_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QGstreamerImageCaptureControl : public QCameraImageCaptureControl
 {
@@ -70,4 +71,6 @@ private:
     int m_lastId;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAPTURECORNTROL_H

src/plugins/gstreamer/mediacapture/qgstreamerimageencode.h

@@ -42,15 +42,16 @@
 #ifndef QGSTREAMERIMAGEENCODE_H
 #define QGSTREAMERIMAGEENCODE_H
 
-class QGstreamerCaptureSession;
-
 #include <qimageencodercontrol.h>
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
 
 #include <gst/gst.h>
-QT_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
+class QGstreamerCaptureSession;
 
 class QGstreamerImageEncode : public QImageEncoderControl
 {
@@ -77,4 +78,6 @@ private:
     QGstreamerCaptureSession *m_session;
 };
 
+QT_END_NAMESPACE
+
 #endif

src/plugins/gstreamer/mediacapture/qgstreamermediacontainercontrol.h

@@ -49,7 +49,7 @@
 
 #include <gst/gst.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerMediaContainerControl : public QMediaContainerControl
 {
@@ -81,4 +81,6 @@ private:
     QMap<QString, QSet<QString> > m_streamTypes;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERMEDIACONTAINERCONTROL_H

src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.h

@@ -48,7 +48,7 @@
 #include <qmediarecordercontrol.h>
 #include "qgstreamercapturesession.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerRecorderControl : public QMediaRecorderControl
 {
@@ -88,4 +88,6 @@ private:
     bool m_hasPreviewState;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERCAPTURECORNTROL_H

src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.h

@@ -49,7 +49,7 @@
 #include <QtCore/qsize.h>
 #include "qgstreamercapturesession.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerV4L2Input : public QObject, public QGstreamerVideoInput
 {
@@ -80,4 +80,6 @@ private:
     QByteArray m_device;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERV4L2INPUT_H

src/plugins/gstreamer/mediacapture/qgstreamervideoencode.h

@@ -43,7 +43,6 @@
 #define QGSTREAMERVIDEOENCODE_H
 
 #include <qvideoencodercontrol.h>
-class QGstreamerCaptureSession;
 
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
@@ -51,7 +50,9 @@ class QGstreamerCaptureSession;
 
 #include <gst/gst.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+
+class QGstreamerCaptureSession;
 
 class QGstreamerVideoEncode : public QVideoEncoderControl
 {
@@ -95,4 +96,6 @@ private:
     QMap<QString, QSet<QString> > m_streamTypes;
 };
 
+QT_END_NAMESPACE
+
 #endif

src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp

@@ -45,6 +45,8 @@
 
 #include <gst/gstversion.h>
 
+QT_BEGIN_NAMESPACE
+
 struct QGstreamerMetaDataKeyLookup
 {
     QtMultimedia::MetaData key;
@@ -190,3 +192,5 @@ void QGstreamerMetaDataProvider::updateTags()
 {
     emit metaDataChanged();
 }
+
+QT_END_NAMESPACE

src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.h

@@ -44,7 +44,7 @@
 
 #include <qmetadatareadercontrol.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerPlayerSession;
 
@@ -71,4 +71,6 @@ private:
     QGstreamerPlayerSession *m_session;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERMETADATAPROVIDER_H

src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp

@@ -58,6 +58,8 @@
 
 //#define DEBUG_PLAYBIN
 
+QT_BEGIN_NAMESPACE
+
 QGstreamerPlayerControl::QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent)
     : QMediaPlayerControl(parent)
     , m_ownStream(false)
@@ -773,3 +775,5 @@ void QGstreamerPlayerControl::updatePosition(qint64 pos)
 
     emit positionChanged(pos);
 }
+
+QT_END_NAMESPACE

src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h

@@ -50,17 +50,15 @@
 
 #include <limits.h>
 
+class PlayerResourcePolicy;
+
 QT_BEGIN_NAMESPACE
 class QMediaPlaylist;
 class QMediaPlaylistNavigator;
 class QSocketNotifier;
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
 
 class QGstreamerPlayerSession;
 class QGstreamerPlayerService;
-class PlayerResourcePolicy;
 
 class QGstreamerPlayerControl : public QMediaPlayerControl
 {
@@ -155,4 +153,6 @@ private:
     PlayerResourcePolicy *m_resources;
 };
 
+QT_END_NAMESPACE
+
 #endif

src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp

@@ -62,6 +62,8 @@
 #include <qmediaplaylistnavigator.h>
 #include <qmediaplaylist.h>
 
+QT_BEGIN_NAMESPACE
+
 QGstreamerPlayerService::QGstreamerPlayerService(QObject *parent):
      QMediaService(parent),
      m_videoOutput(0),
@@ -132,3 +134,4 @@ void QGstreamerPlayerService::releaseControl(QMediaControl *control)
     }
 }
 
+QT_END_NAMESPACE

src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h

@@ -52,7 +52,6 @@ class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
 class QMediaPlaylistNavigator;
-QT_END_NAMESPACE
 
 class QGstreamerMetaData;
 class QGstreamerPlayerControl;
@@ -63,8 +62,6 @@ class QGstreamerVideoRenderer;
 class QGstreamerVideoOverlay;
 class QGstreamerVideoWidgetControl;
 
-QT_USE_NAMESPACE
-
 class QGstreamerPlayerService : public QMediaService
 {
     Q_OBJECT
@@ -87,4 +84,6 @@ private:
     QMediaControl *m_videoWidget;
 };
 
+QT_END_NAMESPACE
+
 #endif

src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp

@@ -64,6 +64,8 @@
 //#define DEBUG_PLAYBIN
 //#define DEBUG_VO_BIN_DUMP
 
+QT_BEGIN_NAMESPACE
+
 typedef enum {
     GST_PLAY_FLAG_VIDEO         = 0x00000001,
     GST_PLAY_FLAG_AUDIO         = 0x00000002,
@@ -1616,3 +1618,5 @@ void QGstreamerPlayerSession::showPrerollFrames(bool enabled)
         m_displayPrerolledFrame = enabled;
     }
 }
+
+QT_END_NAMESPACE

src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.h

@@ -55,13 +55,13 @@
 
 #include <gst/gst.h>
 
+QT_BEGIN_NAMESPACE
+
 class QGstreamerBusHelper;
 class QGstreamerMessage;
 
 class QGstreamerVideoRendererInterface;
 
-QT_USE_NAMESPACE
-
 class QGstreamerPlayerSession : public QObject,
                                 public QGstreamerBusMessageFilter
 {
@@ -226,4 +226,6 @@ private:
     bool m_isLiveSource;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERPLAYERSESSION_H

src/plugins/gstreamer/mediaplayer/qgstreamerstreamscontrol.h

@@ -44,7 +44,7 @@
 
 #include <qmediastreamscontrol.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerPlayerSession;
 
@@ -67,5 +67,7 @@ private:
     QGstreamerPlayerSession *m_session;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERSTREAMSCONTROL_H
 

src/plugins/gstreamer/qgstreameraudioinputendpointselector.h

@@ -45,7 +45,7 @@
 #include <qaudioendpointselector.h>
 #include <QtCore/qstringlist.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerAudioInputEndpointSelector : public QAudioEndpointSelector
 {
@@ -73,4 +73,6 @@ private:
     QList<QString> m_descriptions;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERAUDIOINPUTENDPOINTSELECTOR_H

src/plugins/gstreamer/qgstreamergltexturerenderer.h

@@ -51,7 +51,7 @@
 
 #include <X11/extensions/Xv.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGLContext;
 
@@ -127,4 +127,6 @@ private:
     QWaitCondition m_renderCondition;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERVIDEORENDRER_H

src/plugins/gstreamer/qgstreamerserviceplugin.h

@@ -46,7 +46,7 @@
 #include <qmediaserviceproviderplugin.h>
 #include <QtCore/qset.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QGstreamerServicePlugin
@@ -83,4 +83,6 @@ private:
     void updateSupportedMimeTypes() const;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERSERVICEPLUGIN_H

src/plugins/gstreamer/qgstreamervideoinputdevicecontrol.h

@@ -45,7 +45,7 @@
 #include <qvideodevicecontrol.h>
 #include <QtCore/qstringlist.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerVideoInputDeviceControl : public QVideoDeviceControl
 {
@@ -74,4 +74,6 @@ private:
     QStringList m_descriptions;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERAUDIOINPUTDEVICECONTROL_H

src/plugins/gstreamer/qgstreamervideooverlay.h

@@ -53,7 +53,7 @@ class QX11VideoSurface;
 
 #if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerVideoOverlay : public QVideoWindowControl, public QGstreamerVideoRendererInterface
 {
@@ -114,6 +114,8 @@ private:
     bool m_fullScreen;
 };
 
+QT_END_NAMESPACE
+
 #endif //QT_NO_XVIDEO
 
 #endif

src/plugins/gstreamer/qgstreamervideorenderer.h

@@ -47,7 +47,7 @@
 
 #include "qgstreamervideorendererinterface.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerVideoRenderer : public QVideoRendererControl, public QGstreamerVideoRendererInterface
 {
@@ -76,4 +76,6 @@ private:
     QAbstractVideoSurface *m_surface;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERVIDEORENDRER_H

src/plugins/gstreamer/qgstreamervideorendererinterface.h

@@ -46,6 +46,8 @@
 
 #include <QtCore/qobject.h>
 
+QT_BEGIN_NAMESPACE
+
 class QGstreamerVideoRendererInterface
 {
 public:
@@ -67,7 +69,6 @@ public:
 };
 
 #define QGstreamerVideoRendererInterface_iid "com.nokia.Qt.QGstreamerVideoRendererInterface/1.0"
-QT_BEGIN_NAMESPACE
 Q_DECLARE_INTERFACE(QGstreamerVideoRendererInterface, QGstreamerVideoRendererInterface_iid)
 QT_END_NAMESPACE
 

src/plugins/gstreamer/qgstreamervideowidget.h

@@ -47,7 +47,7 @@
 #include "qgstreamervideorendererinterface.h"
 #include <private/qgstreamerbushelper_p.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerVideoWidget;
 
@@ -109,4 +109,6 @@ private:
     bool m_fullScreen;
 };
 
+QT_END_NAMESPACE
+
 #endif // QGSTREAMERVIDEOWIDGET_H

src/plugins/gstreamer/qgstreamervideowindow.h

@@ -54,7 +54,7 @@ class QX11VideoSurface;
 
 #if defined(Q_WS_X11) && !defined(QT_NO_XVIDEO)
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGstreamerVideoWindow : public QVideoWindowControl,
         public QGstreamerVideoRendererInterface,
@@ -129,6 +129,8 @@ private:
     int m_bufferProbeId;
 };
 
+QT_END_NAMESPACE
+
 #endif //QT_NO_XVIDEO
 
 #endif

src/plugins/gstreamer/qx11videosurface.h

@@ -51,7 +51,7 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QX11VideoSurface : public QAbstractVideoSurface
 {
@@ -112,6 +112,8 @@ private:
     static int redistribute(int value, int fromLower, int fromUpper, int toLower, int toUpper);
 };
 
+QT_END_NAMESPACE
+
 #endif //QT_NO_XVIDEO
 
 #endif

src/plugins/pulseaudio/qpulseaudioplugin.h

@@ -66,6 +66,6 @@ private:
     QPulseAudioEngine *m_pulseEngine;
 };
 
-QT_BEGIN_NAMESPACE
+QT_END_NAMESPACE
 
 #endif