[Scummvm-cvs-logs] SF.net SVN: scummvm: [21449] scummvm/trunk/common
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sat Mar 25 02:40:03 CET 2006
Revision: 21449
Author: kirben
Date: 2006-03-25 02:39:05 -0800 (Sat, 25 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21449&view=rev
Log Message:
-----------
Add kListAllNoRoot type to listDir() to handle recent file class changes, on file system backends which use _isPseudoRoot
Modified Paths:
--------------
scummvm/trunk/backends/fs/fs.h
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/fs/windows/windows-fs.cpp
scummvm/trunk/common/file.cpp
Modified: scummvm/trunk/backends/fs/fs.h
===================================================================
--- scummvm/trunk/backends/fs/fs.h 2006-03-25 10:11:38 UTC (rev 21448)
+++ scummvm/trunk/backends/fs/fs.h 2006-03-25 10:39:05 UTC (rev 21449)
@@ -99,7 +99,8 @@
typedef enum {
kListFilesOnly = 1,
kListDirectoriesOnly = 2,
- kListAll = 3
+ kListAllNoRoot = 3,
+ kListAll = 4
} ListMode;
virtual ~AbstractFilesystemNode() {}
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2006-03-25 10:11:38 UTC (rev 21448)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2006-03-25 10:39:05 UTC (rev 21449)
@@ -109,7 +109,7 @@
assert(_isDirectory);
FSList myList;
- if (_isPseudoRoot) {
+ if (_isPseudoRoot && mode != kListAllNoRoot) {
// Drives enumeration
RFs fs = CEikonEnv::Static()->FsSession();
TInt driveNumber;
Modified: scummvm/trunk/backends/fs/windows/windows-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs.cpp 2006-03-25 10:11:38 UTC (rev 21448)
+++ scummvm/trunk/backends/fs/windows/windows-fs.cpp 2006-03-25 10:39:05 UTC (rev 21449)
@@ -174,7 +174,7 @@
FSList myList;
- if (_isPseudoRoot) {
+ if (_isPseudoRoot && mode != kListAllNoRoot) {
#ifndef _WIN32_WCE
// Drives enumeration
TCHAR drive_buffer[100];
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2006-03-25 10:11:38 UTC (rev 21448)
+++ scummvm/trunk/common/file.cpp 2006-03-25 10:39:05 UTC (rev 21449)
@@ -159,7 +159,7 @@
baseLen++;
}
- FSList fslist(dir.listDir(FilesystemNode::kListAll));
+ FSList fslist(dir.listDir(FilesystemNode::kListAllNoRoot));
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (file->isDirectory()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list