X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=adf376f7a0b0db57341370a7bd07d61b643a7c04;hb=122846f0881673770d88eff7d925ecf25c01b62e;hp=353c63eca182d97ed1c5daa5e2c15bab7857665e;hpb=20c897ece781e18ba54c41fd68e232ce566a938d;p=libs%2Fcore.git

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 353c63e..adf376f 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -21,16 +21,6 @@ Path::Path()
 { }
 
 Path::Path(const string &p)
-{
-	init(p);
-}
-
-Path::Path(const char *p)
-{
-	init(p);
-}
-
-void Path::init(const string &p)
 {
 	if(p.empty())
 		return;
@@ -68,7 +58,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 +82,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 +163,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 +254,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())