build system: fix unity builds

we need to avoid polluting the global (or qt) namespace by moving the
`using namespace Qt3DXXX` statements into the namespace where it's
actually required.
furthermore:
* replace `QT_USE_NAMESPACE` with `QT_BEGIN_NAMESPACE`/`END` pair
* exclude some translation units with name clashes inside anonymous
namespaces

Change-Id: I5301b55c6a0c7079602c759f5bde152354149880
Pick-to: 6.7
Reviewed-by: Mike Krus <mike.krus@kdab.com>

28 files changed, 57 insertions, 45 deletions

diff --git a/src/extras/defaults/qabstractspritesheet.cpp b/src/extras/defaults/qabstractspritesheet.cpp
index 88498d5f2..ad7de0491 100644
--- a/src/extras/defaults/qabstractspritesheet.cpp
+++ b/src/extras/defaults/qabstractspritesheet.cpp
@@ -8,10 +8,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 QAbstractSpriteSheetPrivate::QAbstractSpriteSheetPrivate()
     : QNodePrivate()
     , m_texture(nullptr)
diff --git a/src/extras/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp
index 6fbdc0469..d6d401f25 100644
--- a/src/extras/defaults/qdiffusemapmaterial.cpp
+++ b/src/extras/defaults/qdiffusemapmaterial.cpp
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate()
     : QMaterialPrivate()
     , m_diffuseMapEffect(new QEffect())
diff --git a/src/extras/defaults/qdiffusespecularmapmaterial.cpp b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
index de343e1e7..d62211bb3 100644
--- a/src/extras/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate()
     : QMaterialPrivate()
     , m_diffuseSpecularMapEffect(new QEffect())
diff --git a/src/extras/defaults/qdiffusespecularmaterial.cpp b/src/extras/defaults/qdiffusespecularmaterial.cpp
index e8f60cd73..4508a0dd9 100644
--- a/src/extras/defaults/qdiffusespecularmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmaterial.cpp
@@ -24,10 +24,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QDiffuseSpecularMaterialPrivate::QDiffuseSpecularMaterialPrivate()
     : QMaterialPrivate()
     , m_effect(new QEffect())
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp
index f1594c135..007f564e3 100644
--- a/src/extras/defaults/qforwardrenderer.cpp
+++ b/src/extras/defaults/qforwardrenderer.cpp
@@ -22,10 +22,10 @@ static void initResources()
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QForwardRendererPrivate::QForwardRendererPrivate()
     : QTechniqueFilterPrivate()
     , m_surfaceSelector(new QRenderSurfaceSelector)
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index 86752a32c..544b2ae7f 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -19,10 +19,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QMetalRoughMaterialPrivate::QMetalRoughMaterialPrivate()
     : QMaterialPrivate()
     , m_baseColorParameter(new QParameter(QStringLiteral("baseColor"), QColor::fromString("grey")))
diff --git a/src/extras/defaults/qmorphphongmaterial.cpp b/src/extras/defaults/qmorphphongmaterial.cpp
index ad2b17dc8..58bd4077a 100644
--- a/src/extras/defaults/qmorphphongmaterial.cpp
+++ b/src/extras/defaults/qmorphphongmaterial.cpp
@@ -18,10 +18,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QMorphPhongMaterialPrivate::QMorphPhongMaterialPrivate()
     : QMaterialPrivate()
     , m_phongEffect(new QEffect())
diff --git a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
index 62ce86b62..19be3cfa9 100644
--- a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 
 QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate()
     : QNormalDiffuseMapMaterialPrivate()
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
index c77f954d9..13b6393f5 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
@@ -19,10 +19,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate()
     : QMaterialPrivate()
     , m_normalDiffuseEffect(new QEffect())
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
index 22713da40..6314e7952 100644
--- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate()
     : QMaterialPrivate()
     , m_normalDiffuseSpecularEffect(new QEffect())
diff --git a/src/extras/defaults/qpervertexcolormaterial.cpp b/src/extras/defaults/qpervertexcolormaterial.cpp
index 89e0ccbbf..ef4b26ad7 100644
--- a/src/extras/defaults/qpervertexcolormaterial.cpp
+++ b/src/extras/defaults/qpervertexcolormaterial.cpp
@@ -18,10 +18,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
     : QMaterialPrivate()
     , m_vertexEffect(new QEffect())
diff --git a/src/extras/defaults/qphongalphamaterial.cpp b/src/extras/defaults/qphongalphamaterial.cpp
index 716451619..fa50302ec 100644
--- a/src/extras/defaults/qphongalphamaterial.cpp
+++ b/src/extras/defaults/qphongalphamaterial.cpp
@@ -22,10 +22,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QPhongAlphaMaterialPrivate::QPhongAlphaMaterialPrivate()
     : QMaterialPrivate()
     , m_phongEffect(new QEffect())
diff --git a/src/extras/defaults/qphongmaterial.cpp b/src/extras/defaults/qphongmaterial.cpp
index cb6c1f32d..ed85649dc 100644
--- a/src/extras/defaults/qphongmaterial.cpp
+++ b/src/extras/defaults/qphongmaterial.cpp
@@ -20,10 +20,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QPhongMaterialPrivate::QPhongMaterialPrivate()
     : QMaterialPrivate()
     , m_phongEffect(new QEffect())
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp
index 0b3bcf0d9..bcf5a601a 100644
--- a/src/extras/defaults/qskyboxentity.cpp
+++ b/src/extras/defaults/qskyboxentity.cpp
@@ -22,11 +22,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
-using namespace Qt3DRender;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+using namespace Qt3DRender;
+
 QSkyboxEntityPrivate::QSkyboxEntityPrivate()
     : QEntityPrivate()
     , m_effect(new QEffect())
