Refactor code to get rid of class PackageRef

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 387de4c5814e7bcd907ba5f9ee6b228a9131f0d9..8dec23912f41d5ef8f6c067d932a11851bb5d2cd 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -13,7 +13,7 @@ Distributed under the LGPL
 #include <msp/path/path.h>
 #include "buildinfo.h"
 #include "misc.h"
-#include "packageref.h"
+#include "package.h"
 
 class SourcePackage;
 
@@ -51,7 +51,7 @@ public:
        };
 
        Component(SourcePackage &, Type, const std::string &);
-       const SourcePackage &get_package() const         { return pkg; }
+       const SourcePackage &get_package() const       { return pkg; }
        Type              get_type() const             { return type; }
        const std::string &get_name() const            { return name; }
        const PathList    &get_sources() const         { return sources; }
@@ -59,9 +59,8 @@ public:
        bool              get_install() const          { return install; }
        const std::string &get_install_headers() const { return install_headers; }
        bool              get_modular() const          { return modular; }
-       const PkgRefList  &get_requires() const        { return requires; }
+       const PackageList &get_requires() const        { return requires; }
        bool              get_default() const          { return deflt; }
-       void              resolve_refs();
        void              create_build_info();
        void              create_targets() const;
 protected:
@@ -74,7 +73,7 @@ protected:
        const Component *module_host;
        bool        modular;
        BuildInfo   build_info;
-       PkgRefList  requires;
+       PackageList requires;
        bool        deflt;
 
        PathList    collect_source_files() const;