Replace basic for loops with range-based loops or algorithms

[builder.git] / source / datatransform.cpp

diff --git a/source/datatransform.cpp b/source/datatransform.cpp
index 7b221b3c0bc7e16c4cf4088873d12770bfced578..4f5806c4bf79aa2bae99410c2287c38d4897e57e 100644 (file)
--- a/source/datatransform.cpp
+++ b/source/datatransform.cpp
@@ -49,12 +49,12 @@ void DataTransform::find_dependencies()
                                        dir_files = list_files(dir);
                                }
 
-                               for(DataFile::Statement::Arguments::const_iterator i=st.args.begin(); i!=st.args.end(); ++i)
+                               for(const DataFile::Value &a: st.args)
                                {
-                                       Regex re(i->get<string>());
-                                       for(vector<string>::const_iterator j=dir_files.begin(); j!=dir_files.end(); ++j)
-                                               if(re.match(*j))
-                                                       files.push_back(*j);
+                                       Regex re(a.get<string>());
+                                       for(const string &f: dir_files)
+                                               if(re.match(f))
+                                                       files.push_back(f);
                                }
                        }
                        else if(st.keyword=="file" && st.args.size()==1)
@@ -64,9 +64,9 @@ void DataTransform::find_dependencies()
                cache.set_values(this, "files", files);
        }
 
-       for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
+       for(const string &f: files)
        {
-               FS::Path file_path = FS::dirname(path)/ *i;
+               FS::Path file_path = FS::dirname(path)/f;
                if(Target *tgt = builder.get_vfs().get_target(file_path))
                        add_transitive_dependency(*tgt);
                else