From be9d8951eba4320f0c33e6f87c2ffb32a4ea41b2 Mon Sep 17 00:00:00 2001 From: Chris Apers Date: Sat, 3 Sep 2005 16:24:58 +0000 Subject: Change PalmOS ident svn-id: r18748 --- backends/fs/palmos/palmos-fs.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'backends') diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index 99ebe4faa8..2263d8e4d5 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -18,10 +18,10 @@ * $Header$ */ -#if defined(__PALMOS_TRAPS__) +#if defined(PALMOS_MODE) #include "common/stdafx.h" -#include "../fs.h" +#include "fs/fs.h" #include #include @@ -36,7 +36,7 @@ protected: bool _isValid; bool _isPseudoRoot; String _path; - + public: PalmOSFilesystemNode(); PalmOSFilesystemNode(const Char *path); @@ -71,7 +71,7 @@ void PalmOSFilesystemNode::addFile(FSList &list, ListMode mode, const char *base if (entry._isDirectory) entry._path += "/"; - entry._isValid = true; + entry._isValid = true; entry._isPseudoRoot = false; list.push_back(wrap(new PalmOSFilesystemNode(&entry))); } @@ -107,11 +107,11 @@ FSList PalmOSFilesystemNode::listDir(ListMode mode) const { desc.nameP = nameP; desc.nameBufLen = 256; - e = VFSFileOpen(gVars->volRefNum, _path.c_str(), vfsModeRead, &handle); + e = VFSFileOpen(gVars->VFS.volRefNum, _path.c_str(), vfsModeRead, &handle); if (e) return myList; - + while(dirIterator != expIteratorStop) { e = VFSDirEntryEnumerate(handle, &dirIterator, &desc); if (!e) { @@ -137,11 +137,11 @@ const char *lastPathComponent(const Common::String &str) { AbstractFilesystemNode *PalmOSFilesystemNode::parent() const { PalmOSFilesystemNode *p = 0; - + if (!_isPseudoRoot) { const char *start = _path.c_str(); const char *end = lastPathComponent(_path); - + p = new PalmOSFilesystemNode(); p->_path = String(start, end - start); p->_isValid = true; @@ -152,4 +152,4 @@ AbstractFilesystemNode *PalmOSFilesystemNode::parent() const { return p; } -#endif // __PALMOS_TRAPS__ +#endif // PALMOS_MODE -- cgit v1.2.3