From d5cdf3ba6bd8afe38344f8349dad60ed07b3cbfc Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Fri, 20 Nov 2015 18:26:16 +0300 Subject: [PATCH] Review fixes --- drape_frontend/frontend_renderer.cpp | 4 ++-- drape_frontend/message_subclasses.hpp | 6 +++--- drape_frontend/route_renderer.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 7a7053ff97..ff2310ecfa 100755 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -321,8 +321,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr message) { ref_ptr msg = message; drape_ptr routeData = msg->AcceptRouteData(); - m2::PointD startPoint = routeData->m_sourcePolyline.Front(); - m2::PointD finishPoint = routeData->m_sourcePolyline.Back(); + m2::PointD const startPoint = routeData->m_sourcePolyline.Front(); + m2::PointD const finishPoint = routeData->m_sourcePolyline.Back(); m_routeRenderer->SetRouteData(move(routeData), make_ref(m_gpuProgramManager)); if (!m_routeRenderer->GetStartPoint()) { diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 83288f03e8..586ccec0aa 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -555,9 +555,9 @@ public: bool IsValid() const { return m_isValid; } private: - m2::PointD m_position; - bool m_isStart; - bool m_isValid; + m2::PointD const m_position; + bool const m_isStart; + bool const m_isValid; }; class RemoveRouteMessage : public Message diff --git a/drape_frontend/route_renderer.cpp b/drape_frontend/route_renderer.cpp index 857076eeee..754387644f 100644 --- a/drape_frontend/route_renderer.cpp +++ b/drape_frontend/route_renderer.cpp @@ -239,14 +239,14 @@ void RouteRenderer::RenderRouteSign(drape_ptr const & sign, Scree dp::GLState const & state = sign->m_sign.m_state; dp::UniformValuesStorage uniforms = commonUniforms; - uniforms.SetFloatValue("u_opacity", 1.0); + uniforms.SetFloatValue("u_opacity", 1.0f); ref_ptr program = mng->GetProgram(state.GetProgramIndex()); program->Bind(); dp::ApplyState(sign->m_sign.m_state, program); dp::ApplyUniforms(uniforms, program); - for (drape_ptr const & bucket : sign->m_sign.m_buckets) + for (auto const & bucket : sign->m_sign.m_buckets) bucket->Render(screen); }