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/amigaos4/amigaos4-fs-factory.cpp | 6 +++--- backends/fs/amigaos4/amigaos4-fs-factory.h | 6 +++--- backends/fs/amigaos4/amigaos4-fs.cpp | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'backends/fs/amigaos4') diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp index 2b0b2f1908..2c7dc61278 100644 --- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp +++ b/backends/fs/amigaos4/amigaos4-fs-factory.cpp @@ -26,15 +26,15 @@ #include "backends/fs/amigaos4/amigaos4-fs-factory.h" #include "backends/fs/amigaos4/amigaos4-fs.cpp" -AbstractFilesystemNode *AmigaOSFilesystemFactory::makeRootFileNode() const { +AbstractFSNode *AmigaOSFilesystemFactory::makeRootFileNode() const { return new AmigaOSFilesystemNode(); } -AbstractFilesystemNode *AmigaOSFilesystemFactory::makeCurrentDirectoryFileNode() const { +AbstractFSNode *AmigaOSFilesystemFactory::makeCurrentDirectoryFileNode() const { return new AmigaOSFilesystemNode(); } -AbstractFilesystemNode *AmigaOSFilesystemFactory::makeFileNodePath(const Common::String &path) const { +AbstractFSNode *AmigaOSFilesystemFactory::makeFileNodePath(const Common::String &path) const { return new AmigaOSFilesystemNode(path); } #endif diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.h b/backends/fs/amigaos4/amigaos4-fs-factory.h index 03af6e95b9..89b3c7008d 100644 --- a/backends/fs/amigaos4/amigaos4-fs-factory.h +++ b/backends/fs/amigaos4/amigaos4-fs-factory.h @@ -34,9 +34,9 @@ */ class AmigaOSFilesystemFactory : public FilesystemFactory { 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; }; #endif /*AMIGAOS_FILESYSTEM_FACTORY_H*/ diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index d517121dc0..3b8d7b635c 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -47,9 +47,9 @@ const uint32 kExAllBufferSize = 40960; // TODO: is this okay for sure? /** * Implementation of the ScummVM file system API. * - * 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 AmigaOSFilesystemNode : public AbstractFilesystemNode { +class AmigaOSFilesystemNode : public AbstractFSNode { protected: BPTR _pFileLock; Common::String _sDisplayName; @@ -58,7 +58,7 @@ protected: bool _bIsValid; /** - * Obtain the FileInfoBlock protection value for this FilesystemNode, + * Obtain the FileInfoBlock protection value for this FSNode, * as defined in the header. * * @return -1 if there were errors, 0 or a positive integer otherwise. @@ -103,9 +103,9 @@ public: virtual bool isReadable() const; virtual bool isWritable() const; - 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(); @@ -302,7 +302,7 @@ bool AmigaOSFilesystemNode::exists() const { return nodeExists; } -AbstractFilesystemNode *AmigaOSFilesystemNode::getChild(const Common::String &n) const { +AbstractFSNode *AmigaOSFilesystemNode::getChild(const Common::String &n) const { ENTER(); if (!_bIsDirectory) { debug(6, "Not a directory"); @@ -371,9 +371,9 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b struct ExAllData *ead = data; do { - if ((mode == Common::FilesystemNode::kListAll) || - (EAD_IS_DRAWER(ead) && (mode == Common::FilesystemNode::kListDirectoriesOnly)) || - (EAD_IS_FILE(ead) && (mode == Common::FilesystemNode::kListFilesOnly))) { + if ((mode == Common::FSNode::kListAll) || + (EAD_IS_DRAWER(ead) && (mode == Common::FSNode::kListDirectoriesOnly)) || + (EAD_IS_FILE(ead) && (mode == Common::FSNode::kListFilesOnly))) { Common::String full_path = _sPath; full_path += (char*)ead->ed_Name; @@ -381,7 +381,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b if (lock) { AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(lock, (char *)ead->ed_Name); if (entry) { - //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode + //FIXME: since the isValid() function is no longer part of the AbstractFSNode // specification, the following call had to be changed: // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember @@ -433,7 +433,7 @@ int AmigaOSFilesystemNode::getFibProtection() const { return fibProt; } -AbstractFilesystemNode *AmigaOSFilesystemNode::getParent() const { +AbstractFSNode *AmigaOSFilesystemNode::getParent() const { ENTER(); if (!_bIsDirectory) { @@ -543,7 +543,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(volumeLock, buffer); if (entry) { - //FIXME: since the isValid() function is no longer part of the AbstractFilesystemNode + //FIXME: since the isValid() function is no longer part of the AbstractFSNode // specification, the following call had to be changed: // if (entry->isValid()) // Please verify that the logic of the code remains coherent. Also, remember -- cgit v1.2.3