Get rid of the global TargetList typedef

[builder.git] / source / analyzer.cpp

diff --git a/source/analyzer.cpp b/source/analyzer.cpp
index dd8894c61b4d61a122c236c8c9116091658a0f2f..b0646463669fd07c8c87f9e86a1f3e124bddf5e0 100644 (file)
--- a/source/analyzer.cpp
+++ b/source/analyzer.cpp
@@ -27,8 +27,8 @@ void Analyzer::analyze()
                const Builder::TargetMap &targets = builder.get_targets();
                for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
                {
-                       const TargetList &depends = i->second->get_depends();
-                       for(TargetList::const_iterator j=depends.begin(); j!=depends.end(); ++j)
+                       const Target::Dependencies &depends = i->second->get_depends();
+                       for(Target::Dependencies::const_iterator j=depends.begin(); j!=depends.end(); ++j)
                                rdepends[*j].insert(i->second);
                }
        }
@@ -46,8 +46,8 @@ void Analyzer::analyze()
        Target &cmdline = *builder.get_target("cmdline");
        if(mode==RDEPS)
        {
-               const TargetList &deps = cmdline.get_depends();
-               for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+               const Target::Dependencies &deps = cmdline.get_depends();
+               for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
                        build_depend_table(**i, 0);
        }
        else
@@ -107,7 +107,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
        if(!max_depth || depth<max_depth-1)
        {
-               TargetList depends;
+               Target::Dependencies depends;
                if(mode==RDEPS)
                {
                        const set<Target *> &rdeps = rdepends[&tgt];
@@ -118,7 +118,7 @@ void Analyzer::build_depend_table(Target &tgt, unsigned depth)
 
                depends.sort(full_paths ? target_order_full : target_order);
 
-               for(TargetList::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+               for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
                        build_depend_table(**i, depth+1);
        }
 }