Convert all list containers to vectors

[builder.git] / source / apkbuilder.cpp

diff --git a/source/apkbuilder.cpp b/source/apkbuilder.cpp
index 9cd1a16b5b45e878bf194509438e9a06dd26d52b..0e141631e7556805fd534e7edb8e5d65ca70252a 100644 (file)
--- a/source/apkbuilder.cpp
+++ b/source/apkbuilder.cpp
@@ -21,15 +21,16 @@ ApkBuilder::ApkBuilder(Builder &b):
        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;
-       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       vector<FileTarget *> other_files;
+       other_files.reserve(sources.size());
+       for(Target *s: sources)
        {
-               if(AndroidResourceBundle *r = dynamic_cast<AndroidResourceBundle *>(*i))
+               if(AndroidResourceBundle *r = dynamic_cast<AndroidResourceBundle *>(s))
                        resource_bundle = r;
-               else if(FileTarget *f = dynamic_cast<FileTarget *>(*i))
+               else if(FileTarget *f = dynamic_cast<FileTarget *>(s))
                        other_files.push_back(f);
        }
        AndroidPackageFile *apk = new AndroidPackageFile(builder, *resource_bundle->get_component(), *resource_bundle, other_files);
@@ -51,13 +52,13 @@ Task *ApkBuilder::run(const Target &tgt) const
        argv.push_back(executable->get_path().str());
        argv.push_back("u");
 
-       const Target::Dependencies &depends = apk.get_dependencies();
        FS::Path input_path;
-       list<FS::Path> files;
-       for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+       vector<FS::Path> files;
+       files.reserve(apk.get_dependencies().size());
+       for(Target *d: apk.get_dependencies())
        {
-               FileTarget *file = dynamic_cast<FileTarget *>(*i);
-               Target *real = (*i)->get_real_target();
+               FileTarget *file = dynamic_cast<FileTarget *>(d);
+               Target *real = d->get_real_target();
 
                if(dynamic_cast<AndroidResourceBundle *>(real))
                        input_path = file->get_path();
@@ -67,8 +68,8 @@ Task *ApkBuilder::run(const Target &tgt) const
 
        FS::Path work_dir = FS::dirname(input_path);
 
-       for(list<FS::Path>::const_iterator i=files.begin(); i!=files.end(); ++i)
-               argv.push_back(FS::relative(*i, work_dir).str());
+       for(const FS::Path &f: files)
+               argv.push_back(FS::relative(f, work_dir).str());
 
        ExternalTask *task = new ExternalTask(argv, work_dir);
        task->set_stdin(FS::basename(input_path));