Use default member initializers and constructor delegation

[builder.git] / source / apkbuilder.cpp

diff --git a/source/apkbuilder.cpp b/source/apkbuilder.cpp
index 2568f33e081bce17a8852300ca09bf75da758e4f..d232a6f927ee23827db9eaafacf7a5997e3f999d 100644 (file)
--- a/source/apkbuilder.cpp
+++ b/source/apkbuilder.cpp
@@ -15,16 +15,16 @@ using namespace Msp;
 // TODO Separate jar into its own tool and have this one just chain the two
 
 ApkBuilder::ApkBuilder(Builder &b):
-       Tool(b, "APK"),
-       jarsigner(0)
+       Tool(b, "APK")
 {
        set_command("jar");
 }
 
-Target *ApkBuilder::create_target(const list<Target *> &sources, const string &)
+Target *ApkBuilder::create_target(const vector<Target *> &sources, const string &)
 {
        AndroidResourceBundle *resource_bundle = 0;
-       list<FileTarget *> other_files;
+       vector<FileTarget *> other_files;
+       other_files.reserve(sources.size());
        for(Target *s: sources)
        {
                if(AndroidResourceBundle *r = dynamic_cast<AndroidResourceBundle *>(s))
@@ -52,7 +52,8 @@ Task *ApkBuilder::run(const Target &tgt) const
        argv.push_back("u");
 
        FS::Path input_path;
-       list<FS::Path> files;
+       vector<FS::Path> files;
+       files.reserve(apk.get_dependencies().size());
        for(Target *d: apk.get_dependencies())
        {
                FileTarget *file = dynamic_cast<FileTarget *>(d);