Replace uic namespace with qt3ds namespace

Task-number: QT3DS-18
Change-Id: I3a39265bb47930e4f4924aab4b098a40f15c5b0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

5 files changed, 19 insertions, 19 deletions

diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.cpp b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
index 99748916..84e83ed0 100644
--- a/tests/auto/runtime/Qt3DSRenderTestBase.cpp
+++ b/tests/auto/runtime/Qt3DSRenderTestBase.cpp
@@ -28,7 +28,7 @@
 
 #include "Qt3DSRenderTestBase.h"
 
-using namespace uic::render;
+using namespace qt3ds::render;
 
 namespace qt3ds {
 namespace render {
@@ -40,11 +40,11 @@ NVRenderTestBase::~NVRenderTestBase()
 
 bool NVRenderTestBase::initializeUICRenderer(QSurfaceFormat format)
 {
-    m_coreFactory = uic::render::IUICRenderFactoryCore::CreateRenderFactoryCore("", m_windowSystem,
+    m_coreFactory = qt3ds::render::IUICRenderFactoryCore::CreateRenderFactoryCore("", m_windowSystem,
                                                                                 m_timeProvider);
     m_factory = m_coreFactory->CreateRenderFactory(format);
     m_rc = m_factory->GetUICRenderContext();
-    m_renderImpl = new uic::render::CUICRendererImpl(*m_rc);
+    m_renderImpl = new qt3ds::render::CUICRendererImpl(*m_rc);
 
     QString versionString;
     switch ((QT3DSU32)m_rc->GetRenderContext().GetRenderContextType()) {
diff --git a/tests/auto/runtime/Qt3DSRenderTestBase.h b/tests/auto/runtime/Qt3DSRenderTestBase.h
index 40ac36fb..3bef8fd5 100644
--- a/tests/auto/runtime/Qt3DSRenderTestBase.h
+++ b/tests/auto/runtime/Qt3DSRenderTestBase.h
@@ -43,7 +43,7 @@
 #include "UICRendererImpl.h"
 #include "UICMetadata.h"
 
-namespace uic {
+namespace qt3ds {
 namespace render {
 class IUICRenderer;
 class CUICRendererImpl;
@@ -144,16 +144,16 @@ namespace render {
         }
 
         bool initializeUICRenderer(QSurfaceFormat format);
-        uic::render::CUICRendererImpl *uicRenderer();
+        qt3ds::render::CUICRendererImpl *uicRenderer();
         Q3DStudio::IRuntimeMetaData *NVRenderTestBase::metadata();
 
     private:
 
-        NVScopedRefCounted<uic::render::IUICRenderFactoryCore> m_coreFactory;
-        NVScopedRefCounted<uic::render::IUICRenderFactory> m_factory;
-        NVScopedRefCounted<uic::render::IUICRenderContext> m_rc;
+        NVScopedRefCounted<qt3ds::render::IUICRenderFactoryCore> m_coreFactory;
+        NVScopedRefCounted<qt3ds::render::IUICRenderFactory> m_factory;
+        NVScopedRefCounted<qt3ds::render::IUICRenderContext> m_rc;
         qt3ds::foundation::NVScopedReleasable<Q3DStudio::IRuntimeMetaData> m_metaData;
-        uic::render::CUICRendererImpl *m_renderImpl;
+        qt3ds::render::CUICRendererImpl *m_renderImpl;
 
         SNullTimeProvider m_timeProvider;
         SNullWindowSystem m_windowSystem;
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
index 6e5dcf00..eaad4ff8 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
@@ -54,7 +54,7 @@
 #include <QString>
 #include <QTextStream>
 
-using namespace uic::render;
+using namespace qt3ds::render;
 
 #include <string>
 
@@ -115,7 +115,7 @@ struct CustomTestParams
     Option<UICDM::SMetaDataCustomMaterial> metaMaterial;
     SImage dummyImages[SShaderDefaultMaterialKeyProperties::ImageMapCount];
     eastl::vector<SRenderableImage*> renderableImages;
-    uic::render::CUICRendererImpl *render;
+    qt3ds::render::CUICRendererImpl *render;
     SImage iblLightProbe;
     NVRenderTexture2D *texture;
 
@@ -230,7 +230,7 @@ static CustomTestKey randomizeTestKey()
     return *reinterpret_cast<CustomTestKey*>(&v);
 }
 
-CustomTestParams *generateTest(uic::render::CUICRendererImpl *renderImpl,
+CustomTestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl,
                          NVRenderContext *context, CustomTestKey key, SCustomMaterial *material)
 {
     CustomTestParams *params = new CustomTestParams(*renderImpl);
@@ -442,7 +442,7 @@ bool Qt3DSRenderTestCustomMaterialGenerator::run(NVRenderContext *context,
                             metadata()->GetMaterialMetaDataBySourcePath("qrc:/copper.material");
 
         if (metaMaterial.hasValue()) {
-            uic::render::IUIPLoader::CreateMaterialClassFromMetaMaterial(
+            qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial(
                     name, context->GetFoundation(),
                     uicRenderer()->GetUICContext().GetCustomMaterialSystem(), *metaMaterial,
                     context->GetStringTable());
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
index 6e9be253..dbbee093 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestDefaultMaterialGenerator.cpp
@@ -44,7 +44,7 @@
 
 #include <QTime>
 
-using namespace uic::render;
+using namespace qt3ds::render;
 
 #include <string>
 
@@ -210,9 +210,9 @@ struct TestParams
     SImage dummyImages[SShaderDefaultMaterialKeyProperties::ImageMapCount];
     NVRenderTexture2D *textures[4];
     eastl::vector<SRenderableImage*> renderableImages;
-    uic::render::CUICRendererImpl *render;
+    qt3ds::render::CUICRendererImpl *render;
 
-    TestParams(NVRenderContext *context, uic::render::CUICRendererImpl *renderImpl)
+    TestParams(NVRenderContext *context, qt3ds::render::CUICRendererImpl *renderImpl)
         : subset(context->GetAllocator())
         , modelContext(model, viewProjection)
         , images(NULL)
@@ -272,7 +272,7 @@ TestKey randomizeTestKey()
 }
 
 
-TestParams *generateTest(uic::render::CUICRendererImpl *renderImpl,
+TestParams *generateTest(qt3ds::render::CUICRendererImpl *renderImpl,
                          NVRenderContext *context, TestKey key)
 {
     // TODO: light probes
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
index f779845c..33eb4e0f 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestEffectGenerator.cpp
@@ -56,7 +56,7 @@
 
 #include <string>
 
-using namespace uic::render;
+using namespace qt3ds::render;
 
 namespace qt3ds {
 namespace render {
@@ -134,7 +134,7 @@ bool Qt3DSRenderTestEffectGenerator::run(NVRenderContext *context, userContextDa
                             metadata()->GetEffectMetaDataBySourcePath(cname);
 
         if (metaEffect.hasValue()) {
-            uic::render::IUIPLoader::CreateEffectClassFromMetaEffect(
+            qt3ds::render::IUIPLoader::CreateEffectClassFromMetaEffect(
                 name, context->GetFoundation(),
                 uicRenderer()->GetUICContext().GetEffectSystem(), *metaEffect,
                 context->GetStringTable());