diff options
author | Max Horn | 2008-10-02 16:58:59 +0000 |
---|---|---|
committer | Max Horn | 2008-10-02 16:58:59 +0000 |
commit | c7fde102e325b423b1b153a78f7544697c052b72 (patch) | |
tree | 051aa4e66c66a20fa52fbb771328df5ea8d4790a /backends/fs/posix | |
parent | 31be8a6b3f22880378db870600b29906135c8ef5 (diff) | |
download | scummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.tar.gz scummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.tar.bz2 scummvm-rg350-c7fde102e325b423b1b153a78f7544697c052b72.zip |
Renamed FilesystemNode -> FSNode
svn-id: r34716
Diffstat (limited to 'backends/fs/posix')
-rw-r--r-- | backends/fs/posix/posix-fs-factory.cpp | 6 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs.cpp | 8 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs.h | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index cbfb69b76a..ae60fbaccb 100644 --- a/backends/fs/posix/posix-fs-factory.cpp +++ b/backends/fs/posix/posix-fs-factory.cpp @@ -26,17 +26,17 @@ #include "backends/fs/posix/posix-fs-factory.h" #include "backends/fs/posix/posix-fs.cpp" -AbstractFilesystemNode *POSIXFilesystemFactory::makeRootFileNode() const { +AbstractFSNode *POSIXFilesystemFactory::makeRootFileNode() const { return new POSIXFilesystemNode("/"); } -AbstractFilesystemNode *POSIXFilesystemFactory::makeCurrentDirectoryFileNode() const { +AbstractFSNode *POSIXFilesystemFactory::makeCurrentDirectoryFileNode() const { char buf[MAXPATHLEN]; getcwd(buf, MAXPATHLEN); return new POSIXFilesystemNode(buf); } -AbstractFilesystemNode *POSIXFilesystemFactory::makeFileNodePath(const Common::String &path) const { +AbstractFSNode *POSIXFilesystemFactory::makeFileNodePath(const Common::String &path) const { assert(!path.empty()); return new POSIXFilesystemNode(path); } diff --git a/backends/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h index c697679814..68c1fdd876 100644 --- a/backends/fs/posix/posix-fs-factory.h +++ b/backends/fs/posix/posix-fs-factory.h @@ -33,9 +33,9 @@ * Parts of this class are documented in the base interface class, FilesystemFactory. */ class POSIXFilesystemFactory : public FilesystemFactory { - virtual AbstractFilesystemNode *makeRootFileNode() const; - virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const; - virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const; + virtual AbstractFSNode *makeRootFileNode() const; + virtual AbstractFSNode *makeCurrentDirectoryFileNode() const; + virtual AbstractFSNode *makeFileNodePath(const Common::String &path) const; }; #endif /*POSIX_FILESYSTEM_FACTORY_H*/ diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 8dca78d82a..463d647042 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -92,7 +92,7 @@ POSIXFilesystemNode::POSIXFilesystemNode(const Common::String &p) { setFlags(); } -AbstractFilesystemNode *POSIXFilesystemNode::getChild(const Common::String &n) const { +AbstractFSNode *POSIXFilesystemNode::getChild(const Common::String &n) const { assert(!_path.empty()); assert(_isDirectory); @@ -197,8 +197,8 @@ bool POSIXFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, boo continue; // Honor the chosen mode - if ((mode == Common::FilesystemNode::kListFilesOnly && entry._isDirectory) || - (mode == Common::FilesystemNode::kListDirectoriesOnly && !entry._isDirectory)) + if ((mode == Common::FSNode::kListFilesOnly && entry._isDirectory) || + (mode == Common::FSNode::kListDirectoriesOnly && !entry._isDirectory)) continue; myList.push_back(new POSIXFilesystemNode(entry)); @@ -208,7 +208,7 @@ bool POSIXFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, boo return true; } -AbstractFilesystemNode *POSIXFilesystemNode::getParent() const { +AbstractFSNode *POSIXFilesystemNode::getParent() const { if (_path == "/") return 0; // The filesystem root has no parent diff --git a/backends/fs/posix/posix-fs.h b/backends/fs/posix/posix-fs.h index e09e433e05..7bd21c94b1 100644 --- a/backends/fs/posix/posix-fs.h +++ b/backends/fs/posix/posix-fs.h @@ -35,16 +35,16 @@ /** * Implementation of the ScummVM file system API based on POSIX. * - * Parts of this class are documented in the base interface class, AbstractFilesystemNode. + * Parts of this class are documented in the base interface class, AbstractFSNode. */ -class POSIXFilesystemNode : public AbstractFilesystemNode { +class POSIXFilesystemNode : public AbstractFSNode { protected: Common::String _displayName; Common::String _path; bool _isDirectory; bool _isValid; - virtual AbstractFilesystemNode *makeNode(const Common::String &path) const { + virtual AbstractFSNode *makeNode(const Common::String &path) const { return new POSIXFilesystemNode(path); } @@ -69,9 +69,9 @@ public: virtual bool isReadable() const { return access(_path.c_str(), R_OK) == 0; } virtual bool isWritable() const { return access(_path.c_str(), W_OK) == 0; } - virtual AbstractFilesystemNode *getChild(const Common::String &n) const; + virtual AbstractFSNode *getChild(const Common::String &n) const; virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const; - virtual AbstractFilesystemNode *getParent() const; + virtual AbstractFSNode *getParent() const; virtual Common::SeekableReadStream *openForReading(); virtual Common::WriteStream *openForWriting(); |