aboutsummaryrefslogtreecommitdiff
path: root/backends/fs/morphos
diff options
context:
space:
mode:
authorMax Horn2006-05-03 11:13:21 +0000
committerMax Horn2006-05-03 11:13:21 +0000
commit9c1fc023281d1ea3789dcdb2cf7451baaf3d061f (patch)
tree59b663dd85e8ab02c90448ce4b3cc515672e24b9 /backends/fs/morphos
parent2ab62d8b02f8ebd7d0ac69abdba52357f41ebb4f (diff)
downloadscummvm-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/morphos')
-rw-r--r--backends/fs/morphos/abox-fs.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp
index bf7deb826b..70234740d3 100644
--- a/backends/fs/morphos/abox-fs.cpp
+++ b/backends/fs/morphos/abox-fs.cpp
@@ -51,8 +51,8 @@ class ABoxFilesystemNode : public AbstractFilesystemNode {
virtual bool isDirectory() const { return _isDirectory; }
virtual String path() const { return _path; }
- virtual FSList listDir(ListMode mode) const;
- static FSList listRoot();
+ virtual AbstractFSList listDir(ListMode mode) const;
+ static AbstractFSList listRoot();
virtual AbstractFilesystemNode *parent() const;
virtual AbstractFilesystemNode *child(const String &name) const;
};
@@ -129,9 +129,9 @@ ABoxFilesystemNode::~ABoxFilesystemNode()
}
}
-FSList ABoxFilesystemNode::listDir(ListMode mode) const
+AbstractFSList ABoxFilesystemNode::listDir(ListMode mode) const
{
- FSList myList;
+ AbstractFSList myList;
if (!_isValid)
error("listDir() called on invalid node");
@@ -174,7 +174,7 @@ FSList ABoxFilesystemNode::listDir(ListMode mode) const
if (entry)
{
if (entry->isValid())
- myList.push_back(wrap(entry));
+ myList.push_back(entry);
else
delete entry;
}
@@ -218,9 +218,9 @@ AbstractFilesystemNode *ABoxFilesystemNode::child(const String &name) const {
TODO
}
-FSList ABoxFilesystemNode::listRoot()
+AbstractFSList ABoxFilesystemNode::listRoot()
{
- FSList myList;
+ AbstractFSList myList;
DosList *dosList;
CONST ULONG lockDosListFlags = LDF_READ | LDF_VOLUMES;
char name[256];
@@ -255,7 +255,7 @@ FSList ABoxFilesystemNode::listRoot()
if (entry)
{
if (entry->isValid())
- myList.push_back(wrap(entry));
+ myList.push_back(entry);
else
delete entry;
}