Remove most container typedefs and refactor others

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 0e183b5fc8039e509a0fecc87e9f4f66a8a138f5..98b6ff76590e1067709895ed1277d6535ed61e58 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -35,12 +35,12 @@ void Component::create_build_info()
        for(Package *r: all_reqs)
        {
                BuildInfo::UpdateLevel level = BuildInfo::CHAINED;
-               if(find(direct_reqs.begin(), direct_reqs.end(), r)!=direct_reqs.end())
+               if(any_equals(direct_reqs, r))
                        level = BuildInfo::DEPENDENCY;
                final_build_info.update_from(r->get_exported_build_info(), level);
 
                for(Package *q: r->get_required_packages())
-                       if(find(all_reqs.begin(), all_reqs.end(), q)==all_reqs.end())
+                       if(!any_equals(all_reqs, q))
                                all_reqs.push_back(q);
        }
 
@@ -88,14 +88,14 @@ BuildInfo Component::get_build_info_for_path(const FS::Path &path) const
        return binfo;
 }
 
-Component::SourceList Component::collect_source_files() const
+list<FS::Path> Component::collect_source_files() const
 {
-       SourceList files;
+       list<FS::Path> files;
        for(const FS::Path &p: sources)
        {
                if(FS::is_dir(p))
                {
-                       SourceList dirs;
+                       list<FS::Path> dirs;
                        dirs.push_back(p);
                        for(const string &o: overlays)
                        {