X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=23e8f36320aaf5de5393bffb9ef5ab3268c7ee06;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=5a1eddde5bd1b2793cf9b8e03b90ec9544434725;hpb=e3407687a61bce56912b89818a9d9f006e9da41f;p=builder.git

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 5a1eddd..23e8f36 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 *);
-		virtual void finish();
+		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,11 +46,7 @@ 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;
@@ -60,9 +55,9 @@ private:
 	Msp::FS::Path source_dir;
 	const BuildType *build_type;
 	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;
@@ -87,12 +82,12 @@ public:
 	void set_build_type(const BuildType &);
 	const BuildInfo &get_build_info() const { return build_info; }
 private:
-	virtual void do_prepare();
+	void do_prepare() override;
 
 public:
 	Cache &get_cache() const { return cache; }
 private:
-	virtual void save_caches();
+	void save_caches() override;
 };
 
 #endif