[Scummvm-cvs-logs] SF.net SVN: scummvm: [22260] scummvm/trunk/backends/fs/symbian

[anotherguest at users.sourceforge.net]

Revision: 22260
Author:   anotherguest
Date:     2006-05-01 07:20:02 -0700 (Mon, 01 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22260&view=rev

Log Message:
-----------
Updated symbian-fs backend and cleanup

Modified Paths:
--------------
    scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
    scummvm/trunk/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in
    scummvm/trunk/backends/symbian/src/SymbianActions.cpp
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-05-01 14:14:24 UTC (rev 22259)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp	2006-05-01 14:20:02 UTC (rev 22260)
@@ -29,6 +29,7 @@
 #include <dirent.h>
 #include <eikenv.h>
 #include <f32file.h>
+#include <bautils.h>
 
 /*
  * Implementation of the ScummVM file system API based on POSIX.
@@ -200,7 +201,23 @@
 }
 
 AbstractFilesystemNode *SymbianFilesystemNode::child(const String &name) const {
-	TODO
+	assert(_isDirectory);
+	String newPath(_path);
+
+	if (_path.lastChar() != '\\')
+		newPath += '\\';
+	newPath += name;
+
+	TPtrC8 ptr((const unsigned char*) newPath.c_str(), newPath.size());
+	TFileName fname;
+	fname.Copy(ptr);
+	TBool isFolder = EFalse;
+	BaflUtils::IsFolder(CEikonEnv::Static()->FsSession(), fname, isFolder);
+	if(!isFolder)
+		return 0;
+
+	SymbianFilesystemNode *p = new SymbianFilesystemNode(newPath);
+	return p;
 }
 
 #endif // defined(__SYMBIAN32__)

Modified: scummvm/trunk/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2006-05-01 14:14:24 UTC (rev 22259)
+++ scummvm/trunk/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in	2006-05-01 14:20:02 UTC (rev 22260)
@@ -122,4 +122,4 @@
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 LIBRARY qikctl.lib
-library qikcore.lib bafl.lib
\ No newline at end of file
+library qikcore.lib bafl.lib eikcoctl.lib 
\ No newline at end of file

Modified: scummvm/trunk/backends/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/symbian/src/SymbianActions.cpp	2006-05-01 14:14:24 UTC (rev 22259)
+++ scummvm/trunk/backends/symbian/src/SymbianActions.cpp	2006-05-01 14:20:02 UTC (rev 22260)
@@ -52,13 +52,13 @@
 };
 
 #ifdef UIQ
-static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, SDLK_PAGEDOWN, 0, 0,SDLK_PAGEUP,0,0};
+static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_PAGEDOWN, 0, 0,SDLK_PAGEUP,0,0};
 #elif defined (S60)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9',0,0,0,0,0};
 #elif defined (S90)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
 #else
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
 #endif
 
 // creator function according to Factory Pattern


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.