X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=8be8ada63d654f68a963feb55cdec9f8c7544d77;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=dfa2f4d295a921072f58460c1a0713ba52134984;hpb=bde362811368647047f3ca13bdec596f092ecffe;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index dfa2f4d..8be8ada 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -29,16 +29,15 @@ public:
 		const Config::InputOptions *options;
 
 	public:
-		Loader(SourcePackage &);
-		Loader(SourcePackage &, const Config::InputOptions &);
+		Loader(SourcePackage &, const Config::InputOptions *);
 	private:
-		void init(const Config::InputOptions *);
 		void finish() override;
+
 		void feature(const std::string &, const std::string &);
 		template<typename C>
 		void component(const std::string &);
-		template<typename C, typename A, A>
-		void component_arg(const std::string &);
+		template<typename C, typename A>
+		void component_arg(A, const std::string &);
 		void build_info();
 		void generate(const std::string &);
 		void interface_version(const std::string &);
@@ -47,22 +46,18 @@ public:
 		void version(const std::string &);
 	};
 
-	typedef std::list<Component *> ComponentList;
-
 private:
-	typedef std::list<Feature> FeatureList;
-
 	std::string version;
 	std::string interface_version;
 	std::string description;
 
 	FileTarget *build_file;
 	Msp::FS::Path source_dir;
-	const BuildType *build_type;
+	const BuildType *build_type = 0;
 	Toolchain local_tools;
-	FeatureList features;
+	std::vector<Feature> features;
 	BuildInfo build_info;
-	ComponentList components;
+	std::vector<Component *> components;
 	SourceArchiveComponent *source_archive;
 	Config config;
 	mutable Cache cache;