Use C++11 features with containers

[libs/core.git] / source / fs / dir.cpp

diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp
index 7f81e4ea8301ef07ce7c4062bf65323de6f9dfc8..99de180d20ed026812e7fcb2e371dc843a0c333f 100644 (file)
--- a/source/fs/dir.cpp
+++ b/source/fs/dir.cpp
@@ -40,11 +40,10 @@ const Path &get_bin_dir(const string &argv0)
                if(argv0.find(DIRSEP)==string::npos)
                        if(const char *path = getenv("PATH"))
                        {
-                               vector<string> dirs = split(path, ITEMSEP);
-                               for(vector<string>::const_iterator i=dirs.begin(); i!=dirs.end(); ++i)
-                                       if(exists(Path(*i)/argv0))
+                               for(const string &d: split(path, ITEMSEP))
+                                       if(exists(Path(d)/argv0))
                                        {
-                                               exe = realpath(Path(*i)/argv0);
+                                               exe = realpath(Path(d)/argv0);
                                                break;
                                        }
                        }
@@ -70,9 +69,9 @@ not_a_directory::not_a_directory(const Path &p):
 void mkpath(const Path &path, int mode)
 {
        Path p;
-       for(Path::Iterator i=path.begin(); i!=path.end(); ++i)
+       for(const string &c: path)
        {
-               p /= *i;
+               p /= c;
 #ifdef _WIN32
                if(p.size()==1 && p.is_absolute())
                        continue;
@@ -90,10 +89,9 @@ void mkpath(const Path &path, int mode)
 
 void rmpath(const Path &path)
 {
-       list<string> files = list_files(path);
-       for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
+       for(const string &f: list_files(path))
        {
-               Path p = path / *i;
+               Path p = path/f;
                if(is_dir(p))
                        rmpath(p);
                else
@@ -181,9 +179,9 @@ Path get_sys_lib_dir()
 
 Path path_lookup(const string &name, const list<Path> &paths)
 {
-       for(list<Path>::const_iterator i=paths.begin(); i!=paths.end(); ++i)
+       for(const Path &p: paths)
        {
-               Path full = *i/name;
+               Path full = p/name;
                if(exists(full))
                        return realpath(full);
        }
@@ -194,7 +192,7 @@ Path path_lookup(const string &name, const list<Path> &paths)
 Path path_lookup(const string &name)
 {
        const char *path = getenv("PATH");
-       vector<string> dirs = split(path, ITEMSEP);
+       list<string> dirs = split(path, ITEMSEP);
        return path_lookup(name, list<Path>(dirs.begin(), dirs.end()));
 }