10 files changed, 20 insertions, 19 deletions
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)