X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fpath.cpp;h=25c9b170c9460b8d8bcc3bb504285a51119ec8cf;hp=4f3a0b1547c3ea94018feac0c4bbd3bbbbfe77eb;hb=0ba3e9d15af4e8c30eef5445d2b64fee4870505f;hpb=911ae41312cf1c9db02b8b513cc8edbe78d97006

diff --git a/source/path.cpp b/source/path.cpp
index 4f3a0b1..25c9b17 100644
--- a/source/path.cpp
+++ b/source/path.cpp
@@ -1,8 +1,10 @@
-/*
+/* $Id$
+
 This file is part of libmsppath
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <msp/strings/utils.h>
 #include "path.h"
 #include "utils.h"
@@ -10,15 +12,17 @@ Distributed under the LGPL
 using namespace std;
 
 namespace Msp {
-namespace Path {
 
 /**
 Returns the number of components in the path.
 */
 unsigned Path::size() const
 {
-	if(!path.size()) return 0;
-	if(path.size()==1 && path[0]==DIRCHAR) return 1;
+	if(path.empty())
+		return 0;
+	if(path.size()==1 && path[0]==DIRCHAR)
+		return 1;
+
 	unsigned count=1;
 	for(string::const_iterator i=path.begin(); i!=path.end(); ++i)
 		if(*i==DIRCHAR) ++count;
@@ -28,9 +32,11 @@ unsigned Path::size() const
 bool Path::is_absolute() const
 {
 #ifdef WIN32
-	if(is_windows_drive((*this)[0])) return true;
+	if(is_windows_drive((*this)[0]))
+		return true;
 #endif
-	if(path[0]==DIRCHAR) return true;
+	if(path[0]==DIRCHAR)
+		return true;
 	return false;
 }
 
@@ -40,7 +46,7 @@ Extracts the given component range from the path.
 Path Path::subpath(unsigned start, unsigned count) const
 {
 	Path result;
-	iterator i=begin();
+	Iterator i=begin();
 	for(unsigned j=0; (j<start && i!=end()); ++j)
 		++i;
 	for(unsigned j=0; (j<count && i!=end()); ++j)
@@ -62,7 +68,7 @@ Path &Path::operator/=(const Path &p)
 		path=p.path;
 	else
 	{
-		for(iterator i=p.begin(); i!=p.end(); ++i)
+		for(Iterator i=p.begin(); i!=p.end(); ++i)
 			add_component(*i);
 	}
 	return *this;
@@ -76,12 +82,12 @@ string Path::operator[](int n) const
 {
 	if(n>=0)
 	{
-		for(iterator i=begin(); i!=end(); ++i,--n)
+		for(Iterator i=begin(); i!=end(); ++i, --n)
 			if(!n) return *i;
 	}
 	else
 	{
-		for(iterator i=--end();; --i)
+		for(Iterator i=--end();; --i)
 		{
 			if(!++n) return *i;
 			if(i==begin()) break;
@@ -107,11 +113,9 @@ void Path::init(const string &p)
 		add_component(string(1, DIRCHAR));
 	while(1)
 	{
-		unsigned slash=p.find_first_of("/\\",start);
+		unsigned slash=p.find_first_of("/\\", start);
 		if(slash>start)
-		{
 			add_component(p.substr(start, slash-start));
-		}
 		if(slash==string::npos)
 			break;
 		start=slash+1;
@@ -131,7 +135,7 @@ void Path::add_component(const string &comp)
 #ifdef WIN32
 		unsigned slash=path.find(DIRCHAR);
 		if(is_windows_drive(path.substr(0, slash)))
-			path=path.substr(0,2);
+			path=path.substr(0, 2);
 		else
 #endif
 		path=comp;
@@ -176,7 +180,7 @@ void Path::add_component(const string &comp)
 	}
 }
 
-Path::iterator::iterator(const Path &p):
+Path::Iterator::Iterator(const Path &p):
 	path(p),
 	start(0)
 {
@@ -185,28 +189,28 @@ Path::iterator::iterator(const Path &p):
 	else if(path.path[0]==DIRCHAR)
 		end=1;
 #ifdef WIN32
-	else if(path.path.size()>2 && path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0,2)))
+	else if(path.path.size()>2 && path.path[2]==DIRCHAR && is_windows_drive(path.path.substr(0, 2)))
 		end=2;
 #endif
 	else
 		end=path.path.find(DIRCHAR);
 }
 
-Path::iterator &Path::iterator::operator++()
+Path::Iterator &Path::Iterator::operator++()
 {
 	start=end;
 	if(start>=path.path.size()) return *this;
 	if(path.path[start]==DIRCHAR) ++start;
-	end=path.path.find(DIRCHAR,start);
+	end=path.path.find(DIRCHAR, start);
 	return *this;
 }
 
-Path::iterator &Path::iterator::operator--()
+Path::Iterator &Path::Iterator::operator--()
 {
 	end=start;
 	if(end==0) return *this;
 	if(end>1 && end<path.path.size() && path.path[end]!=DIRCHAR) --end;
-	start=path.path.rfind(DIRCHAR,end-1);
+	start=path.path.rfind(DIRCHAR, end-1);
 	if(start==string::npos)
 		start=0;
 	else if(start<end-1)
@@ -214,12 +218,11 @@ Path::iterator &Path::iterator::operator--()
 	return *this;
 }
 
-string Path::iterator::operator*() const
+string Path::Iterator::operator*() const
 {
 	if(start>=path.path.size()) return "";
 	if(start==end) return "";
-	return path.path.substr(start,end-start);
+	return path.path.substr(start, end-start);
 }
 
-} // namespace Path
 } // namespace Msp