X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fpath.h;h=9eacf5199ca1c3fa0363788d698c5c1a14b79e15;hp=f52362230ebf538468734aa4ddfd1e2cc32e0df9;hb=e6fec68039fb5212993d687d352c540e407e6d96;hpb=66bdaa1f9f833e18a07d061208ce6080f3abac06

diff --git a/source/path.h b/source/path.h
index f523622..9eacf51 100644
--- a/source/path.h
+++ b/source/path.h
@@ -1,16 +1,17 @@
-/*
-This file is part of libmsppath
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+/* $Id$
+
+This file is part of libmspfs
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PATH_PATH_H_
-#define MSP_PATH_PATH_H_
+
+#ifndef MSP_FS_PATH_H_
+#define MSP_FS_PATH_H_
 
 #include <ostream>
 #include <string>
 
 namespace Msp {
-namespace Path {
 
 enum
 {
@@ -24,19 +25,19 @@ enum
 class Path
 {
 public:
-	class iterator
+	class Iterator
 	{
 	public:
-		iterator    &operator++();
-		iterator    &operator--();
+		Iterator    &operator++();
+		Iterator    &operator--();
 		std::string operator*() const;
-		bool        operator==(const iterator &i) const { return (start==i.start && end==i.end); }
-		bool        operator!=(const iterator &i) const { return !(*this==i); }
+		bool        operator==(const Iterator &i) const { return (start==i.start && end==i.end); }
+		bool        operator!=(const Iterator &i) const { return !(*this==i); }
 	private:
 		const Path &path;
 		unsigned   start,end;
 
-		iterator(const Path &);
+		Iterator(const Path &);
 
 		friend class Path;
 	};
@@ -45,24 +46,25 @@ public:
 	Path(const std::string &p)     { init(p); }
 	Path(const char *p)            { init(p); }
 	const std::string &str() const { return path; }
-	unsigned  size() const;
+	unsigned    size() const;
+	bool        empty() const { return path.empty(); }
 	bool        is_absolute() const;
-	Path        subpath(unsigned, unsigned =(unsigned)-1) const;
+	Path        subpath(unsigned, unsigned =static_cast<unsigned>(-1)) const;
 	Path        operator/(const Path &p) const { Path a=*this; a/=p; return a; }
 	Path        &operator/=(const Path &);
 	std::string operator[](int) const;
 	bool        operator==(const Path &) const;
-	iterator    begin() const { return iterator(*this); }
-	iterator    end() const   { iterator i(*this); i.start=i.end=std::string::npos; return i; }
+	Iterator    begin() const { return Iterator(*this); }
+	Iterator    end() const   { Iterator i(*this); i.start=i.end=std::string::npos; return i; }
 private:
 	std::string path;
 
 	void init(const std::string &);
+	void add_component(const std::string &);
 };
 
 inline std::ostream &operator<<(std::ostream &o, const Path &p) { o<<p.str(); return o; }
 
-} // namespace Path
 } // namespace Msp
 
 #endif