Use C++11 features with containers

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

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 353c63eca182d97ed1c5daa5e2c15bab7857665e..a5a5a10a5532133582172da6abcdf93acdf62ea6 100644 (file)
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -68,7 +68,7 @@ bool Path::is_absolute() const
 Path Path::subpath(unsigned start, unsigned count) const
 {
        Path result;
-       Iterator i = begin();
+       auto i = begin();
        for(unsigned j=0; (j<start && i!=end()); ++j)
                ++i;
        for(unsigned j=0; (j<count && i!=end()); ++j)
@@ -92,8 +92,8 @@ Path &Path::operator/=(const Path &p)
                *this = p;
        else
        {
-               for(Iterator i=p.begin(); i!=p.end(); ++i)
-                       add_component(*i);
+               for(const string &c: p)
+                       add_component(c);
        }
        return *this;
 }
@@ -173,13 +173,13 @@ string Path::operator[](int n) const
 {
        if(n>=0)
        {
-               for(Iterator i=begin(); i!=end(); ++i, --n)
+               for(auto i=begin(); i!=end(); ++i, --n)
                        if(!n)
                                return *i;
        }
        else
        {
-               for(Iterator i=end(); i!=begin();)
+               for(auto i=end(); i!=begin();)
                {
                        --i;
                        if(!++n)
@@ -264,10 +264,7 @@ void Path::Iterator::update()
 
        string::size_type start = 0;
        if(iter!=path->separators.begin())
-       {
-               PositionArray::const_iterator prev = iter;
-               start = *--prev+1;
-       }
+               start = *prev(iter)+1;
 
        string::size_type slash = string::npos;
        if(iter!=path->separators.end())