diff options
author | Mike Krus <mike.krus@kdab.com> | 2017-02-09 13:08:12 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-11 13:54:31 +0000 |
commit | 5b890620adfd4f554eb8eed54a05cd53be9ac809 (patch) | |
tree | 43e1758c22e5d7693393eb92c3c722608d25ff7a | |
parent | 905c5e5a366e24bb6d42b102f2e8a019270baec6 (diff) |
Fix Clang warnings: out of order initialization
Change-Id: Iea0b93082167bda9502e6947f213ab3430fa00d1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/animation/frontend/qkeyframeanimation.cpp | 4 | ||||
-rw-r--r-- | src/quick3d/quick3drender/scene2d/scene2d.cpp | 6 | ||||
-rw-r--r-- | src/render/backend/renderer.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/renderview.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/resourceaccessor.cpp | 4 | ||||
-rw-r--r-- | tests/manual/render-qml-to-texture/planematerial.cpp | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/animation/frontend/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp index 5c3ca1ca1..2e63e96c8 100644 --- a/src/animation/frontend/qkeyframeanimation.cpp +++ b/src/animation/frontend/qkeyframeanimation.cpp @@ -45,10 +45,10 @@ namespace Qt3DAnimation { QKeyframeAnimationPrivate::QKeyframeAnimationPrivate() : QAbstractAnimationPrivate(QAbstractAnimation::KeyframeAnimation) - , m_minposition(0.0f) - , m_maxposition(0.0f) , m_prevPosition(-1.0f) , m_target(nullptr) + , m_minposition(0.0f) + , m_maxposition(0.0f) , m_startMode(QKeyframeAnimation::Constant) , m_endMode(QKeyframeAnimation::Constant) { diff --git a/src/quick3d/quick3drender/scene2d/scene2d.cpp b/src/quick3d/quick3drender/scene2d/scene2d.cpp index 710284be2..51a4304af 100644 --- a/src/quick3d/quick3drender/scene2d/scene2d.cpp +++ b/src/quick3d/quick3drender/scene2d/scene2d.cpp @@ -105,13 +105,13 @@ bool RenderQmlEventHandler::event(QEvent *e) Scene2D::Scene2D() : m_context(nullptr) , m_shareContext(nullptr) - , m_sharedObject(nullptr) , m_renderThread(nullptr) + , m_sharedObject(nullptr) + , m_fbo(0) + , m_rbo(0) , m_initialized(false) , m_renderInitialized(false) , m_renderPolicy(Qt3DRender::Quick::QScene2D::Continuous) - , m_fbo(0) - , m_rbo(0) { renderThreadClientCount->fetchAndAddAcquire(1); } diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index da4936a8b..7b8e5315f 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -155,10 +155,10 @@ Renderer::Renderer(QRenderAspect::RenderType type) , m_waitForInitializationToBeCompleted(0) , m_pickEventFilter(new PickEventFilter()) , m_exposed(0) - , m_shareContext(nullptr) , m_changeSet(0) , m_lastFrameCorrect(0) , m_glContext(nullptr) + , m_shareContext(nullptr) , m_pickBoundingVolumeJob(PickBoundingVolumeJobPtr::create()) , m_time(0) , m_settings(nullptr) @@ -170,8 +170,8 @@ Renderer::Renderer(QRenderAspect::RenderType type) , m_updateWorldBoundingVolumeJob(Render::UpdateWorldBoundingVolumeJobPtr::create()) , m_updateTreeEnabledJob(Render::UpdateTreeEnabledJobPtr::create()) , m_sendRenderCaptureJob(Render::SendRenderCaptureJobPtr::create(this)) - , m_updateLevelOfDetailJob(Render::UpdateLevelOfDetailJobPtr::create()) , m_sendBufferCaptureJob(Render::SendBufferCaptureJobPtr::create(this)) + , m_updateLevelOfDetailJob(Render::UpdateLevelOfDetailJobPtr::create()) , m_updateMeshTriangleListJob(Render::UpdateMeshTriangleListJobPtr::create()) , m_filterCompatibleTechniqueJob(Render::FilterCompatibleTechniqueJobPtr::create()) , m_bufferGathererJob(Render::GenericLambdaJobPtr<std::function<void ()>>::create([this] { lookForDirtyBuffers(); }, JobTypes::DirtyBufferGathering)) diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index e5e75aee9..c7d2c7864 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -208,7 +208,8 @@ UniformValue RenderView::standardUniformValue(RenderView::StandardUniform standa } RenderView::RenderView() - : m_renderer(nullptr) + : m_isDownloadBuffersEnable(false) + , m_renderer(nullptr) , m_devicePixelRatio(1.) , m_viewport(QRectF(0.0f, 0.0f, 1.0f, 1.0f)) , m_gamma(2.2f) @@ -217,7 +218,6 @@ RenderView::RenderView() , m_stateSet(nullptr) , m_noDraw(false) , m_compute(false) - , m_isDownloadBuffersEnable(false) , m_frustumCulling(false) , m_memoryBarrier(QMemoryBarrier::None) { diff --git a/src/render/backend/resourceaccessor.cpp b/src/render/backend/resourceaccessor.cpp index c02130aa9..43f416d16 100644 --- a/src/render/backend/resourceaccessor.cpp +++ b/src/render/backend/resourceaccessor.cpp @@ -55,9 +55,9 @@ namespace Qt3DRender { namespace Render { ResourceAccessor::ResourceAccessor(NodeManagers *mgr) - : m_textureManager(mgr->textureManager()) + : m_glTextureManager(mgr->glTextureManager()) + , m_textureManager(mgr->textureManager()) , m_attachmentManager(mgr->attachmentManager()) - , m_glTextureManager(mgr->glTextureManager()) { } diff --git a/tests/manual/render-qml-to-texture/planematerial.cpp b/tests/manual/render-qml-to-texture/planematerial.cpp index e3886a296..4435766bb 100644 --- a/tests/manual/render-qml-to-texture/planematerial.cpp +++ b/tests/manual/render-qml-to-texture/planematerial.cpp @@ -52,8 +52,8 @@ PlaneMaterial::PlaneMaterial(Qt3DRender::QAbstractTexture *texture, Qt3DCore::QNode *parent) : QMaterial(parent) - , m_texture(texture) , m_effect(new Qt3DRender::QEffect(this)) + , m_texture(texture) { setEffect(m_effect); |