Refactor code to get rid of class PackageRef

[builder.git] / source / component.cpp

diff --git a/source/component.cpp b/source/component.cpp
index 6272321b56b702b3b730c9ccca53618efab08078..e33867680fb420e927d7abe20f5b524fe737defd 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -31,15 +31,6 @@ Component::Component(SourcePackage &p, Type t, const string &n):
        deflt(true)
 { }
 
-/**
-Tries to resolve all references to packages.
-*/
-void Component::resolve_refs()
-{
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->resolve();
-}
-
 /**
 Prepares the build information for building.
 */
@@ -47,13 +38,8 @@ void Component::create_build_info()
 {
        build_info.add(pkg.get_build_info());
 
-       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-       {
-               if(!i->get_package())
-                       continue;
-               //i->get_package()->create_build_info();
-               build_info.add(i->get_package()->get_exported_binfo());
-       }
+       for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               build_info.add((*i)->get_exported_binfo());
 
        if(type==PROGRAM)
        {
@@ -196,7 +182,9 @@ void Component::Loader::source(const string &s)
 
 void Component::Loader::require(const string &n)
 {
-       comp.requires.push_back(PackageRef(comp.pkg.get_builder(), n));
+       Package *req=comp.pkg.get_builder().get_package(n);
+       if(req)
+               comp.requires.push_back(req);
 }
 
 void Component::Loader::modular()