From c7fde102e325b423b1b153a78f7544697c052b72 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 2 Oct 2008 16:58:59 +0000 Subject: Renamed FilesystemNode -> FSNode svn-id: r34716 --- backends/fs/ds/ds-fs-factory.cpp | 6 +++--- backends/fs/ds/ds-fs-factory.h | 6 +++--- backends/fs/ds/ds-fs.cpp | 16 ++++++++-------- backends/fs/ds/ds-fs.h | 20 ++++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'backends/fs/ds') diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp index 5c8c3f45f8..0dfa70b716 100644 --- a/backends/fs/ds/ds-fs-factory.cpp +++ b/backends/fs/ds/ds-fs-factory.cpp @@ -29,7 +29,7 @@ DECLARE_SINGLETON(DSFilesystemFactory); -AbstractFilesystemNode *DSFilesystemFactory::makeRootFileNode() const { +AbstractFSNode *DSFilesystemFactory::makeRootFileNode() const { if (DS::isGBAMPAvailable()) { return new DS::GBAMPFileSystemNode(); } else { @@ -37,7 +37,7 @@ AbstractFilesystemNode *DSFilesystemFactory::makeRootFileNode() const { } } -AbstractFilesystemNode *DSFilesystemFactory::makeCurrentDirectoryFileNode() const { +AbstractFSNode *DSFilesystemFactory::makeCurrentDirectoryFileNode() const { if (DS::isGBAMPAvailable()) { return new DS::GBAMPFileSystemNode(); } else { @@ -45,7 +45,7 @@ AbstractFilesystemNode *DSFilesystemFactory::makeCurrentDirectoryFileNode() cons } } -AbstractFilesystemNode *DSFilesystemFactory::makeFileNodePath(const Common::String &path) const { +AbstractFSNode *DSFilesystemFactory::makeFileNodePath(const Common::String &path) const { if (DS::isGBAMPAvailable()) { return new DS::GBAMPFileSystemNode(path); } else { diff --git a/backends/fs/ds/ds-fs-factory.h b/backends/fs/ds/ds-fs-factory.h index 67e0076b78..f4b381c477 100644 --- a/backends/fs/ds/ds-fs-factory.h +++ b/backends/fs/ds/ds-fs-factory.h @@ -35,9 +35,9 @@ */ class DSFilesystemFactory : public FilesystemFactory, public Common::Singleton { public: - 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; protected: DSFilesystemFactory() {}; diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp index 911702316d..5fc284b4d8 100644 --- a/backends/fs/ds/ds-fs.cpp +++ b/backends/fs/ds/ds-fs.cpp @@ -125,7 +125,7 @@ DSFileSystemNode::DSFileSystemNode(const DSFileSystemNode* node) { //TODO: not implemented? } -AbstractFilesystemNode *DSFileSystemNode::getChild(const Common::String& n) const { +AbstractFSNode *DSFileSystemNode::getChild(const Common::String& n) const { if (_path.lastChar() == '\\') { return new DSFileSystemNode(_path + n); } else { @@ -168,8 +168,8 @@ bool DSFileSystemNode::getChildren(AbstractFSList &dirList, ListMode mode, bool _zipFile->getFileName(n); // consolePrintf("file: %s\n", n); - if ( (_zipFile->isDirectory() && ((mode == Common::FilesystemNode::kListDirectoriesOnly) || (mode == Common::FilesystemNode::kListAll)) ) - || (!_zipFile->isDirectory() && ((mode == Common::FilesystemNode::kListFilesOnly) || (mode == Common::FilesystemNode::kListAll)) ) ) + if ( (_zipFile->isDirectory() && ((mode == Common::FSNode::kListDirectoriesOnly) || (mode == Common::FSNode::kListAll)) ) + || (!_zipFile->isDirectory() && ((mode == Common::FSNode::kListFilesOnly) || (mode == Common::FSNode::kListAll)) ) ) { DSFileSystemNode* dsfsn = new DSFileSystemNode("ds:/" + Common::String(n), _zipFile->isDirectory()); dsfsn->_isDirectory = _zipFile->isDirectory(); @@ -182,7 +182,7 @@ bool DSFileSystemNode::getChildren(AbstractFSList &dirList, ListMode mode, bool return true; } -AbstractFilesystemNode* DSFileSystemNode::getParent() const { +AbstractFSNode* DSFileSystemNode::getParent() const { // consolePrintf("parent\n"); DSFileSystemNode *p; @@ -285,7 +285,7 @@ GBAMPFileSystemNode::GBAMPFileSystemNode(const GBAMPFileSystemNode* node) { //TODO: not implemented? } -AbstractFilesystemNode *GBAMPFileSystemNode::getChild(const Common::String& n) const { +AbstractFSNode *GBAMPFileSystemNode::getChild(const Common::String& n) const { if (_path.lastChar() == '\\') { return new DSFileSystemNode(_path + n); } else { @@ -322,8 +322,8 @@ bool GBAMPFileSystemNode::getChildren(AbstractFSList& dirList, ListMode mode, bo while (entryType != TYPE_NO_MORE) { - if ( ((entryType == TYPE_DIR) && ((mode == Common::FilesystemNode::kListDirectoriesOnly) || (mode == Common::FilesystemNode::kListAll))) - || ((entryType == TYPE_FILE) && ((mode == Common::FilesystemNode::kListFilesOnly) || (mode == Common::FilesystemNode::kListAll))) ) { + if ( ((entryType == TYPE_DIR) && ((mode == Common::FSNode::kListDirectoriesOnly) || (mode == Common::FSNode::kListAll))) + || ((entryType == TYPE_FILE) && ((mode == Common::FSNode::kListFilesOnly) || (mode == Common::FSNode::kListAll))) ) { GBAMPFileSystemNode* dsfsn; consolePrintf("Fname: %s\n", fname); @@ -353,7 +353,7 @@ bool GBAMPFileSystemNode::getChildren(AbstractFSList& dirList, ListMode mode, bo return true; } -AbstractFilesystemNode* GBAMPFileSystemNode::getParent() const { +AbstractFSNode* GBAMPFileSystemNode::getParent() const { // consolePrintf("parent\n"); GBAMPFileSystemNode *p; diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h index 36e7bc9824..24d51d9d71 100644 --- a/backends/fs/ds/ds-fs.h +++ b/backends/fs/ds/ds-fs.h @@ -37,9 +37,9 @@ namespace DS { * Implementation of the ScummVM file system API. * This class is used when a Flash cart is in use. * - * 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 DSFileSystemNode : public AbstractFilesystemNode { +class DSFileSystemNode : public AbstractFSNode { protected: static ZipFile* _zipFile; @@ -85,10 +85,10 @@ public: /** * Returns a copy of this node. */ - virtual AbstractFilesystemNode *clone() const { return new DSFileSystemNode(this); } - virtual AbstractFilesystemNode *getChild(const Common::String& name) const; + virtual AbstractFSNode *clone() const { return new DSFileSystemNode(this); } + virtual AbstractFSNode *getChild(const Common::String& name) 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(); @@ -104,9 +104,9 @@ public: * Implementation of the ScummVM file system API. * This class is used when the GBAMP (GBA Movie Player) is used with a CompactFlash card. * - * 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 GBAMPFileSystemNode : public AbstractFilesystemNode { +class GBAMPFileSystemNode : public AbstractFSNode { protected: Common::String _displayName; Common::String _path; @@ -150,10 +150,10 @@ public: /** * Returns a copy of this node. */ - virtual AbstractFilesystemNode *clone() const { return new GBAMPFileSystemNode(this); } - virtual AbstractFilesystemNode *getChild(const Common::String& name) const; + virtual AbstractFSNode *clone() const { return new GBAMPFileSystemNode(this); } + virtual AbstractFSNode *getChild(const Common::String& name) 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(); -- cgit v1.2.3