diff options
| author | Tim Blechmann <tim@klingt.org> | 2024-02-07 13:25:40 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-07 10:48:47 +0000 |
| commit | c232e710fb5192db089034708f617c81d8b1bb63 (patch) | |
| tree | 3f14b00d972602cd12265ef163f4e8d395718b25 | |
| parent | c0c53854c996aedca7bec0214be4380c5ab5f866 (diff) | |
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
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 06bb491354489b06998306ea9de87da92314b397)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
117 files changed, 260 insertions, 173 deletions
diff --git a/src/animation/backend/skeleton.cpp b/src/animation/backend/skeleton.cpp index c3f98f7f2..d6c864674 100644 --- a/src/animation/backend/skeleton.cpp +++ b/src/animation/backend/skeleton.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DAnimation { namespace Animation { +using namespace Qt3DCore; + // Rather than store backend nodes for the individual joints, the // animation aspect operates on the vector of local poses as aggregated // by the skeleton. This allows us to animate a skeleton even when the diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp index 40edc5c42..00d9d6281 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -23,10 +23,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DAnimation { +using namespace Qt3DCore; + QAnimationAspectPrivate::QAnimationAspectPrivate() : QAbstractAspectPrivate() , m_handler(new Animation::Handler) diff --git a/src/core/jobs/calcboundingvolumejob.cpp b/src/core/jobs/calcboundingvolumejob.cpp index 5fab373b3..ab6af8928 100644 --- a/src/core/jobs/calcboundingvolumejob.cpp +++ b/src/core/jobs/calcboundingvolumejob.cpp @@ -190,6 +190,8 @@ bool CalculateBoundingVolumeJob::isRequired() void CalculateBoundingVolumeJob::run() { + using QBufferPrivate = Qt3DCore::QBufferPrivate; + // There's 2 bounding volume jobs, one here in Core, the other in Render. // - This one computes bounding volumes for entities that have QBoundingVolume // components and use QGeometryViews. 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) { diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp index 7732ad98f..459d41fe2 100644 --- a/src/input/backend/inputhandler.cpp +++ b/src/input/backend/inputhandler.cpp @@ -17,11 +17,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DInput { namespace Input { +using namespace Qt3DCore; + class InternalEventFilter : public QObject { public: @@ -347,7 +347,6 @@ bool InternalEventFilter::processKeyEvent(QObject *obj, QT_PREPEND_NAMESPACE(QKe return false; } - } // namespace Input } // namespace Qt3DInput diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index c503dded4..61d26a9fc 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -13,11 +13,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DInput { namespace Input { +using namespace Qt3DCore; + KeyboardHandler::KeyboardHandler() : BackendNode(QBackendNode::ReadWrite) , m_inputHandler(nullptr) diff --git a/src/input/backend/mousehandler.cpp b/src/input/backend/mousehandler.cpp index 1e19b191a..d425e712c 100644 --- a/src/input/backend/mousehandler.cpp +++ b/src/input/backend/mousehandler.cpp @@ -13,11 +13,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DInput { namespace Input { +using namespace Qt3DCore; + MouseHandler::MouseHandler() : BackendNode(ReadWrite) , m_inputHandler(nullptr) diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 4106b690a..4cbbe5fd2 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -63,10 +63,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DInput { +using namespace Qt3DCore; + QInputAspectPrivate::QInputAspectPrivate() : QAbstractAspectPrivate() , m_inputHandler(new Input::InputHandler()) diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 8a59e8086..ef3e58ede 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DInput { +using namespace Qt3DCore; + namespace { diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 31b3e609e..c2554dc4b 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -10,9 +10,10 @@ QT_BEGIN_NAMESPACE +namespace Qt3DInput { + using namespace Qt3DCore; -namespace Qt3DInput { /*! \internal */ QMouseHandlerPrivate::QMouseHandlerPrivate() : QComponentPrivate() diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp index d43cc77cc..ba9af0da5 100644 --- a/src/logic/executor.cpp +++ b/src/logic/executor.cpp @@ -11,11 +11,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DLogic { namespace Logic { +using namespace Qt3DCore; + Executor::Executor(QObject *parent) : QObject(parent) , m_scene(nullptr) diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp index 2fa783620..c12a0fbdc 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -19,10 +19,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DLogic { +using namespace Qt3DCore; + /*! \class Qt3DLogic::QLogicAspect \inherits Qt3DCore::QAbstractAspect diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp index 09e4ba3a8..802548994 100644 --- a/src/plugins/geometryloaders/default/basegeometryloader.cpp +++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp @@ -12,10 +12,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + Q_LOGGING_CATEGORY(BaseGeometryLoaderLog, "Qt3D.BaseGeometryLoader", QtWarningMsg) BaseGeometryLoader::BaseGeometryLoader() diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index 4b2c6a916..16d5d7e5d 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -21,10 +21,11 @@ QT_BEGIN_NAMESPACE static_cast<const wchar_t*>(static_cast<const void*>(string.utf16())) #endif -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + Q_LOGGING_CATEGORY(GLTFGeometryLoaderLog, "Qt3D.GLTFGeometryLoader", QtWarningMsg) #define KEY_ASSET QLatin1String("asset") diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index 9fa9c5f3c..4d32d1cc7 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -35,11 +35,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; -using namespace Qt3DExtras; namespace Qt3DRender { +using namespace Qt3DCore; +using namespace Qt3DExtras; + /*! \class Qt3DRender::AssimpImporter \inmodule Qt3DRender diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp index 0ccf4dc10..4f29cab06 100644 --- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp +++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp @@ -239,8 +239,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; -using namespace Qt3DExtras; namespace { @@ -287,6 +285,9 @@ Qt3DRender::QFilterKey *buildFilterKey(const QString &key, const QJsonValue &val namespace Qt3DRender { +using namespace Qt3DCore; +using namespace Qt3DExtras; + Q_LOGGING_CATEGORY(GLTFImporterLog, "Qt3D.GLTFImport", QtWarningMsg); class GLTFRawTextureImage : public QAbstractTextureImage diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index e0a60fd4a..12c979019 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -186,11 +186,11 @@ inline void promoteColorsToRGBA(QJsonObject *obj) QT_BEGIN_NAMESPACE +namespace Qt3DRender { + using namespace Qt3DCore; using namespace Qt3DExtras; -namespace Qt3DRender { - Q_LOGGING_CATEGORY(GLTFExporterLog, "Qt3D.GLTFExport", QtWarningMsg) const QString MATERIAL_DIFFUSE_COLOR = QStringLiteral("kd"); diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index 2271bdda3..4028ecac1 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -12,12 +12,13 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; + /*! \namespace Qt3DRender::Quick \inmodule Qt3DScene2D diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp index 4afe04382..77d875cb5 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -35,7 +35,6 @@ QT_BEGIN_NAMESPACE #define GL_DEPTH24_STENCIL8 0x88F0 #endif -using namespace Qt3DRender::Quick; namespace Qt3DRender { @@ -43,6 +42,8 @@ namespace Render { namespace Quick { +using namespace Qt3DRender::Quick; + Q_GLOBAL_STATIC(QThread, renderThread) Q_GLOBAL_STATIC(QAtomicInt, renderThreadClientCount) diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp index e87f5cf7d..f1644d366 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp @@ -9,12 +9,13 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; + class RenderControl : public QQuickRenderControl { public: diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp index 108f1c5f6..98a1eed8f 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp @@ -10,12 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Quick { +using namespace Qt3DCore; /*! \internal diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt index 32e1a4bd2..cc5012671 100644 --- a/src/render/CMakeLists.txt +++ b/src/render/CMakeLists.txt @@ -311,10 +311,16 @@ qt_internal_add_module(3DRender Qt::Concurrent Qt::CorePrivate Qt::3DCorePrivate -) -# QTransform conflicts -set_target_properties(3DRender PROPERTIES UNITY_BUILD OFF) + NO_UNITY_BUILD_SOURCES + # name clashes with internal linkage + backend/pointsvisitor.cpp + backend/segmentsvisitor.cpp + framegraph/frustumculling.cpp + jobs/frustumcullingjob.cpp + io/qsceneimportfactory.cpp + io/qsceneexportfactory.cpp +) # Resources: set(materialsystem_resource_files diff --git a/src/render/backend/backendnode.cpp b/src/render/backend/backendnode.cpp index 7ad6e46cf..06e505888 100644 --- a/src/render/backend/backendnode.cpp +++ b/src/render/backend/backendnode.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + BackendNode::BackendNode(Mode mode) : QBackendNode(mode) , m_renderer(nullptr) diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 22f693317..374abec47 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -19,11 +19,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; namespace { diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index e83b98e29..2f14e23e7 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -34,11 +34,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; EntityPrivate::EntityPrivate() : Qt3DCore::QBackendNodePrivate(Entity::ReadOnly) diff --git a/src/render/backend/entityaccumulator.cpp b/src/render/backend/entityaccumulator.cpp index e1b84c0af..43dff651c 100644 --- a/src/render/backend/entityaccumulator.cpp +++ b/src/render/backend/entityaccumulator.cpp @@ -4,8 +4,10 @@ #include "entityaccumulator_p.h" #include "entityvisitor_p.h" -QT_USE_NAMESPACE -using namespace Qt3DRender::Render; +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { +namespace Render { namespace { @@ -61,3 +63,8 @@ QList<Entity *> EntityAccumulator::apply(Entity *root) const a.apply(root); return a.m_entities; } + +} // namespace Render +} // namespace Qt3DRender + +QT_END_NAMESPACE diff --git a/src/render/backend/entityvisitor.cpp b/src/render/backend/entityvisitor.cpp index e0e392159..835512e3a 100644 --- a/src/render/backend/entityvisitor.cpp +++ b/src/render/backend/entityvisitor.cpp @@ -5,8 +5,10 @@ #include <Qt3DRender/private/managers_p.h> #include <Qt3DRender/private/nodemanagers_p.h> -QT_USE_NAMESPACE -using namespace Qt3DRender::Render; +QT_BEGIN_NAMESPACE + +namespace Qt3DRender { +namespace Render { EntityVisitor::EntityVisitor(NodeManagers *manager) : m_manager(manager) @@ -75,3 +77,8 @@ bool EntityVisitor::apply(Entity *root) { return true; } + +} // namespace Render +} // namespace Qt3DRender + +QT_END_NAMESPACE diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp index 3cc141e32..0cdf0b938 100644 --- a/src/render/backend/layer.cpp +++ b/src/render/backend/layer.cpp @@ -9,11 +9,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Layer::Layer() : BackendNode() , m_recursive(false) diff --git a/src/render/backend/levelofdetail.cpp b/src/render/backend/levelofdetail.cpp index ad800ffd4..517c85d64 100644 --- a/src/render/backend/levelofdetail.cpp +++ b/src/render/backend/levelofdetail.cpp @@ -10,11 +10,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + LevelOfDetail::LevelOfDetail() : BackendNode(BackendNode::ReadWrite) , m_currentIndex(0) diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp index ab2cef42e..70d6425fd 100644 --- a/src/render/backend/rendersettings.cpp +++ b/src/render/backend/rendersettings.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderSettings::RenderSettings() : BackendNode() , m_renderPolicy(QRenderSettings::OnDemand) diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 5db06e929..8d7463e4f 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderTarget::RenderTarget() : BackendNode() , m_dirty(false) diff --git a/src/render/backend/rendertargetoutput.cpp b/src/render/backend/rendertargetoutput.cpp index 045ab6c3d..37bbd1c86 100644 --- a/src/render/backend/rendertargetoutput.cpp +++ b/src/render/backend/rendertargetoutput.cpp @@ -8,11 +8,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderTargetOutput::RenderTargetOutput() : BackendNode() { diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp index bca31a8ef..629ef51b3 100644 --- a/src/render/backend/transform.cpp +++ b/src/render/backend/transform.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Transform::Transform() : BackendNode(ReadWrite) , m_rotation() diff --git a/src/render/backend/trianglesvisitor.cpp b/src/render/backend/trianglesvisitor.cpp index 54172bdf4..b5b7e2664 100644 --- a/src/render/backend/trianglesvisitor.cpp +++ b/src/render/backend/trianglesvisitor.cpp @@ -18,12 +18,13 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + namespace { bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept diff --git a/src/render/framegraph/blitframebuffer.cpp b/src/render/framegraph/blitframebuffer.cpp index 61bb28754..0398abe81 100644 --- a/src/render/framegraph/blitframebuffer.cpp +++ b/src/render/framegraph/blitframebuffer.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + BlitFramebuffer::BlitFramebuffer() : FrameGraphNode(FrameGraphNode::BlitFramebuffer) , m_sourceRenderTargetId(Qt3DCore::QNodeId()) diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp index 57210d277..19b986fc4 100644 --- a/src/render/framegraph/cameraselectornode.cpp +++ b/src/render/framegraph/cameraselectornode.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + CameraSelector::CameraSelector() : FrameGraphNode(FrameGraphNode::CameraSelector) { diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp index 61e91b9e5..c279f67d9 100644 --- a/src/render/framegraph/clearbuffers.cpp +++ b/src/render/framegraph/clearbuffers.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + static QVector4D vec4dFromColor(const QColor &color) { if (!color.isValid()) diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp index 16847128d..f49441033 100644 --- a/src/render/framegraph/framegraphvisitor.cpp +++ b/src/render/framegraph/framegraphvisitor.cpp @@ -12,11 +12,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + FrameGraphVisitor::FrameGraphVisitor(const FrameGraphManager *manager) : m_manager(manager) { diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp index b8d439f99..ae7fe5f9d 100644 --- a/src/render/framegraph/layerfilternode.cpp +++ b/src/render/framegraph/layerfilternode.cpp @@ -8,11 +8,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + LayerFilterNode::LayerFilterNode() : FrameGraphNode(FrameGraphNode::LayerFilter) , m_filterMode(QLayerFilter::AcceptAnyMatchingLayers) diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp index 321834910..211ca7582 100644 --- a/src/render/framegraph/nodraw.cpp +++ b/src/render/framegraph/nodraw.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + NoDraw::NoDraw() : FrameGraphNode(FrameGraphNode::NoDraw) { diff --git a/src/render/framegraph/nopicking.cpp b/src/render/framegraph/nopicking.cpp index 3e062e7c4..d91b855a0 100644 --- a/src/render/framegraph/nopicking.cpp +++ b/src/render/framegraph/nopicking.cpp @@ -5,11 +5,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + NoPicking::NoPicking() : FrameGraphNode(FrameGraphNode::NoPicking) { diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index 5319abb5f..48f3e3cb4 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -11,7 +11,6 @@ #include <QList> #include <QQueue> -using namespace Qt3DCore; QT_BEGIN_NAMESPACE @@ -340,6 +339,8 @@ QFrameGraphNode *QFrameGraphNode::parentFrameGraphNode() const */ QList<QFrameGraphNode *> QFrameGraphNodePrivate::childFrameGraphNodes() const { + using namespace Qt3DCore; + Q_Q(const QFrameGraphNode); QList<QFrameGraphNode *> result; QQueue<QNode *> queue; diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index d66ff43d9..dec5170cd 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -9,10 +9,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderPassFilter \inmodule Qt3DRender diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index fc998668e..140735746 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QRenderStateSetPrivate::QRenderStateSetPrivate() : QFrameGraphNodePrivate() { diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index 64a05fce5..a6b04426d 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -8,9 +8,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderTargetSelector \inmodule Qt3DRender diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index 4f115cd00..2e2e4d5d4 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -5,10 +5,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QSortPolicyPrivate::QSortPolicyPrivate() : QFrameGraphNodePrivate() { diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index a94bad2c4..e71a18b3a 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QTechniqueFilterPrivate::QTechniqueFilterPrivate() : QFrameGraphNodePrivate() { diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp index 2975affe9..39fc20967 100644 --- a/src/render/framegraph/renderpassfilternode.cpp +++ b/src/render/framegraph/renderpassfilternode.cpp @@ -9,11 +9,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderPassFilter::RenderPassFilter() : FrameGraphNode(FrameGraphNode::RenderPassFilter) { diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp index 8e6dfa5eb..0da57fd0c 100644 --- a/src/render/framegraph/rendersurfaceselector.cpp +++ b/src/render/framegraph/rendersurfaceselector.cpp @@ -10,7 +10,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace { @@ -33,6 +32,8 @@ QSurface *surfaceFromQObject(QObject *o) namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderSurfaceSelector::RenderSurfaceSelector() : FrameGraphNode(FrameGraphNode::Surface) , m_surfaceObj(nullptr) diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp index 4abf3d484..9f6f6fb03 100644 --- a/src/render/framegraph/rendertargetselectornode.cpp +++ b/src/render/framegraph/rendertargetselectornode.cpp @@ -11,11 +11,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderTargetSelector::RenderTargetSelector() : FrameGraphNode(FrameGraphNode::RenderTarget) { diff --git a/src/render/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp index 0a672381b..c575e759a 100644 --- a/src/render/framegraph/sortcriterion.cpp +++ b/src/render/framegraph/sortcriterion.cpp @@ -7,11 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + SortCriterion::SortCriterion() : BackendNode() , m_type(QSortCriterion::StateChangeCost) diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp index 9c4936c8d..059f68a7f 100644 --- a/src/render/framegraph/sortpolicy.cpp +++ b/src/render/framegraph/sortpolicy.cpp @@ -6,11 +6,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + SortPolicy::SortPolicy() : FrameGraphNode(FrameGraphNode::SortMethod) { diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp index 4f7804c8c..1c8f98620 100644 --- a/src/render/framegraph/statesetnode.cpp +++ b/src/render/framegraph/statesetnode.cpp @@ -11,11 +11,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + StateSetNode::StateSetNode() : FrameGraphNode(FrameGraphNode::StateSet) { diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp index 1884939ef..61037c7f5 100644 --- a/src/render/framegraph/techniquefilternode.cpp +++ b/src/render/framegraph/techniquefilternode.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + TechniqueFilter::TechniqueFilter() : FrameGraphNode(FrameGraphNode::TechniqueFilter) { diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 735dee77f..660d836d8 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -7,11 +7,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + ViewportNode::ViewportNode() : FrameGraphNode(FrameGraphNode::Viewport) , m_xMin(0.0f) diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index b8508cef1..027cb78f4 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -155,7 +155,6 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace { @@ -234,6 +233,8 @@ QStringList dumpSGFilterState(Qt3DRender::Render::TechniqueManager *manager, } namespace Qt3DRender { +using namespace Qt3DCore; + #define CreateSynchronizerJobPtr(lambda, type) \ Render::SynchronizerJobPtr::create(lambda, type, #type) diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp index dae4f3f55..fd914bb0e 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -7,10 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QRenderTarget \brief The QRenderTarget class encapsulates a target (usually a frame buffer diff --git a/src/render/geometry/armature.cpp b/src/render/geometry/armature.cpp index 6ca2fe209..658c56a9f 100644 --- a/src/render/geometry/armature.cpp +++ b/src/render/geometry/armature.cpp @@ -10,11 +10,12 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Armature::Armature() : BackendNode(Qt3DCore::QBackendNode::ReadOnly) { diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp index c755f60f0..b0abde9bf 100644 --- a/src/render/geometry/attribute.cpp +++ b/src/render/geometry/attribute.cpp @@ -7,11 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Attribute::Attribute() : BackendNode(ReadOnly) , m_nameId(0) diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 880a36690..f4f4be411 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -10,11 +10,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Geometry::Geometry() : BackendNode(ReadWrite) , m_geometryDirty(false) diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index d1f1c2993..a20963dee 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -14,11 +14,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + GeometryRenderer::GeometryRenderer() : BackendNode(ReadWrite) , m_instanceCount(0) diff --git a/src/render/geometry/joint.cpp b/src/render/geometry/joint.cpp index 828f170ab..b58b5aba2 100644 --- a/src/render/geometry/joint.cpp +++ b/src/render/geometry/joint.cpp @@ -10,11 +10,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Joint::Joint() : BackendNode(Qt3DCore::QBackendNode::ReadOnly) , m_localPose() diff --git a/src/render/geometry/pickingproxy.cpp b/src/render/geometry/pickingproxy.cpp index 62f40b4af..999157814 100644 --- a/src/render/geometry/pickingproxy.cpp +++ b/src/render/geometry/pickingproxy.cpp @@ -11,11 +11,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + PickingProxy::PickingProxy() : BackendNode(ReadWrite) , m_instanceCount(0) diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 7c7f8f7a7..1b0c9d79a 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QGeometryRendererPrivate::QGeometryRendererPrivate() : Qt3DCore::QBoundingVolumePrivate() , m_instanceCount(1) diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 20352d0cf..919905e9e 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -28,10 +28,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { +using namespace Qt3DCore; + Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, geometryLoader, (QGeometryLoaderFactory_iid, QLatin1String("/geometryloaders"), Qt::CaseInsensitive)) QMeshPrivate::QMeshPrivate() diff --git a/src/render/geometry/qpickingproxy.cpp b/src/render/geometry/qpickingproxy.cpp index 62db2fd2e..05df963cb 100644 --- a/src/render/geometry/qpickingproxy.cpp +++ b/src/render/geometry/qpickingproxy.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QPickingProxyPrivate::QPickingProxyPrivate() : Qt3DCore::QBoundingVolumePrivate() { diff --git a/src/render/geometry/skeleton.cpp b/src/render/geometry/skeleton.cpp index ba2ed6eed..12425bee3 100644 --- a/src/render/geometry/skeleton.cpp +++ b/src/render/geometry/skeleton.cpp @@ -18,11 +18,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Skeleton::Skeleton() : BackendNode(Qt3DCore::QBackendNode::ReadWrite) , m_status(Qt3DCore::QSkeletonLoader::NotReady) diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 9f82fc7d4..f18a9efb9 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -18,10 +18,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + /*! \class Qt3DRender::QSceneLoader \inmodule Qt3DRender diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index d06486bfd..8e0cdfeef 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -13,11 +13,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Scene::Scene() : BackendNode(QBackendNode::ReadWrite) , m_sceneManager(nullptr) diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp index 0e8a2ee0c..0fe7f5d0f 100644 --- a/src/render/jobs/calcboundingvolumejob.cpp +++ b/src/render/jobs/calcboundingvolumejob.cpp @@ -30,11 +30,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + namespace { class BoundingVolumeCalculator diff --git a/src/render/jobs/raycastingjob.cpp b/src/render/jobs/raycastingjob.cpp index 50931b031..701b6f7b6 100644 --- a/src/render/jobs/raycastingjob.cpp +++ b/src/render/jobs/raycastingjob.cpp @@ -19,9 +19,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DRender; +namespace Qt3DRender { +namespace Render { + using namespace Qt3DRender::RayCasting; -using namespace Render; namespace { @@ -50,8 +51,7 @@ public: } // anonymous - -class Qt3DRender::Render::RayCastingJobPrivate : public Qt3DCore::QAspectJobPrivate +class RayCastingJobPrivate : public Qt3DCore::QAspectJobPrivate { public: RayCastingJobPrivate(RayCastingJob *q) : q_ptr(q) { } @@ -284,4 +284,7 @@ void RayCastingJob::dispatchHits(RayCaster *rayCaster, const PickingUtils::HitLi d->dispatches.push_back({rayCaster, hits}); } +} // namespace Render +} // namespace Qt3DRender + QT_END_NAMESPACE diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp index a832e8790..d515cf965 100644 --- a/src/render/jobs/renderviewjobutils.cpp +++ b/src/render/jobs/renderviewjobutils.cpp @@ -20,11 +20,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + /*! \internal Searches the best matching Technique from \a effect specified. diff --git a/src/render/jobs/uniformblockbuilder.cpp b/src/render/jobs/uniformblockbuilder.cpp index 132c31d9e..462d66176 100644 --- a/src/render/jobs/uniformblockbuilder.cpp +++ b/src/render/jobs/uniformblockbuilder.cpp @@ -10,11 +10,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + namespace { const QString blockArray = QStringLiteral("[%1]"); diff --git a/src/render/lights/environmentlight.cpp b/src/render/lights/environmentlight.cpp index 59a1436f2..c35bd21fd 100644 --- a/src/render/lights/environmentlight.cpp +++ b/src/render/lights/environmentlight.cpp @@ -7,11 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + QNodeId EnvironmentLight::shaderData() const { return m_shaderDataId; diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp index 7f12caace..97c3ceb2a 100644 --- a/src/render/lights/light.cpp +++ b/src/render/lights/light.cpp @@ -11,11 +11,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + QNodeId Light::shaderData() const { return m_shaderDataId; diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp index 94b700cf4..49a03d753 100644 --- a/src/render/materialsystem/effect.cpp +++ b/src/render/materialsystem/effect.cpp @@ -12,11 +12,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Effect::Effect() : BackendNode() { diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index 24fd40121..7d0b74ead 100644 --- a/src/render/materialsystem/filterkey.cpp +++ b/src/render/materialsystem/filterkey.cpp @@ -6,11 +6,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + FilterKey::FilterKey() : BackendNode() { diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index 10737d647..16ee6f62b 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -10,13 +10,13 @@ #include "qeffect.h" #include <Qt3DRender/private/qmaterial_p.h> -using namespace Qt3DCore; - QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Material::Material() : BackendNode() { diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 9ba592dff..5a6450cd6 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -13,11 +13,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Parameter::Parameter() : BackendNode() , m_nameId(-1) diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp index 6a5ec71b1..65376f801 100644 --- a/src/render/materialsystem/qtechnique.cpp +++ b/src/render/materialsystem/qtechnique.cpp @@ -8,10 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QTechniquePrivate::QTechniquePrivate() : QNodePrivate() { diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp index a3aadfb2b..74f55884e 100644 --- a/src/render/materialsystem/renderpass.cpp +++ b/src/render/materialsystem/renderpass.cpp @@ -15,11 +15,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + RenderPass::RenderPass() : BackendNode() { diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 1fc42a255..a71fd19f3 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -16,10 +16,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { + +using namespace Qt3DCore; const int Shader::modelMatrixNameId = StringToInt::lookupId(QLatin1String("modelMatrix")); const int Shader::viewMatrixNameId = StringToInt::lookupId(QLatin1String("viewMatrix")); const int Shader::projectionMatrixNameId = StringToInt::lookupId(QLatin1String("projectionMatrix")); diff --git a/src/render/materialsystem/shaderbuilder.cpp b/src/render/materialsystem/shaderbuilder.cpp index c2916c28d..afe666f62 100644 --- a/src/render/materialsystem/shaderbuilder.cpp +++ b/src/render/materialsystem/shaderbuilder.cpp @@ -77,11 +77,11 @@ private: Q_GLOBAL_STATIC(GlobalShaderPrototypes, qt3dGlobalShaderPrototypes) -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + QString ShaderBuilder::getPrototypesFile() { return qt3dGlobalShaderPrototypes->prototypesFile(); diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp index 365c1929d..b1e8e0f00 100644 --- a/src/render/materialsystem/shaderdata.cpp +++ b/src/render/materialsystem/shaderdata.cpp @@ -13,11 +13,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + namespace { const int qNodeIdTypeId = qMetaTypeId<Qt3DCore::QNodeId>(); diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp index ef691bab0..89d0f5b39 100644 --- a/src/render/materialsystem/technique.cpp +++ b/src/render/materialsystem/technique.cpp @@ -19,11 +19,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Technique::Technique() : BackendNode() , m_isCompatibleWithRenderer(false) diff --git a/src/render/picking/raycaster.cpp b/src/render/picking/raycaster.cpp index 05f84f9d1..a4968e41d 100644 --- a/src/render/picking/raycaster.cpp +++ b/src/render/picking/raycaster.cpp @@ -12,12 +12,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { - namespace Render { +using namespace Qt3DCore; + RayCaster::RayCaster() : BackendNode(QBackendNode::ReadWrite) { diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp index 4d3d20828..7d0fb4291 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -7,10 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QAbstractTexturePrivate::QAbstractTexturePrivate() : QNodePrivate() , m_target(QAbstractTexture::Target2D) diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 8f3c059d4..df428cb10 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -7,10 +7,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; namespace Qt3DRender { +using namespace Qt3DCore; + QTextureImageDataGenerator::~QTextureImageDataGenerator() = default; /*! diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index 0536b6c8e..5b33b8627 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -13,11 +13,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + Texture::Texture() // We need backend -> frontend notifications to update the status of the texture : BackendNode(ReadWrite) diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 15e4712ce..cfc519fa5 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -8,11 +8,11 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DCore; - namespace Qt3DRender { namespace Render { +using namespace Qt3DCore; + TextureImage::TextureImage() : BackendNode(ReadWrite) , m_dirty(false) |