diff --git a/src/extras/defaults/qspritegrid.cpp b/src/extras/defaults/qspritegrid.cpp
index f916c31a2..f0f09f1b2 100644
--- a/src/extras/defaults/qspritegrid.cpp
+++ b/src/extras/defaults/qspritegrid.cpp
@@ -8,10 +8,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 QSpriteGridPrivate::QSpriteGridPrivate()
     : QAbstractSpriteSheetPrivate()
     , m_numColumns(1)
diff --git a/src/extras/defaults/qspritesheet.cpp b/src/extras/defaults/qspritesheet.cpp
index 89f54687f..ed20fda1e 100644
--- a/src/extras/defaults/qspritesheet.cpp
+++ b/src/extras/defaults/qspritesheet.cpp
@@ -9,10 +9,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 QSpriteSheetPrivate::QSpriteSheetPrivate()
     : QAbstractSpriteSheetPrivate()
 {
diff --git a/src/extras/defaults/qspritesheetitem.cpp b/src/extras/defaults/qspritesheetitem.cpp
index 04df89dfc..85733a84d 100644
--- a/src/extras/defaults/qspritesheetitem.cpp
+++ b/src/extras/defaults/qspritesheetitem.cpp
@@ -6,10 +6,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 QSpriteSheetItemPrivate::QSpriteSheetItemPrivate()
     : QNodePrivate()
     , m_x(0)
diff --git a/src/extras/defaults/qtexturematerial.cpp b/src/extras/defaults/qtexturematerial.cpp
index 1fd5a525f..8ee3ee94b 100644
--- a/src/extras/defaults/qtexturematerial.cpp
+++ b/src/extras/defaults/qtexturematerial.cpp
@@ -19,10 +19,10 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DRender;
-
 namespace Qt3DExtras {
 
+using namespace Qt3DRender;
+
 QTextureMaterialPrivate::QTextureMaterialPrivate()
     : QMaterialPrivate()
     , m_textureEffect(new QEffect)
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index 606da49b6..416628adb 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -31,10 +31,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 int faceCount(int slices, int rings, int capCount)
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index 83661e983..e8a579ad7 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -8,15 +8,13 @@
 #include <Qt3DCore/qbuffer.h>
 #include <Qt3DCore/private/corelogging_p.h>
 
-#include <limits>
-
-
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace  Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 enum PlaneNormal {
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index 7cb2624d8..bcf3d3e47 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -17,10 +17,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 int faceCount(int slices, int rings)
diff --git a/src/extras/geometries/qcylindergeometryview.cpp b/src/extras/geometries/qcylindergeometryview.cpp
index 1c1d392ff..b76223ee1 100644
--- a/src/extras/geometries/qcylindergeometryview.cpp
+++ b/src/extras/geometries/qcylindergeometryview.cpp
@@ -17,10 +17,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 /*!
  * \qmltype CylinderGeometryView
  * \instantiates Qt3DExtras::QCylinderGeometryView
diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp
index a48f50f58..ccd020acd 100644
--- a/src/extras/geometries/qcylindermesh.cpp
+++ b/src/extras/geometries/qcylindermesh.cpp
@@ -17,10 +17,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 /*!
  * \qmltype CylinderMesh
  * \instantiates Qt3DExtras::QCylinderMesh
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index 150d83bdf..6514bb36c 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -11,10 +11,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace  Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 QByteArray createPlaneVertexData(float w, float h, const QSize &resolution, bool mirrored)
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index dee758845..8ecbefb7a 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -16,10 +16,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace  Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 QByteArray createSphereMeshVertexData(float radius, int rings, int slices)
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index 05717c300..000589ffa 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -13,10 +13,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace  Qt3DExtras {
 
+using namespace Qt3DCore;
+
 namespace {
 
 int vertexCount(int requestedRings, int requestedSlices)
diff --git a/src/extras/text/qdistancefieldglyphcache.cpp b/src/extras/text/qdistancefieldglyphcache.cpp
index 1294cf53a..ae55a07c7 100644
--- a/src/extras/text/qdistancefieldglyphcache.cpp
+++ b/src/extras/text/qdistancefieldglyphcache.cpp
@@ -19,10 +19,11 @@ QT_BEGIN_NAMESPACE
 
 #define DEFAULT_IMAGE_PADDING 1
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 // ref-count glyphs and keep track of where they are stored
 class StoredGlyph {
 public:
diff --git a/src/extras/text/qtextureatlas.cpp b/src/extras/text/qtextureatlas.cpp
index 85ed57d97..951f0cf31 100644
--- a/src/extras/text/qtextureatlas.cpp
+++ b/src/extras/text/qtextureatlas.cpp
@@ -8,10 +8,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DExtras {
 
+using namespace Qt3DCore;
+
 QTextureAtlasData::QTextureAtlasData(int w, int h, QImage::Format fmt)
     : m_image(w, h, fmt)
 {