summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@theqtcompany.com>2016-03-04 13:54:34 +0100
committerAndy Nichols <andy.nichols@theqtcompany.com>2016-03-04 13:19:03 +0000
commitd26f29afb5a9a563da74767a348422ca04da945e (patch)
tree0f3e42cb2aca1e85002bf1423b082d726d8a3b98
parent6afccbd1e25abd95a9c239e175442b79e12f8c87 (diff)
Wrap all classes in Qt namespacer2d-dev
Change-Id: I1d7c7dfc594f16ad8727d87ebd19021a05bd841e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/context.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/context.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/glyphnode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/glyphnode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/imagenode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/imagenode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/ninepatchnode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/painternode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/painternode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/pixmaprenderer.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/pixmaprenderer.h5
-rw-r--r--src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/pixmaptexture.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/pluginmain.cpp5
-rw-r--r--src/plugins/scenegraph/softwarecontext/pluginmain.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/rectanglenode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/rectanglenode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderablenode.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderablenode.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderablenodeupdater.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderablenodeupdater.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderer.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderer.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderlistbuilder.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderlistbuilder.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderloop.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderloop.h4
-rw-r--r--src/plugins/scenegraph/softwarecontext/softwarelayer.cpp4
-rw-r--r--src/plugins/scenegraph/softwarecontext/softwarelayer.h4
32 files changed, 127 insertions, 3 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.cpp b/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.cpp
index 2963440c41..13aaa6076e 100644
--- a/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.cpp
+++ b/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.cpp
@@ -40,6 +40,8 @@
Q_LOGGING_CATEGORY(lc2DRender, "qt.scenegraph.softwarecontext.abstractrenderer")
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext{
AbstractSoftwareRenderer::AbstractSoftwareRenderer(QSGRenderContext *context)
@@ -309,3 +311,5 @@ void AbstractSoftwareRenderer::nodeOpacityUpdated(QSGNode *node)
}
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.h b/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.h
index e08668f8d8..967c2a1c9a 100644
--- a/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.h
+++ b/src/plugins/scenegraph/softwarecontext/abstractsoftwarerenderer.h
@@ -35,6 +35,8 @@
#include <QtCore/QHash>
#include <QtCore/QLinkedList>
+QT_BEGIN_NAMESPACE
+
class QSGSimpleRectNode;
namespace SoftwareContext{
@@ -85,4 +87,6 @@ private:
} // namespace
+QT_END_NAMESPACE
+
#endif // ABSTRACTSOFTWARERENDERER_H
diff --git a/src/plugins/scenegraph/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp
index 3f1d3f921d..b5d3186864 100644
--- a/src/plugins/scenegraph/softwarecontext/context.cpp
+++ b/src/plugins/scenegraph/softwarecontext/context.cpp
@@ -79,6 +79,8 @@ Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_GLYPH, "qt.scenegraph.time.glyph
// Timing inside the renderer base class
Q_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_RENDERER, "qt.scenegraph.time.renderer")
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext
{
@@ -172,3 +174,5 @@ void RenderContext::renderNextFrame(QSGRenderer *renderer, GLuint fbo)
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/context.h b/src/plugins/scenegraph/softwarecontext/context.h
index 42a81757a7..f07e8f532a 100644
--- a/src/plugins/scenegraph/softwarecontext/context.h
+++ b/src/plugins/scenegraph/softwarecontext/context.h
@@ -41,6 +41,8 @@ Q_DECLARE_LOGGING_CATEGORY(QSG_RASTER_LOG_TIME_RENDERER)
Q_DECLARE_LOGGING_CATEGORY(QSG_RASTER_LOG_INFO)
Q_DECLARE_LOGGING_CATEGORY(QSG_RASTER_LOG_RENDERLOOP)
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext
{
@@ -77,4 +79,6 @@ public:
} // namespace
+QT_END_NAMESPACE
+
#endif // CONTEXT_H
diff --git a/src/plugins/scenegraph/softwarecontext/glyphnode.cpp b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp
index d37965a5e6..08d9d93fee 100644
--- a/src/plugins/scenegraph/softwarecontext/glyphnode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp
@@ -29,6 +29,8 @@
#include "glyphnode.h"
+QT_BEGIN_NAMESPACE
+
GlyphNode::GlyphNode()
: m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 0)
, m_style(QQuickText::Normal)
@@ -100,3 +102,5 @@ void GlyphNode::paint(QPainter *painter)
painter->setPen(m_color);
painter->drawGlyphRun(pos, m_glyphRun);
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/glyphnode.h b/src/plugins/scenegraph/softwarecontext/glyphnode.h
index 50620fc910..12b0ec2543 100644
--- a/src/plugins/scenegraph/softwarecontext/glyphnode.h
+++ b/src/plugins/scenegraph/softwarecontext/glyphnode.h
@@ -32,6 +32,8 @@
#include <private/qsgadaptationlayer_p.h>
+QT_BEGIN_NAMESPACE
+
class GlyphNode : public QSGGlyphNode
{
public:
@@ -56,4 +58,6 @@ private:
QColor m_styleColor;
};
+QT_END_NAMESPACE
+
#endif // GLYPHNODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.cpp b/src/plugins/scenegraph/softwarecontext/imagenode.cpp
index c095a66a08..48304ec9ba 100644
--- a/src/plugins/scenegraph/softwarecontext/imagenode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/imagenode.cpp
@@ -34,6 +34,8 @@
#include <QPainter>
#include <qmath.h>
+QT_BEGIN_NAMESPACE
+
// Helper from widgets/styles/qdrawutil.cpp
namespace SoftwareContext {
@@ -489,3 +491,5 @@ const QPixmap &ImageNode::pixmap() const
qFatal("Image used with invalid texture format.");
}
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.h b/src/plugins/scenegraph/softwarecontext/imagenode.h
index e35e8f5eaa..a2c6ec61c8 100644
--- a/src/plugins/scenegraph/softwarecontext/imagenode.h
+++ b/src/plugins/scenegraph/softwarecontext/imagenode.h
@@ -33,6 +33,8 @@
#include <private/qsgadaptationlayer_p.h>
#include <private/qsgtexturematerial_p.h>
+QT_BEGIN_NAMESPACE
+
typedef QVarLengthArray<QPainter::PixmapFragment, 16> QPixmapFragmentsArray;
struct QTileRules
@@ -119,4 +121,6 @@ private:
bool m_cachedMirroredPixmapIsDirty;
};
+QT_END_NAMESPACE
+
#endif // IMAGENODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp
index 48e45f88e2..b358804968 100644
--- a/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp
@@ -31,6 +31,8 @@
#include "pixmaptexture.h"
#include "imagenode.h"
+QT_BEGIN_NAMESPACE
+
NinePatchNode::NinePatchNode()
{
setMaterial((QSGMaterial*)1);
@@ -93,3 +95,5 @@ QRectF NinePatchNode::bounds() const
{
return m_bounds;
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h
index 14a19cfd6d..6f46e987c6 100644
--- a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h
+++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h
@@ -32,6 +32,8 @@
#include <private/qsgadaptationlayer_p.h>
+QT_BEGIN_NAMESPACE
+
class NinePatchNode : public QSGNinePatchNode
{
public:
@@ -54,4 +56,6 @@ private:
QMargins m_margins;
};
+QT_END_NAMESPACE
+
#endif // NINEPATCHNODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/painternode.cpp b/src/plugins/scenegraph/softwarecontext/painternode.cpp
index b24562eb4b..907e48bf12 100644
--- a/src/plugins/scenegraph/softwarecontext/painternode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/painternode.cpp
@@ -31,6 +31,8 @@
#include "pixmaptexture.h"
#include <qmath.h>
+QT_BEGIN_NAMESPACE
+
PainterNode::PainterNode(QQuickPaintedItem *item)
: QSGPainterNode()
, m_preferredRenderTarget(QQuickPaintedItem::Image)
@@ -218,3 +220,5 @@ void PainterNode::setTextureSize(const QSize &size)
m_textureSize = size;
m_dirtyGeometry = true;
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/painternode.h b/src/plugins/scenegraph/softwarecontext/painternode.h
index 60391feca8..3d77f7aa39 100644
--- a/src/plugins/scenegraph/softwarecontext/painternode.h
+++ b/src/plugins/scenegraph/softwarecontext/painternode.h
@@ -35,6 +35,8 @@
#include <QtGui/QPixmap>
+QT_BEGIN_NAMESPACE
+
class PainterNode : public QSGPainterNode
{
public:
@@ -107,4 +109,6 @@ private:
bool m_dirtyGeometry;
};
+QT_END_NAMESPACE
+
#endif // PAINTERNODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/pixmaprenderer.cpp b/src/plugins/scenegraph/softwarecontext/pixmaprenderer.cpp
index d054fa9b08..4cc12f37ef 100644
--- a/src/plugins/scenegraph/softwarecontext/pixmaprenderer.cpp
+++ b/src/plugins/scenegraph/softwarecontext/pixmaprenderer.cpp
@@ -35,6 +35,8 @@
Q_LOGGING_CATEGORY(lcPixmapRenderer, "qt.scenegraph.softwarecontext.pixmapRenderer")
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
PixmapRenderer::PixmapRenderer(QSGRenderContext *context)
@@ -99,3 +101,5 @@ void PixmapRenderer::setProjectionRect(const QRect &projectionRect)
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/pixmaprenderer.h b/src/plugins/scenegraph/softwarecontext/pixmaprenderer.h
index 0890a83817..47077ed0a0 100644
--- a/src/plugins/scenegraph/softwarecontext/pixmaprenderer.h
+++ b/src/plugins/scenegraph/softwarecontext/pixmaprenderer.h
@@ -32,6 +32,8 @@
#include "abstractsoftwarerenderer.h"
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
class PixmapRenderer : public AbstractSoftwareRenderer
@@ -50,7 +52,8 @@ private:
QRect m_projectionRect;
};
-
} // namespace
+QT_END_NAMESPACE
+
#endif // PIXMAPRENDERER_H
diff --git a/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp
index 69fe364325..3a646e6c7f 100644
--- a/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp
+++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp
@@ -29,6 +29,8 @@
#include "pixmaptexture.h"
+QT_BEGIN_NAMESPACE
+
PixmapTexture::PixmapTexture(const QImage &image)
// Prevent pixmap format conversion to reduce memory consumption
// and surprises in calling code. (See QTBUG-47328)
@@ -66,3 +68,5 @@ void PixmapTexture::bind()
{
Q_UNREACHABLE();
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h
index 302854223f..c510c5d808 100644
--- a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h
+++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h
@@ -32,6 +32,8 @@
#include <private/qsgtexture_p.h>
+QT_BEGIN_NAMESPACE
+
class PixmapTexture : public QSGTexture
{
Q_OBJECT
@@ -51,4 +53,6 @@ private:
QPixmap m_pixmap;
};
+QT_END_NAMESPACE
+
#endif // PIXMAPTEXTURE_H
diff --git a/src/plugins/scenegraph/softwarecontext/pluginmain.cpp b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp
index 80bcabe62d..53c1aca117 100644
--- a/src/plugins/scenegraph/softwarecontext/pluginmain.cpp
+++ b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp
@@ -34,6 +34,8 @@
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
+QT_BEGIN_NAMESPACE
+
ContextPlugin::ContextPlugin(QObject *parent)
: QSGContextPlugin(parent)
{
@@ -58,5 +60,4 @@ QSGRenderLoop *ContextPlugin::createWindowManager()
SoftwareContext::Context *ContextPlugin::instance = 0;
-
-
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/pluginmain.h b/src/plugins/scenegraph/softwarecontext/pluginmain.h
index 23b1c023ca..b7b4a1719c 100644
--- a/src/plugins/scenegraph/softwarecontext/pluginmain.h
+++ b/src/plugins/scenegraph/softwarecontext/pluginmain.h
@@ -37,6 +37,8 @@
#include "context.h"
+QT_BEGIN_NAMESPACE
+
class ContextPlugin : public QSGContextPlugin
{
Q_OBJECT
@@ -53,4 +55,6 @@ public:
static SoftwareContext::Context *instance;
};
+QT_END_NAMESPACE
+
#endif // PLUGINMAIN_H
diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp
index ef9d4fb3d4..d1fb617e3c 100644
--- a/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp
@@ -32,6 +32,8 @@
#include <QtGui/QPainter>
+QT_BEGIN_NAMESPACE
+
RectangleNode::RectangleNode()
: m_penWidth(0)
, m_radius(0)
@@ -436,3 +438,5 @@ void RectangleNode::generateCornerPixmap()
cornerPainter.end();
}
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.h b/src/plugins/scenegraph/softwarecontext/rectanglenode.h
index 565f4a3b9e..d864a1bb8f 100644
--- a/src/plugins/scenegraph/softwarecontext/rectanglenode.h
+++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.h
@@ -36,6 +36,8 @@
#include <QBrush>
#include <QPixmap>
+QT_BEGIN_NAMESPACE
+
class RectangleNode : public QSGRectangleNode
{
public:
@@ -75,4 +77,6 @@ private:
int m_devicePixelRatio;
};
+QT_END_NAMESPACE
+
#endif // RECTANGLENODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/renderablenode.cpp b/src/plugins/scenegraph/softwarecontext/renderablenode.cpp
index 0da19c172a..dab4a216bd 100644
--- a/src/plugins/scenegraph/softwarecontext/renderablenode.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderablenode.cpp
@@ -43,6 +43,8 @@
Q_LOGGING_CATEGORY(lcRenderable, "qt.scenegraph.softwarecontext.renderable")
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext{
RenderableNode::RenderableNode(NodeType type, QSGNode *node)
@@ -310,3 +312,5 @@ QRegion RenderableNode::dirtyRegion() const
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/renderablenode.h b/src/plugins/scenegraph/softwarecontext/renderablenode.h
index 4c6fdc765b..89ca942c07 100644
--- a/src/plugins/scenegraph/softwarecontext/renderablenode.h
+++ b/src/plugins/scenegraph/softwarecontext/renderablenode.h
@@ -34,6 +34,8 @@
#include <QtCore/QRect>
#include <QtGui/QTransform>
+QT_BEGIN_NAMESPACE
+
class QSGNode;
class QSGSimpleRectNode;
class QSGSimpleTextureNode;
@@ -116,4 +118,6 @@ private:
} // namespace
+QT_END_NAMESPACE
+
#endif // RENDERABLENODE_H
diff --git a/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.cpp b/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.cpp
index 114bd07584..b9e8b531e2 100644
--- a/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.cpp
@@ -40,6 +40,8 @@
#include <QtQuick/QSGSimpleRectNode>
#include <QtQuick/qsgsimpletexturenode.h>
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
RenderableNodeUpdater::RenderableNodeUpdater(AbstractSoftwareRenderer *renderer)
@@ -263,3 +265,5 @@ RenderableNodeUpdater::NodeState RenderableNodeUpdater::currentState(QSGNode *no
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.h b/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.h
index 15e778627d..f878bbe94f 100644
--- a/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.h
+++ b/src/plugins/scenegraph/softwarecontext/renderablenodeupdater.h
@@ -39,6 +39,8 @@
#include <QStack>
#include <QRectF>
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
class RenderableNodeUpdater : public QSGNodeVisitorEx
@@ -113,4 +115,6 @@ bool RenderableNodeUpdater::updateRenderableNode(RenderableNode::NodeType type,
} // namespace
+QT_END_NAMESPACE
+
#endif // RENDERABLENODEUPDATER_H
diff --git a/src/plugins/scenegraph/softwarecontext/renderer.cpp b/src/plugins/scenegraph/softwarecontext/renderer.cpp
index 316f93ab1c..6d2d390d43 100644
--- a/src/plugins/scenegraph/softwarecontext/renderer.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderer.cpp
@@ -41,6 +41,8 @@
Q_LOGGING_CATEGORY(lcRenderer, "qt.scenegraph.softwarecontext.renderer")
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
Renderer::Renderer(QSGRenderContext *context)
@@ -146,3 +148,5 @@ void Renderer::render()
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/renderer.h b/src/plugins/scenegraph/softwarecontext/renderer.h
index d26f0f11a1..d9a86b9bb0 100644
--- a/src/plugins/scenegraph/softwarecontext/renderer.h
+++ b/src/plugins/scenegraph/softwarecontext/renderer.h
@@ -38,6 +38,8 @@
#include <QtGui/QImage>
#endif
+QT_BEGIN_NAMESPACE
+
class QSGSimpleRectNode;
namespace SoftwareContext{
@@ -65,4 +67,6 @@ private:
} // namespace
+QT_END_NAMESPACE
+
#endif // RENDERER_H
diff --git a/src/plugins/scenegraph/softwarecontext/renderlistbuilder.cpp b/src/plugins/scenegraph/softwarecontext/renderlistbuilder.cpp
index e002a77ce2..890b76b246 100644
--- a/src/plugins/scenegraph/softwarecontext/renderlistbuilder.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderlistbuilder.cpp
@@ -41,6 +41,8 @@
#include <QtQuick/QSGSimpleRectNode>
#include <QtQuick/qsgsimpletexturenode.h>
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
@@ -152,3 +154,5 @@ bool RenderListBuilder::addRenderableNode(QSGNode *node)
}
} // namespace
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/renderlistbuilder.h b/src/plugins/scenegraph/softwarecontext/renderlistbuilder.h
index 8607adfc67..333aac263e 100644
--- a/src/plugins/scenegraph/softwarecontext/renderlistbuilder.h
+++ b/src/plugins/scenegraph/softwarecontext/renderlistbuilder.h
@@ -32,6 +32,8 @@
#include <private/qsgadaptationlayer_p.h>
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
class AbstractSoftwareRenderer;
@@ -70,4 +72,6 @@ private:
}
+QT_END_NAMESPACE
+
#endif // RENDERLISTBUILDER_H
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp
index 0a10ffa339..0ad95148ec 100644
--- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp
@@ -37,6 +37,8 @@
#include <QElapsedTimer>
#include <private/qquickprofiler_p.h>
+QT_BEGIN_NAMESPACE
+
RenderLoop::RenderLoop()
{
sg = QSGContext::createDefaultContext();
@@ -212,3 +214,5 @@ void RenderLoop::handleUpdateRequest(QQuickWindow *window)
{
renderWindow(window);
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.h b/src/plugins/scenegraph/softwarecontext/renderloop.h
index f653f49aba..385ed63b3b 100644
--- a/src/plugins/scenegraph/softwarecontext/renderloop.h
+++ b/src/plugins/scenegraph/softwarecontext/renderloop.h
@@ -32,6 +32,8 @@
#include <private/qsgrenderloop_p.h>
+QT_BEGIN_NAMESPACE
+
class RenderLoop : public QSGRenderLoop
{
Q_OBJECT
@@ -74,4 +76,6 @@ public:
QImage grabContent;
};
+QT_END_NAMESPACE
+
#endif // RENDERLOOP_H
diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
index 7064bc854e..395361da86 100644
--- a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
+++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp
@@ -32,6 +32,8 @@
#include "context.h"
#include "pixmaprenderer.h"
+QT_BEGIN_NAMESPACE
+
SoftwareLayer::SoftwareLayer(QSGRenderContext *renderContext)
: m_item(0)
, m_context(renderContext)
@@ -245,3 +247,5 @@ void SoftwareLayer::grab()
if (m_recursive)
markDirtyTexture(); // Continuously update if 'live' and 'recursive'.
}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h
index dae42e0b96..95c05bf7e0 100644
--- a/src/plugins/scenegraph/softwarecontext/softwarelayer.h
+++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.h
@@ -33,6 +33,8 @@
#include <private/qsgadaptationlayer_p.h>
#include <private/qsgcontext_p.h>
+QT_BEGIN_NAMESPACE
+
namespace SoftwareContext {
class PixmapRenderer;
}
@@ -95,4 +97,6 @@ private:
bool m_dirtyTexture;
};
+QT_END_NAMESPACE
+
#endif // SOFTWARELAYER_H