X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.h;h=5da28838f5d5035fe44aa3a51d798bdd26c92097;hb=0cf7bb122ef4c0fc46fbb2aaaf1a9d6d5ccec0f1;hp=561a25091381bb4eb5838d1aa0b34b4f9fb89793;hpb=bd61d7fbd0ba77356b6def1dd20f8cebe31de182;p=builder.git

diff --git a/source/component.h b/source/component.h
index 561a250..5da2883 100644
--- a/source/component.h
+++ b/source/component.h
@@ -42,7 +42,7 @@ public:
 	};
 
 protected:
-	SourcePackage &pkg;
+	SourcePackage &package;
 	Type type;
 	std::string name;
 	StringList sources;
@@ -54,13 +54,14 @@ protected:
 
 public:
 	Component(SourcePackage &, Type, const std::string &);
-	const SourcePackage &get_package() const { return pkg; }
+
+	const SourcePackage &get_package() const { return package; }
 	Type get_type() const { return type; }
 	const std::string &get_name() const { return name; }
 	const StringList &get_sources() const { return sources; }
 	const BuildInfo &get_build_info() const { return build_info; }
 	bool get_install() const { return install; }
-	const PackageList &get_requires() const { return requires; }
+	const PackageList &get_required_packages() const { return requires; }
 	bool is_default() const { return deflt; }
 	const InstallMap &get_install_map() const { return install_map; }
 
@@ -77,6 +78,4 @@ protected:
 	PathList collect_source_files() const;
 };
 
-typedef std::list<Component> ComponentList;
-
 #endif