diff options
author | Max Horn | 2006-05-03 11:13:21 +0000 |
---|---|---|
committer | Max Horn | 2006-05-03 11:13:21 +0000 |
commit | 9c1fc023281d1ea3789dcdb2cf7451baaf3d061f (patch) | |
tree | 59b663dd85e8ab02c90448ce4b3cc515672e24b9 /backends/fs/amigaos4/amigaos4-fs.cpp | |
parent | 2ab62d8b02f8ebd7d0ac69abdba52357f41ebb4f (diff) | |
download | scummvm-rg350-9c1fc023281d1ea3789dcdb2cf7451baaf3d061f.tar.gz scummvm-rg350-9c1fc023281d1ea3789dcdb2cf7451baaf3d061f.tar.bz2 scummvm-rg350-9c1fc023281d1ea3789dcdb2cf7451baaf3d061f.zip |
Got rid of AbstractFilesystemNode::wrap (begone, evil hack)
svn-id: r22300
Diffstat (limited to 'backends/fs/amigaos4/amigaos4-fs.cpp')
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 4875b74e28..2be79012ec 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -69,8 +69,8 @@ class AmigaOSFilesystemNode : public AbstractFilesystemNode { virtual bool isDirectory() const { return _bIsDirectory; }; virtual String path() const { return _sPath; }; - virtual FSList listDir(ListMode mode) const; - virtual FSList listVolumes(void) const; + virtual AbstractFSList listDir(ListMode mode) const; + virtual AbstractFSList listVolumes(void) const; virtual AbstractFilesystemNode *parent() const; virtual AbstractFilesystemNode *child(const String &name) const; }; @@ -222,10 +222,10 @@ AmigaOSFilesystemNode::~AmigaOSFilesystemNode() { LEAVE(); } -FSList AmigaOSFilesystemNode::listDir(ListMode mode) const { +AbstractFSList AmigaOSFilesystemNode::listDir(ListMode mode) const { ENTER(); - FSList myList; + AbstractFSList myList; if (!_bIsValid) { debug(6, "Invalid node"); @@ -275,7 +275,7 @@ FSList AmigaOSFilesystemNode::listDir(ListMode mode) const { AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(lock, (char *)ead->ed_Name); if (entry) { if (entry->isValid()) - myList.push_back(wrap(entry)); + myList.push_back(entry); else delete entry; } @@ -334,10 +334,10 @@ AbstractFilesystemNode *AmigaOSFilesystemNode::child(const String &name) const { return new AmigaOSFilesystemNode(newPath); } -FSList AmigaOSFilesystemNode::listVolumes(void) const { +AbstractFSList AmigaOSFilesystemNode::listVolumes(void) const { ENTER(); - FSList myList; + AbstractFSList myList; const uint32 kLockFlags = LDF_READ | LDF_VOLUMES; char name[MAXPATHLEN]; @@ -367,7 +367,7 @@ FSList AmigaOSFilesystemNode::listVolumes(void) const { AmigaOSFilesystemNode *entry = new AmigaOSFilesystemNode(volumeLock, name); if (entry) { if (entry->isValid()) - myList.push_back(wrap(entry)); + myList.push_back(entry); else delete entry; } |