Refactor the constructor of SourcePackage::Loader

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 4d680ba9bd234e5d16e62ea76adda82bf8a89c2e..74c38864bce10cb4f63bdd5888604b0f69841365 100644 (file)
--- 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>);