Replace basic for loops with range-based loops or algorithms

[builder.git] / source / sourcegenerator.cpp

diff --git a/source/sourcegenerator.cpp b/source/sourcegenerator.cpp
index 584822a1074b06a1fb959714cfbb463b63c54bbc..f4b43a82c8c32e7ffa016f9a57f00004174f5875 100644 (file)
--- a/source/sourcegenerator.cpp
+++ b/source/sourcegenerator.cpp
@@ -47,23 +47,23 @@ Target *SourceGenerator::create_target(const list<Target *> &sources, const stri
        }
 
        Target *primary = 0;
-       for(list<string>::const_iterator i=out_suffixes.begin(); i!=out_suffixes.end(); ++i)
+       for(const string &s: out_suffixes)
        {
-               Tool *tool = builder.get_toolchain().get_tool_for_suffix(*i, true);
+               Tool *tool = builder.get_toolchain().get_tool_for_suffix(s, true);
                if(tool)
                {
-                       FS::Path fn = pkg->get_temp_directory()/"generated"/subdir/(base+*i);
+                       FS::Path fn = pkg->get_temp_directory()/"generated"/subdir/(base+s);
                        Target *target = tool->create_source(*comp, fn);
                        target->set_tool(*this);
-                       for(list<Target *>::const_iterator j=sources.begin(); j!=sources.end(); ++j)
-                               target->add_dependency(**j);
+                       for(Target *t: sources)
+                               target->add_dependency(*t);
                        if(primary)
                                primary->add_side_effect(*target);
                        else
                                primary = target;
                }
                else
-                       throw runtime_error("No tool found for suffix "+*i);
+                       throw runtime_error("No tool found for suffix "+s);
        }
 
        return primary;
@@ -78,9 +78,8 @@ Task *SourceGenerator::run(const Target &target) const
        args.push_back(executable->get_path().str());
        args.insert(args.end(), arguments.begin(), arguments.end());
 
-       const Target::Dependencies &deps = target.get_dependencies();
-       for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-               if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(*i))
+       for(const Target *d: target.get_dependencies())
+               if(const TemplateFile *tmpl = dynamic_cast<const TemplateFile *>(d))
                        args.push_back(FS::relative(tmpl->get_path(), work_dir).str());
 
        if(!out_argument.empty())