Refactor the constructor of SourcePackage::Loader

There isn't much point to have two differnt overloads when it could just
take a nullable pointer.

diff --git a/source/builder.cpp b/source/builder.cpp
index ceb7db3581f7db02915b8433fdfda56532657811..21592661624742d5085d48a73a1c4ccf76e79572 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -333,10 +333,7 @@ void Builder::Loader::package(const string &n)
 {
        SourcePackage *pkg = new SourcePackage(obj, n, get_source());
 
-       if(options)
-               load_sub(*pkg, *options);
-       else
-               load_sub(*pkg);
+       load_sub(*pkg, options);
 
        if(obj.build_type)
                pkg->set_build_type(*obj.build_type);

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>);

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index dfa2f4d295a921072f58460c1a0713ba52134984..68b89c85279e4ab9327be954b457f4f8a2742de2 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -29,11 +29,10 @@ 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 &);