Replace basic for loops with range-based loops or algorithms

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index 75ec2da7b750998d77395ba6ba57e8d77afd87a0..ca2f2e49aaef3738cd2bf2c12171af03d902c746 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -38,8 +38,8 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
        else if(arg=="pack")
        {
                list<FileTarget *> files;
-               for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-                       files.push_back(&dynamic_cast<FileTarget &>(**i));
+               for(Target *t: sources)
+                       files.push_back(&dynamic_cast<FileTarget &>(*t));
                DataPack *pack = new DataPack(builder, *files.front()->get_component(), files);
                pack->set_tool(*this);
                return pack;
@@ -92,9 +92,8 @@ Task *DataTool::run(const Target &tgt) const
        else if(const DataPack *pack = dynamic_cast<const DataPack *>(&tgt))
        {
                argv.push_back("-p");
-               const DataPack::FileList &files = pack->get_files();
-               for(DataPack::FileList::const_iterator i=files.begin(); i!=files.end(); ++i)
-                       argv.push_back(FS::relative((*i)->get_path(), work_dir).str());
+               for(const FileTarget *f: pack->get_files())
+                       argv.push_back(FS::relative(f->get_path(), work_dir).str());
        }
 
        return new ExternalTask(argv, work_dir);