Replace basic for loops with range-based loops or algorithms

[builder.git] / source / buildgraph.cpp

diff --git a/source/buildgraph.cpp b/source/buildgraph.cpp
index 94b5ed6ffd2dcfe578249dc2739a39c2a0014191..a3af685dd9b9cd88ce81d328c744999df0e18027 100644 (file)
--- a/source/buildgraph.cpp
+++ b/source/buildgraph.cpp
@@ -14,13 +14,13 @@ BuildGraph::BuildGraph(Builder &b):
        Target *world = new VirtualTarget(builder, "world");
        world->add_dependency(*new VirtualTarget(builder, "default"));
        world->add_dependency(*new VirtualTarget(builder, "install"));
-       world->add_dependency(*new VirtualTarget(builder, "tarballs"));
+       world->add_dependency(*new VirtualTarget(builder, "archives"));
 }
 
 BuildGraph::~BuildGraph()
 {
-       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-               delete i->second;
+       for(const auto &kvp: targets)
+               delete kvp.second;
 }
 
 Target *BuildGraph::get_target(const string &n) const
@@ -69,16 +69,16 @@ void BuildGraph::prepare()
 
 void BuildGraph::force_full_rebuild()
 {
-       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-               if(i->second->is_buildable() && !i->second->needs_rebuild())
-                       i->second->force_rebuild();
+       for(const auto &kvp: targets)
+               if(kvp.second->is_buildable() && !kvp.second->needs_rebuild())
+                       kvp.second->force_rebuild();
 }
 
 unsigned BuildGraph::count_rebuild_targets() const
 {
        unsigned count = 0;
-       for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-               if(i->second->is_buildable() && i->second->needs_rebuild())
+       for(const auto &kvp: targets)
+               if(kvp.second->is_buildable() && kvp.second->needs_rebuild())
                        ++count;
        return count;
 }