Replace basic for loops with range-based loops or algorithms

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 9006a570cb360f42c00589bd08abc7e54b25ca05..49a769371739044f8ae3200198273979391c15ad 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -59,16 +59,16 @@ Target *Target::get_buildable_target()
                return 0;
 
        bool self_ok = state!=BUILDING;
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Target *d: depends)
        {
                // Avoid infinite recursion if a target repends on its own side effect
-               if(find(side_effects.begin(), side_effects.end(), *i)!=side_effects.end())
+               if(find(side_effects.begin(), side_effects.end(), d)!=side_effects.end())
                        continue;
 
-               Target *tgt = (*i)->get_buildable_target();
+               Target *tgt = d->get_buildable_target();
                if(tgt)
                        return tgt;
-               else if((*i)->needs_rebuild())
+               else if(d->needs_rebuild())
                        self_ok = false;
        }
 
@@ -81,8 +81,8 @@ Target *Target::get_buildable_target()
 void Target::set_tool(Tool &t)
 {
        tool = &t;
-       for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-               (*i)->set_tool(t);
+       for(Target *s: side_effects)
+               s->set_tool(t);
 }
 
 void Target::collect_build_info(BuildInfo &binfo) const
@@ -146,13 +146,13 @@ void Target::prepare()
                broken |= (component && !component->get_problems().empty());
        }
 
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Target *d: depends)
        {
-               (*i)->prepare();
-               broken |= (*i)->is_broken();
+               d->prepare();
+               broken |= d->is_broken();
        }
-       for(Dependencies::iterator i=trans_depends.begin(); i!=trans_depends.end(); ++i)
-               (*i)->prepare();
+       for(Target *d: trans_depends)
+               d->prepare();
 
        check_rebuild();
        if(broken)
@@ -160,8 +160,8 @@ void Target::prepare()
        else if(state==PREPARING)
                state = UPTODATE;
 
-       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
-               (*i)->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+       for(Target *d: depends)
+               d->signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
 }
 
 Task *Target::build()
@@ -174,8 +174,8 @@ Task *Target::build()
        state = BUILDING;
 
        build(*task);
-       for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-               (*i)->build(*task);
+       for(Target *s: side_effects)
+               s->build(*task);
 
        return task;
 }
@@ -186,8 +186,8 @@ void Target::build_finished(bool success)
        if(success)
        {
                modified();
-               for(Dependencies::const_iterator i=side_effects.begin(); i!=side_effects.end(); ++i)
-                       (*i)->build_finished(success);
+               for(Target *s: side_effects)
+                       s->build_finished(success);
                signal_modified.emit();
        }
 }