Renamed methods in the FilesystemNode class to match the AbstractFSNode implementations.

Also exposed the new methods (exists, isReadable and isWritable) in FilesystemNode.

svn-id: r27113

1 files changed, 24 insertions, 24 deletions

diff --git a/common/fs.h b/common/fs.h
index c78980a813..6b0a587e1b 100644
--- a/common/fs.h
+++ b/common/fs.h
@@ -119,18 +119,34 @@ public:
 	 */
 	bool operator< (const FilesystemNode& node) const;
 
+	/*
+	 * Indicates whether the object refered by this path exists in the filesystem or not.
+	 */
+	virtual bool exists() const;
+
+	/**
+	 * Fetch a child node of this node, with the given name. Only valid for
+	 * directory nodes (an assertion is triggered otherwise).
+	 * If no child node with the given name exists, an invalid node is returned.
+	 */
+	FilesystemNode getChild(const Common::String &name) const;
+	
+	/**
+	 * Return a list of child nodes of this directory node. If called on a node
+	 * that does not represent a directory, false is returned.
+	 * 
+	 * @return true if succesful, false otherwise (e.g. when the directory does not exist).
+	 * @todo Rename this to listChildren or getChildren.
+	 */
+	virtual bool getChildren(FSList &fslist, ListMode mode = kListDirectoriesOnly) const;	
+
 	/**
 	 * Return a human readable string for this node, usable for display (e.g.
 	 * in the GUI code). Do *not* rely on it being usable for anything else,
 	 * like constructing paths!
 	 * @return the display name
 	 */
-	virtual Common::String displayName() const;
-
-	/*
-	 * Indicates whether the object refered by this path exists in the filesystem or not.
-	 */
-	virtual bool exists() const;
+	virtual Common::String getDisplayName() const;
 
 	/**
 	 * Return a string representation of the name of the file. This is can be
@@ -140,7 +156,7 @@ public:
 	 *
 	 * @return the file name
 	 */
-	virtual Common::String name() const;
+	virtual Common::String getName() const;
 
 	/**
 	 * Return a string representation of the file which can be passed to fopen(),
@@ -153,23 +169,7 @@ public:
 	 *
 	 * @return the 'path' represented by this filesystem node
 	 */
-	virtual Common::String path() const;
-
-	/**
-	 * Fetch a child node of this node, with the given name. Only valid for
-	 * directory nodes (an assertion is triggered otherwise).
-	 * If no child node with the given name exists, an invalid node is returned.
-	 */
-	FilesystemNode getChild(const Common::String &name) const;
-	
-	/**
-	 * Return a list of child nodes of this directory node. If called on a node
-	 * that does not represent a directory, false is returned.
-	 * 
-	 * @return true if succesful, false otherwise (e.g. when the directory does not exist).
-	 * @todo Rename this to listChildren or getChildren.
-	 */
-	virtual bool listDir(FSList &fslist, ListMode mode = kListDirectoriesOnly) const;	
+	virtual Common::String getPath() const;
 	
 	/**
 	 * Get the parent node of this node. If this node has no parent node,