[Scummvm-cvs-logs] CVS: scummvm/backends/fs fs.cpp,1.5,1.6 fs.h,1.27,1.28

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10151

Modified Files:
	fs.cpp fs.h 
Log Message:
Remove the OSX-restriction on FilesystemNode::getNodeForPath() for now (I don't like it, but until a proper solution is in place, it seems to be the best thing to do)

Index: fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fs.cpp	1 Jan 2005 16:08:46 -0000	1.5
+++ fs.cpp	6 Feb 2005 18:37:17 -0000	1.6
@@ -55,12 +55,10 @@
 	++(*_refCount);
 }
 
-#ifdef MACOSX
 FilesystemNode::FilesystemNode(const String &p) {
 	_realNode = getNodeForPath(p);
 	_refCount = new int(1);
 }
-#endif
 
 FilesystemNode::~FilesystemNode() {
 	decRefCount();

Index: fs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- fs.h	1 Jan 2005 16:08:46 -0000	1.27
+++ fs.h	6 Feb 2005 18:37:22 -0000	1.28
@@ -166,23 +166,25 @@
 	 */
 	static AbstractFilesystemNode *getRoot();
 
-#ifdef MACOSX
 	/*
 	 * Construct a node based on a path; the path is in the same format as it
 	 * would be for calls to fopen().
 	 *
 	 * I.e. getNodeForPath(oldNode.path()) should create a new node identical to oldNode.
+	 *
+	 * @TODO: This is of course a place where non-portable code easily will sneak
+	 *        in, because the format of the path used here is not well-defined.
+	 *        So we really should reconsider this API and try to come up with
+	 *        something which is more portable but still flexible enough for our
+	 *        purposes.
 	 */
 	static AbstractFilesystemNode *getNodeForPath(const String &path);
-#endif
 
 
 public:
 	FilesystemNode();
 	FilesystemNode(const FilesystemNode &node);
-#ifdef MACOSX
 	FilesystemNode(const String &path);
-#endif
 	~FilesystemNode();
 
 	FilesystemNode &operator  =(const FilesystemNode &node);