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/windows | |
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/windows')
-rw-r--r-- | backends/fs/windows/windows-fs.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index 5172054c38..e1e9da12ab 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -50,14 +50,14 @@ public: virtual bool isDirectory() const { return _isDirectory; } virtual String path() const { return _path; } - virtual FSList listDir(ListMode) const; + virtual AbstractFSList listDir(ListMode) const; virtual AbstractFilesystemNode *parent() const; virtual AbstractFilesystemNode *child(const String &name) const; private: static char *toAscii(TCHAR *x); static const TCHAR* toUnicode(const char *x); - static void addFile (FSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data); + static void addFile (AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data); }; @@ -93,7 +93,7 @@ const TCHAR* WindowsFilesystemNode::toUnicode(const char *x) { #endif } -void WindowsFilesystemNode::addFile(FSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data) { +void WindowsFilesystemNode::addFile(AbstractFSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data) { WindowsFilesystemNode entry; char *asciiName = toAscii(find_data->cFileName); bool isDirectory; @@ -117,7 +117,7 @@ void WindowsFilesystemNode::addFile(FSList &list, ListMode mode, const char *bas entry._isValid = true; entry._isPseudoRoot = false; - list.push_back(wrap(new WindowsFilesystemNode(entry))); + list.push_back(new WindowsFilesystemNode(entry)); } AbstractFilesystemNode *AbstractFilesystemNode::getRoot() { @@ -163,10 +163,10 @@ WindowsFilesystemNode::WindowsFilesystemNode(const String &p) { _isPseudoRoot = false; } -FSList WindowsFilesystemNode::listDir(ListMode mode) const { +AbstractFSList WindowsFilesystemNode::listDir(ListMode mode) const { assert(_isDirectory); - FSList myList; + AbstractFSList myList; if (_isPseudoRoot) { #ifndef _WIN32_WCE @@ -186,7 +186,7 @@ FSList WindowsFilesystemNode::listDir(ListMode mode) const { entry._isValid = true; entry._isPseudoRoot = false; entry._path = toAscii(current_drive); - myList.push_back(wrap(new WindowsFilesystemNode(entry))); + myList.push_back(new WindowsFilesystemNode(entry)); } #endif } |