X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=74c38864bce10cb4f63bdd5888604b0f69841365;hp=4d680ba9bd234e5d16e62ea76adda82bf8a89c2e;hb=8f99b70eb78bdb5537afc77aa283961a2e825506;hpb=690b9c5f340504517cf6ba8aad0c168dcdff4efa

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 4d680ba..74c3886 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -167,23 +167,11 @@ void SourcePackage::save_caches()
 }
 
 
-SourcePackage::Loader::Loader(SourcePackage &p):
+SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o):
 	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
-	FeatureConditional(p, p.name)
+	FeatureConditional(p, p.name),
+	options(o)
 {
-	init(0);
-}
-
-SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
-	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p),
-	FeatureConditional(p, p.name)
-{
-	init(&o);
-}
-
-void SourcePackage::Loader::init(const Config::InputOptions *o)
-{
-	options = o;
 	add("android_application", &Loader::component<AndroidApplicationComponent>);
 	add("build_info",  &Loader::build_info);
 	add("datapack",    &Loader::component<DataPackComponent>);