From 717f56999939bb9c1aeb88c959afdafb4ada02cc Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Wed, 28 Oct 2015 11:22:42 +0100
Subject: Add namespace to the specialized QSG nodes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add QtWebEngineCore namespace to classes I missed earlier.

Change-Id: Ia40b03c58e0aec858e8fbe9a8fdb532349353046
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 src/core/stream_video_node.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/core/stream_video_node.h')

diff --git a/src/core/stream_video_node.h b/src/core/stream_video_node.h
index f808bb609..bd2c3408a 100644
--- a/src/core/stream_video_node.h
+++ b/src/core/stream_video_node.h
@@ -40,9 +40,9 @@
 #include <QtQuick/qsgmaterial.h>
 #include <QtQuick/qsgnode.h>
 
-QT_BEGIN_NAMESPACE
-class QSGTexture;
-QT_END_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QSGTexture)
+
+namespace QtWebEngineCore {
 
 // These classes duplicate, QtQuick style, the logic of GLRenderer::DrawStreamVideoQuad.
 // Their behavior should stay as close as possible to GLRenderer.
@@ -52,7 +52,8 @@ class StreamVideoMaterial : public QSGMaterial
 public:
     StreamVideoMaterial(QSGTexture *texture);
 
-    virtual QSGMaterialType *type() const Q_DECL_OVERRIDE{
+    virtual QSGMaterialType *type() const Q_DECL_OVERRIDE
+    {
         static QSGMaterialType theType;
         return &theType;
     }
@@ -75,4 +76,6 @@ private:
     StreamVideoMaterial *m_material;
 };
 
+} // namespace
+
 #endif // STREAM_VIDEO_NODE_H
-- 
cgit v1.2.3