Use C++11 features with containers

[libs/gl.git] / source / render / sequence.cpp

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index 3460bc724c30905a05759a3f51046bac720eb306..e953b4d6925944b10d872301ef35667a7904f857 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -57,9 +57,9 @@ void Sequence::init(unsigned w, unsigned h, const FrameFormat &f)
 
 Sequence::~Sequence()
 {
-       for(vector<PostProcStep>::iterator i=postproc.begin(); i!=postproc.end(); ++i)
-               if(i->owned)
-                       delete i->postproc;
+       for(PostProcStep &p: postproc)
+               if(p.owned)
+                       delete p.postproc;
        delete target[0];
        delete target[1];
        delete target_ms;
@@ -94,15 +94,15 @@ void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 
 void Sequence::setup_frame(Renderer &renderer)
 {
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               if(Renderable *renderable = i->get_renderable())
+       for(const Step &s: steps)
+               if(Renderable *renderable = s.get_renderable())
                        renderable->setup_frame(renderer);
 }
 
 void Sequence::finish_frame()
 {
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
-               if(Renderable *renderable = i->get_renderable())
+       for(const Step &s: steps)
+               if(Renderable *renderable = s.get_renderable())
                        renderable->finish_frame();
 }
 
@@ -121,20 +121,20 @@ void Sequence::render(Renderer &renderer, Tag tag) const
                renderer.clear();
        }
 
-       for(vector<Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
+       for(const Step &s: steps)
        {
                Renderer::Push _push2(renderer);
 
-               renderer.set_depth_test(&i->get_depth_test());
-               renderer.set_stencil_test(&i->get_stencil_test());
-               renderer.set_blend(&i->get_blend());
+               renderer.set_depth_test(&s.get_depth_test());
+               renderer.set_stencil_test(&s.get_stencil_test());
+               renderer.set_blend(&s.get_blend());
 
-               if (const Lighting *lighting = i->get_lighting())
+               if (const Lighting *lighting = s.get_lighting())
                        renderer.add_shader_data(lighting->get_shader_data());
-               renderer.set_clipping(i->get_clipping());
+               renderer.set_clipping(s.get_clipping());
 
-               if(const Renderable *renderable = i->get_renderable())
-                       renderer.render(*renderable, i->get_tag());
+               if(const Renderable *renderable = s.get_renderable())
+                       renderer.render(*renderable, s.get_tag());
        }
 
        if(target[0])