[Scummvm-cvs-logs] SF.net SVN: scummvm: [27984] scummvm/branches/gsoc2007-fsnode/backends/fs
david_corrales at users.sourceforge.net
david_corrales at users.sourceforge.net
Mon Jul 9 03:26:54 CEST 2007
Revision: 27984
http://scummvm.svn.sourceforge.net/scummvm/?rev=27984&view=rev
Author: david_corrales
Date: 2007-07-08 18:26:54 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
Update the interfaces for the getChildren method to include the hidden flag.
Also added some missing method stubs to the gamecard dc port.
Modified Paths:
--------------
scummvm/branches/gsoc2007-fsnode/backends/fs/amigaos4/amigaos4-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/dc/dc-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.h
scummvm/branches/gsoc2007-fsnode/backends/fs/gp32/gp32-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/morphos/abox-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/palmos/palmos-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/ps2/ps2-fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/psp/psp_fs.cpp
scummvm/branches/gsoc2007-fsnode/backends/fs/symbian/symbian-fs.cpp
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/amigaos4/amigaos4-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/amigaos4/amigaos4-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/amigaos4/amigaos4-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -99,7 +99,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
/**
@@ -279,9 +279,11 @@
return new AmigaOSFilesystemNode(newPath);
}
-bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
ENTER();
+ //TODO: honor the hidden flag
+
if (!_bIsValid) {
debug(6, "Invalid node");
LEAVE();
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/dc/dc-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/dc/dc-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/dc/dc-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -67,7 +67,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
@@ -137,9 +137,11 @@
return new RoninCDFilesystemNode(newPath, true);
}
-bool RoninCDFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool RoninCDFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
+ //TODO: honor the hidden flag
+
DIR *dirp = opendir(_path.c_str());
struct dirent *dp;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -133,10 +133,12 @@
return NULL;
}
-bool DSFileSystemNode::getChildren(AbstractFSList &dirList, ListMode mode) const {
+bool DSFileSystemNode::getChildren(AbstractFSList &dirList, ListMode mode, bool hidden) const {
// consolePrintf("Listdir\n");
// consolePrintf("Directory\n");
+ //TODO: honor the hidden flag
+
char temp[128];
strcpy(temp, _path.c_str());
@@ -283,9 +285,11 @@
return NULL;
}
-bool GBAMPFileSystemNode::getChildren(AbstractFSList& dirList, ListMode mode) const {
+bool GBAMPFileSystemNode::getChildren(AbstractFSList& dirList, ListMode mode, bool hidden) const {
// consolePrintf("Listdir\n");
+ //TODO: honor the hidden flag
+
enum { TYPE_NO_MORE = 0, TYPE_FILE = 1, TYPE_DIR = 2 };
char temp[128], fname[128], *path, *pathTemp;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.h
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.h 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/ds/ds-fs.h 2007-07-09 01:26:54 UTC (rev 27984)
@@ -91,7 +91,7 @@
*/
virtual AbstractFilesystemNode *clone() const { return new DSFileSystemNode(this); }
virtual AbstractFilesystemNode *getChild(const Common::String& name) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode = FilesystemNode::kListDirectoriesOnly) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode = FilesystemNode::kListDirectoriesOnly, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
/**
@@ -143,18 +143,21 @@
*/
GBAMPFileSystemNode(const GBAMPFileSystemNode *node);
+ virtual bool exists() const { return true; } //FIXME: this is just a stub
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
virtual String getPath() const { return _path; }
virtual bool isDirectory() const { return _isDirectory; }
+ virtual bool isReadable() const { return true; } //FIXME: this is just a stub
virtual bool isValid() const { return _isValid; }
+ virtual bool isWritable() const { return true; } //FIXME: this is just a stub
/**
* Returns a copy of this node.
*/
virtual AbstractFilesystemNode *clone() const { return new GBAMPFileSystemNode(this); }
virtual AbstractFilesystemNode *getChild(const Common::String& name) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode = FilesystemNode::kListDirectoriesOnly) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode = FilesystemNode::kListDirectoriesOnly, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/gp32/gp32-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/gp32/gp32-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/gp32/gp32-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -53,6 +53,7 @@
*/
GP32FilesystemNode(const String &path);
+ virtual bool exists() const { return true; } //FIXME: this is just a stub
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
virtual String getPath() const { return _path; }
@@ -64,7 +65,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
@@ -193,9 +194,11 @@
return new GP32FilesystemNode(newPath);
}
-bool GP32FilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool GP32FilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
+ //TODO: honor the hidden flag
+
GPDIRENTRY dirEntry;
GPFILEATTR attr;
GP32FilesystemNode entry;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/morphos/abox-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/morphos/abox-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/morphos/abox-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -86,7 +86,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &name) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
/**
@@ -250,8 +250,10 @@
return new ABoxFilesystemNode(newPath);
}
-bool ABoxFilesystemNode::getChildren(AbstractFSList &list, ListMode mode) const
+bool ABoxFilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool hidden) const
{
+ //TODO: honor the hidden flag
+
if (!_isValid)
{
debug(6, "listDir() called on invalid node");
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/palmos/palmos-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/palmos/palmos-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/palmos/palmos-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -66,7 +66,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
private:
@@ -181,7 +181,9 @@
return new PalmOSFilesystemNode(newPath);
}
-bool PalmOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool PalmOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
+ //TODO: honor the hidden flag
+
Err error;
Char nameP[256];
FileInfoType desc;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/ps2/ps2-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/ps2/ps2-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/ps2/ps2-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -73,7 +73,7 @@
virtual AbstractFilesystemNode *clone() const { return new Ps2FilesystemNode(this); }
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
@@ -150,7 +150,9 @@
return NULL;
}
-bool Ps2FilesystemNode::getChildren(AbstractFSList &list, ListMode mode) const {
+bool Ps2FilesystemNode::getChildren(AbstractFSList &list, ListMode mode, bool hidden) const {
+ //TODO: honor the hidden flag
+
if (!_isDirectory)
return false;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/psp/psp_fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/psp/psp_fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/psp/psp_fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -68,7 +68,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
@@ -128,9 +128,11 @@
return new PSPFilesystemNode(newPath, true);
}
-bool PSPFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool PSPFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
+ //TODO: honor the hidden flag
+
int dfd = sceIoDopen(_path.c_str());
if (dfd > 0) {
SceIoDirent dir;
Modified: scummvm/branches/gsoc2007-fsnode/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/branches/gsoc2007-fsnode/backends/fs/symbian/symbian-fs.cpp 2007-07-09 01:16:13 UTC (rev 27983)
+++ scummvm/branches/gsoc2007-fsnode/backends/fs/symbian/symbian-fs.cpp 2007-07-09 01:26:54 UTC (rev 27984)
@@ -69,7 +69,7 @@
virtual bool isWritable() const { return true; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
- virtual bool getChildren(AbstractFSList &list, ListMode mode) const;
+ virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
virtual AbstractFilesystemNode *getParent() const;
};
@@ -163,9 +163,11 @@
return new SymbianFilesystemNode(newPath);
}
-bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode) const {
+bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
assert(_isDirectory);
+ //TODO: honor the hidden flag
+
if (_isPseudoRoot) {
// Drives enumeration
RFs fs = CEikonEnv::Static()->FsSession();
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